guange
|
7c98e0f392
|
merge
|
9 years ago |
|
guange
|
5c0468f8fd
|
二维码过期改为一个月有效期
|
9 years ago |
|
guange
|
068c8967e1
|
新增班级时名称为1个字符时报错
|
9 years ago |
 cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
9 years ago |
 huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
9 years ago |
|
huang
|
e588321ada
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
b90c90bc60
|
add model error_list
|
9 years ago |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
 yuanke
|
da19bbd3a0
|
优化了下修改资料界面的代码
|
9 years ago |
|
guange
|
48fb02a2d6
|
管理课程
|
9 years ago |
|
guange
|
60367415fa
|
新建课程功能完成
|
9 years ago |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
9 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
9 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
9 years ago |
|
huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
|
guange
|
222855ea79
|
越过course表的validate,以防save invitecode 失败
|
9 years ago |
|
guange
|
3c425edc3c
|
修复邀请码会变的问题
|
9 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
9 years ago |
Your Name
|
dd6b19a8b5
|
some status of sonar
|
9 years ago |
|
guange
|
1e6454efc0
|
加入我的资源
|
9 years ago |
|
guange
|
3b383dfa65
|
老师课程界面
|
9 years ago |
|
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
c501af70ba
|
.
|
9 years ago |
|
huang
|
012eae9b93
|
gems
|
9 years ago |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
9 years ago |
|
Your Name
|
537f152562
|
0
|
9 years ago |
|
Your Name
|
244c178758
|
666
|
9 years ago |
|
Your Name
|
eae70f9c71
|
some config
|
9 years ago |
|
cxt
|
260759e4db
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
cxt
|
ac629440b1
|
课程邀请码
|
9 years ago |
|
guange
|
16a9f017b6
|
error
|
9 years ago |
|
guange
|
485d0e3743
|
ticket处理
|
9 years ago |
|
Your Name
|
06fe02890f
|
index for sonar result
|
9 years ago |
|
guange
|
d348981721
|
加入邀请码
|
9 years ago |
|
Your Name
|
ce6e6116b5
|
get data from sonar API
|
9 years ago |
|
Your Name
|
9e7cde6056
|
stable version for sonar
|
9 years ago |
|
cxt
|
c4cea93a44
|
消息列表的“展开更多”指针手势修改
|
9 years ago |
|
cxt
|
4f80e259e8
|
消息弹窗的延时显示
|
9 years ago |
|
cxt
|
860068f7ed
|
新注册用户的留言
|
9 years ago |
|
guange
|
98c6548e39
|
重写登录和注册
|
9 years ago |
|
guange
|
8fd4d518b2
|
添加邀请码
|
9 years ago |
|
cxt
|
6100abe0da
|
课程大纲
|
9 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
9 years ago |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
3af115ee54
|
组织新版样式，及方法优化
|
9 years ago |
|
cxt
|
2431ef6986
|
模板消息引起的问题
|
9 years ago |
|
cxt
|
b72ad364db
|
微信模板消息：用户绑定成功、作业消息、个人留言、班级通知
|
9 years ago |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
9 years ago |
|
huang
|
649b3918c4
|
通知、消息创建的时候异步发送消息
|
9 years ago |
|
huang
|
d1e11d4260
|
代码审查后代码简化
|
9 years ago |
|
huang
|
a4f2ebb73b
|
Merge branch 'develop' into hjq_beidou
|
9 years ago |
|
huang
|
ed7c6cbcfe
|
组织新建帖子增减status状态
|
9 years ago |
|
huang
|
b1c70db28a
|
上线暂时还原代码
|
9 years ago |
|
huang
|
a3abf09841
|
delayjob封装
|
9 years ago |
|
huang
|
d70f42b413
|
发布课程通知消息异步发送（测试版）
|
9 years ago |
|
huang
|
eead7962cf
|
资源申请权限控制
|
9 years ago |
|
cxt
|
40f45ea697
|
发布通知的微信模板消息内容有重复
|
9 years ago |
|
huang
|
13ac7ef273
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
c165d0b37e
|
作业二级回复的模板通知
|
9 years ago |
|
cxt
|
82568b5951
|
缺陷状态更改或内容更改时不发模板消息
|
9 years ago |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
984f706722
|
可发送权限控制
|
9 years ago |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
9 years ago |
|
huang
|
99cbf0b54e
|
资源引用消息通知
|
9 years ago |
|
huang
|
f3f75a57bd
|
申请资源消息资源发布这收到消息
|
9 years ago |
|
cxt
|
670b2c48c7
|
缺陷的模板消息要细化缺陷类型
|
9 years ago |
|
cxt
|
3b3cafbc81
|
微信模板消息的还原
|
9 years ago |
|
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
9 years ago |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
guange
|
1767e1200d
|
school不用Base64解码，两边都是utf8
|
9 years ago |
|
cxt
|
55a98d8d6e
|
作业二级回复的消息通知
|
9 years ago |
|
huang
|
855b33c4a5
|
Merge branch 'develop' into hjq_beidou
|
9 years ago |
|
huang
|
13cc5ceaa6
|
model中添加获取二级域名的方法
|
9 years ago |
|
huang
|
5ee6c9e5d3
|
子域名添加成员问题
|
9 years ago |
|
guange
|
80be46dc92
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
guange
|
4b4a48b0c4
|
sso rsa解码这块处理,因为php只能处理117个字节,所以要拆分开
|
9 years ago |
|
huang
|
ff20b50aa2
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
5e56e11982
|
暂时禁掉作业的模板消息和消息通知
|
9 years ago |
|
guange
|
f217b3f510
|
去除用户名域名
|
9 years ago |
|
huang
|
fbcae050ad
|
项目500问题
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
huang
|
3853d5b7ad
|
右三模式定制
|
9 years ago |
|
huang
|
1673ae451b
|
名师榜新增一个后就不能再新增
|
9 years ago |
|
cxt
|
ca5f03f2ea
|
作业回复的消息通知，评阅作品的消息通知修改
|
9 years ago |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
9 years ago |
|
cxt
|
f4b8f2c794
|
学生追加附件发送消息
|
9 years ago |
|
cxt
|
9ec488684b
|
分享申请的消息更改
|
9 years ago |
|
cxt
|
83f7de597a
|
暂时屏蔽通知的微信消息和消息通知
|
9 years ago |
|
huang
|
99d9a28828
|
名师榜sql查询
|
9 years ago |
