 cxt
|
c165d0b37e
|
作业二级回复的模板通知
|
2016-05-20 14:52:47 +08:00 |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
2016-05-17 16:30:03 +08:00 |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
2016-05-17 14:18:14 +08:00 |
 huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
2016-05-13 15:12:26 +08:00 |
|
huang
|
2d701b7d03
|
Merge branch 'cxt_course' into develop
|
2016-05-13 11:34:39 +08:00 |
|
huang
|
343e9d9434
|
修改日志分割关闭
|
2016-05-13 11:32:50 +08:00 |
|
huang
|
37ee03374e
|
完成设置名师功能
|
2016-05-13 09:53:22 +08:00 |
|
huang
|
ad2f12c9d0
|
名师列表搜索功能
|
2016-05-12 15:02:23 +08:00 |
|
cxt
|
7761bd5313
|
微信模板消息的“有新缺陷了”改成“有新的问题动态了”
|
2016-05-12 10:49:12 +08:00 |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
2016-05-12 10:40:35 +08:00 |
|
huang
|
52c8593b09
|
组织教师列表sql优化
|
2016-05-11 16:20:55 +08:00 |
|
huang
|
43f06c0826
|
版本库ZIP下载
|
2016-05-11 13:44:15 +08:00 |
|
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
2016-05-11 09:18:55 +08:00 |
|
huang
|
6474444cc7
|
用户连接 id变成用户名
|
2016-05-10 09:00:59 +08:00 |
|
cxt
|
f6d7df7393
|
管理员界面添加“分享作业申请”列表
|
2016-05-09 18:40:21 +08:00 |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-06 22:02:22 +08:00 |
|
cxt
|
c6c3625029
|
题目申请说明内容较长时，会导致被申请者收不到消息
|
2016-05-06 18:47:38 +08:00 |
|
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
2016-05-06 18:12:08 +08:00 |
|
cxt
|
10d26f89d9
|
作业列表的二级回复
|
2016-05-06 17:36:28 +08:00 |
|
huang
|
a5be092c16
|
二级目录帖子列表中添加编辑功能
|
2016-05-06 14:42:13 +08:00 |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
2016-05-06 12:22:43 +08:00 |
|
huang
|
6e7d20c410
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-06 10:17:18 +08:00 |
|
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
2016-05-06 10:16:56 +08:00 |
|
huang
|
d0db711449
|
编辑功能
|
2016-05-05 18:47:32 +08:00 |
|
huang
|
02d6186045
|
二级域名讨论帖子添加删除链接
|
2016-05-05 16:43:20 +08:00 |
|
huang
|
e0c011948c
|
二级域名的隐藏和显示
|
2016-05-05 15:16:14 +08:00 |
|
huang
|
79cd36f297
|
二级域名排序
|
2016-05-05 14:39:27 +08:00 |
 guange
|
88fd2cbfb6
|
Merge remote-tracking branch 'origin/develop' into guange_dev
|
2016-05-05 14:07:29 +08:00 |
|
guange
|
dfdd301f2f
|
sso同步登录功能完成
|
2016-05-05 14:06:47 +08:00 |
|
huang
|
6d28d0becd
|
二级域名的删除功能
|
2016-05-05 12:27:35 +08:00 |
|
huang
|
2920f21c95
|
二级域名编辑功能自动刷新
|
2016-05-05 11:28:28 +08:00 |
|
cxt
|
121aca7505
|
缺陷模板消息
|
2016-05-05 09:09:45 +08:00 |
|
cxt
|
06586f9e4b
|
导出作业成绩中添加作品描述的导出
|
2016-05-04 16:43:37 +08:00 |
|
guange
|
250ed8c981
|
添加key
|
2016-05-04 16:33:56 +08:00 |
|
cxt
|
6c184b9248
|
题库的分享请求
|
2016-05-04 16:17:37 +08:00 |
|
guange
|
0635c1e98b
|
添加单点登录controller
|
2016-05-04 14:05:46 +08:00 |
|
huang
|
48002eb247
|
二级目录讨论区添加帖子回复功能
|
2016-05-03 19:03:28 +08:00 |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-04-29 15:58:05 +08:00 |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
2016-04-29 15:46:26 +08:00 |
|
huang
|
1685449381
|
二级目录框架及结构
|
2016-04-28 17:36:29 +08:00 |
 yuanke
|
b3fdc45a04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 12:38:06 +08:00 |
|
yuanke
|
a893f88ede
|
微信模版本地丢了
|
2016-04-28 10:52:55 +08:00 |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 10:45:57 +08:00 |
|
huang
|
9fbf713709
|
完成组织二级域名
|
2016-04-27 17:02:44 +08:00 |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
2016-04-27 10:36:24 +08:00 |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
2016-04-27 10:28:36 +08:00 |
|
yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
2016-04-27 09:54:49 +08:00 |
|
yuanke
|
bb80cad1e3
|
Merge branch 'yuanke' into yuanke_1
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-25 14:03:27 +08:00 |
|
yuanke
|
f6d09e0554
|
配置中增加一个 隐藏课程信息的功能
|
2016-04-24 14:23:08 +08:00 |
|
guange
|
2c23b88998
|
boards#index性能优化
|
2016-04-24 12:48:03 +08:00 |