 huang
|
83ac35cc94
|
不同的组织定制是否允许设置名师榜
|
2016-05-13 10:29:22 +08:00 |
|
huang
|
37ee03374e
|
完成设置名师功能
|
2016-05-13 09:53:22 +08:00 |
 Tim
|
cf1cf58bab
|
组织门户二级目录添加分栏"|"以及登录未登录位置控制
|
2016-05-09 18:44:20 +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
|
3de2b151a3
|
左三”更多“提供链接
|
2016-05-06 17:03:54 +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 |
 guange
|
e8adcf8cc7
|
添加sso model
|
2016-05-04 15:40:18 +08:00 |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
2016-04-29 19:21:54 +08:00 |
|
cxt
|
d7789b7739
|
迁移文件
|
2016-04-29 16:48:11 +08:00 |
|
cxt
|
f62b6c4c31
|
提交
|
2016-04-29 16:45:15 +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 |
|
Tim
|
5f1b335cfb
|
北斗二级菜单显隐
|
2016-04-29 15:38:38 +08:00 |
|
huang
|
1685449381
|
二级目录框架及结构
|
2016-04-28 17:36:29 +08:00 |
|
cxt
|
4a5a602a6e
|
迁移
|
2016-04-28 14:46:27 +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
|
54a8e6871c
|
问答区列表修改
|
2016-04-28 11:31:31 +08:00 |
|
Tim
|
5c795b92ee
|
图片百分百显示； 默认大图尺寸调整
|
2016-04-28 11:12:44 +08:00 |
|
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
2016-04-28 10:49:05 +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 |
|
cxt
|
451b53f3cc
|
qianyi
|
2016-04-28 10:09:45 +08:00 |
|
cxt
|
d244e22066
|
rake
|
2016-04-28 10:08:09 +08:00 |
|
huang
|
9fbf713709
|
完成组织二级域名
|
2016-04-27 17:02:44 +08:00 |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
2016-04-27 16:27:55 +08:00 |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
2016-04-27 16:21:35 +08:00 |
|
yuanke
|
c357971e8a
|
课程列表、项目列表等修改
|
2016-04-27 16:02:52 +08:00 |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
2016-04-27 14:30:28 +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 |
|
Tim
|
53e6b41d93
|
北斗登录效果调整
|
2016-04-26 10:02:16 +08:00 |
|
huang
|
5d506458df
|
迁移空数据问题
|
2016-04-24 11:25:29 +08:00 |
|
huang
|
cc48fb5a98
|
Merge branch 'hjq_beidou' into develop
|
2016-04-24 10:53:23 +08:00 |
|
huang
|
f5a88ef6f9
|
数据库为空的迁移问题
|
2016-04-24 10:52:29 +08:00 |
|
yuanke
|
81cd30cbda
|
Merge branch 'cxt_course' into yuanke_1
Conflicts:
db/schema.rb
|
2016-04-23 13:22:28 +08:00 |
|
cxt
|
76b37d7670
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-04-21 10:02:16 +08:00 |
|
cxt
|
26b1aee90d
|
修改周海芳老师四个作业的截止日期和学生得分
|
2016-04-21 10:01:12 +08:00 |
|
yuanke
|
8f62cccfd6
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-20 16:14:26 +08:00 |
|
yuanke
|
dc3837da76
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-20 09:59:37 +08:00 |
|
yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-20 09:55:29 +08:00 |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
2016-04-20 09:51:51 +08:00 |
|
cxt
|
0fa16251e7
|
删除学生提交的多分作品
|
2016-04-18 15:57:15 +08:00 |
|
txz
|
73b89cdde5
|
微信边框，回复点赞样式更改
|
2016-04-18 11:19:13 +08:00 |
|
huang
|
16bba76f61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 16:52:15 +08:00 |
|
huang
|
6027b6d0f5
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
2016-04-15 16:51:37 +08:00 |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-15 14:13:44 +08:00 |
|
huang
|
40b45ce1b4
|
版本库动态中统计改成从数据库获取
|
2016-04-15 12:24:54 +08:00 |
|
yuanke
|
de0ba0fbe5
|
Merge branch 'yuanke' into develop
|
2016-04-14 13:56:42 +08:00 |
|
yuanke
|
6444d859a7
|
迁移文件修改
|
2016-04-14 13:55:55 +08:00 |