 Tim
|
1a1dc7bacc
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
db/schema.rb
|
2015-11-12 15:32:36 +08:00 |
|
Tim
|
b52f4f80c4
|
迁移自动生成文件
|
2015-11-12 15:31:47 +08:00 |
 ouyangxuhua
|
bf01994e4f
|
修改组织文章显示样式
|
2015-11-12 15:12:23 +08:00 |
|
ouyangxuhua
|
d508cfa381
|
组织模块功能实现
|
2015-11-12 14:55:31 +08:00 |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
2015-11-12 09:32:00 +08:00 |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
2015-11-05 17:57:07 +08:00 |
|
ouyangxuhua
|
b127eadb9d
|
Merge branch 'szzh' into dev_hjq
|
2015-11-03 17:22:05 +08:00 |
|
ouyangxuhua
|
3f289dcd74
|
org开发部分（未完）
|
2015-11-03 17:21:32 +08:00 |
|
ouyangxuhua
|
eadab840b6
|
建立组织、成员表及模型控制器；
编写创建组织页面。
|
2015-11-03 11:19:38 +08:00 |
|
ouyangxuhua
|
636063c6ca
|
添加组织表和组织成员表
|
2015-11-02 17:22:09 +08:00 |
|
ouyangxuhua
|
d57e01f17e
|
编辑课程成员后，更新老师数量和学生数量
|
2015-11-02 17:19:38 +08:00 |
|
ouyangxuhua
|
66b8524a41
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-02 15:47:13 +08:00 |
|
ouyangxuhua
|
7980d92ff7
|
搜索课程，使结果按照开课时间、创建时间倒排
|
2015-11-02 15:46:21 +08:00 |
 cxt
|
ec42f9413c
|
发布日期放在截止日期的右边，占位符改为发布日期(可选)
|
2015-11-02 14:59:17 +08:00 |
|
cxt
|
32eb508caa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-02 14:52:14 +08:00 |
|
cxt
|
4abb532fd4
|
新注册的用户默认身份为空 编辑资料时身份是必填的
|
2015-11-02 14:51:56 +08:00 |
|
ouyangxuhua
|
6c7a4d139d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-02 14:20:25 +08:00 |
|
ouyangxuhua
|
1a7e1db3fb
|
资源库鼠标在移动时，灰色条跟着动
|
2015-11-02 14:20:14 +08:00 |
 lizanle
|
b762a639ea
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-02 13:47:25 +08:00 |
|
lizanle
|
bd5a316842
|
反馈框 信息修改
|
2015-11-02 13:47:18 +08:00 |
|
ouyangxuhua
|
4dcbe18027
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-02 13:12:21 +08:00 |
|
ouyangxuhua
|
583b92a842
|
课程添加或者删除成员时，实时更新课程成员数量。
|
2015-11-02 13:12:03 +08:00 |
|
ouyangxuhua
|
fb692fad4c
|
在项目设置中，添加或删除成员时，实时更新项目成员数量。
|
2015-11-02 12:54:58 +08:00 |
|
lizanle
|
8846e2ff67
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-02 10:37:51 +08:00 |
|
lizanle
|
0aa2aefe03
|
修改用户名密码不可用
|
2015-11-02 10:30:51 +08:00 |
|
cxt
|
a2e2c5de3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-02 10:14:18 +08:00 |
|
lizanle
|
6fffcec250
|
如果没有填写真实名字的话，那么就要用用户名了。
|
2015-11-02 10:10:32 +08:00 |
|
cxt
|
6e7a6909d6
|
作业动态中的未发布作业显示发布时间
|
2015-11-02 10:02:02 +08:00 |
|
lizanle
|
46680a7cfe
|
Merge branch 'szzh' into gitlab_guange
|
2015-11-02 09:59:56 +08:00 |
|
cxt
|
25e1eb75ab
|
课程内发布作业失败
|
2015-11-02 09:49:58 +08:00 |
|
lizanle
|
6288151f40
|
qq群加入链接问题
|
2015-11-02 09:49:21 +08:00 |
|
lizanle
|
7df2a632fc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-02 09:35:41 +08:00 |
|
lizanle
|
681f33ee2c
|
取消大纲 提示
|
2015-11-02 09:35:13 +08:00 |
 huang
|
066d04016e
|
去掉重复“提交代码”
|
2015-11-02 08:39:17 +08:00 |
 guange
|
fa0332babd
|
只有在同步项目时才同步用户
|
2015-11-01 22:25:42 +08:00 |
|
guange
|
be25a57eaf
|
同步用户bug解决
|
2015-11-01 21:49:07 +08:00 |
|
cxt
|
0fb48a41cb
|
课程搜索页面的加入按钮
|
2015-10-30 19:03:49 +08:00 |
|
lizanle
|
4b9a60658f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 17:51:20 +08:00 |
|
lizanle
|
7962bdf5a2
|
outline
after keyboard enter
_course_outline_list cannot disppear
|
2015-10-30 17:51:12 +08:00 |
|
huang
|
48d0553e8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-30 17:47:04 +08:00 |
|
huang
|
babed5382f
|
Merge branch 'develop' into szzh
|
2015-10-30 17:46:31 +08:00 |
|
huang
|
2b89244f52
|
修改用户url问题
解决urlhttp重复问题
|
2015-10-30 17:45:44 +08:00 |
|
lizanle
|
732e4e1017
|
user_message
enter course message ,username need to be realname
|
2015-10-30 17:32:50 +08:00 |
|
lizanle
|
55db83d31c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 17:28:45 +08:00 |
|
lizanle
|
19f3172966
|
user_message
enter course message ,username need to be realname
|
2015-10-30 17:28:35 +08:00 |
|
cxt
|
97de8b584c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-30 17:24:26 +08:00 |
|
cxt
|
3bb56f1606
|
教辅可查看未发布的作业
|
2015-10-30 17:24:09 +08:00 |
|
lizanle
|
b7a6bc3614
|
outline url
|
2015-10-30 17:21:12 +08:00 |
|
lizanle
|
efef1d943f
|
outline bug
|
2015-10-30 17:13:06 +08:00 |
|
lizanle
|
e0c488f970
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 16:56:06 +08:00 |