 cxt
|
4314f6e36a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
|
2016-06-30 15:37:16 +08:00 |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
2016-06-30 15:36:46 +08:00 |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
2016-06-30 10:44:11 +08:00 |
 Tim
|
590b879f02
|
追加附件弹框不固定bug修复
|
2016-06-29 16:54:12 +08:00 |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
2016-06-29 10:45:56 +08:00 |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
2016-06-28 15:13:04 +08:00 |
|
cxt
|
3c21e8fcba
|
Merge branch 'develop' into cxt_course
|
2016-06-27 08:54:30 +08:00 |
 huang
|
012eae9b93
|
gems
|
2016-06-24 19:54:01 +08:00 |
|
huang
|
01bedc4bc2
|
编码问题
|
2016-06-24 19:40:06 +08:00 |
|
huang
|
5aa79defbe
|
迁移问题
|
2016-06-24 19:27:15 +08:00 |
|
huang
|
6f2ce2668c
|
注释掉gem
|
2016-06-24 19:23:13 +08:00 |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
2016-06-24 19:17:26 +08:00 |
Your Name
|
c658296e2b
|
config
|
2016-06-24 19:12:07 +08:00 |
|
cxt
|
f984a01cdc
|
跳转协议问题
|
2016-06-24 18:50:47 +08:00 |
|
Your Name
|
537f152562
|
0
|
2016-06-24 18:47:54 +08:00 |
|
cxt
|
b5c9156c10
|
加入课程报403
|
2016-06-24 18:43:12 +08:00 |
|
cxt
|
0d66763026
|
迟交扣分
|
2016-06-24 18:23:00 +08:00 |
|
cxt
|
8d5501615c
|
加入课程的样式调整
|
2016-06-24 18:09:18 +08:00 |
|
cxt
|
492b2f895c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-24 17:58:56 +08:00 |
|
cxt
|
4f342142e6
|
组织文章的展开更多
|
2016-06-24 17:58:50 +08:00 |
|
Your Name
|
e5ad64831a
|
0
|
2016-06-24 17:50:26 +08:00 |
|
huang
|
6bc4dec636
|
列表界面
|
2016-06-24 17:46:21 +08:00 |
|
Your Name
|
244c178758
|
666
|
2016-06-24 17:39:10 +08:00 |
 guange
|
7df9fe7d60
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-24 17:37:11 +08:00 |
|
guange
|
b5bfe40693
|
.
|
2016-06-24 17:35:55 +08:00 |
 yuanke
|
e3c094cb07
|
Merge branch 'yuanke' into develop
|
2016-06-24 17:19:25 +08:00 |
|
yuanke
|
f1682edf64
|
修改创建贴吧BUG
|
2016-06-24 17:18:04 +08:00 |
|
guange
|
9e61f2229e
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-24 17:15:10 +08:00 |
|
guange
|
084b545be9
|
修改为正式版
|
2016-06-24 17:14:58 +08:00 |
|
cxt
|
b2f939fa92
|
代码调整
|
2016-06-24 17:01:35 +08:00 |
|
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:54:19 +08:00 |
|
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-24 16:53:58 +08:00 |
|
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:52:00 +08:00 |
|
guange
|
c39a982093
|
二维码
|
2016-06-24 16:51:40 +08:00 |
|
cxt
|
eab000306c
|
动态回复的展开更多、收起，组织文章回复不可用
|
2016-06-24 16:38:36 +08:00 |
|
guange
|
4436e87c84
|
.
|
2016-06-24 16:35:27 +08:00 |
|
cxt
|
c0e58d19fa
|
导出的作业成绩中的缺评、迟交扣分应与作品列表的一致
|
2016-06-24 16:25:29 +08:00 |
|
Your Name
|
eae70f9c71
|
some config
|
2016-06-24 16:18:17 +08:00 |
|
cxt
|
d558a4d357
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-24 16:12:31 +08:00 |
|
cxt
|
afc8fad7fd
|
通过邀请码加入课程
|
2016-06-24 16:12:24 +08:00 |
|
Tim
|
a542ba46a4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-24 15:55:07 +08:00 |
|
Tim
|
ec33569033
|
取消拖拽
|
2016-06-24 15:54:56 +08:00 |
|
huang
|
4ea210a05b
|
重复改成代码重复
|
2016-06-24 15:46:04 +08:00 |
|
guange
|
657e506071
|
.
|
2016-06-24 15:45:50 +08:00 |
|
guange
|
9a9f6400da
|
.
|
2016-06-24 15:42:00 +08:00 |
|
guange
|
c522d7160c
|
.
|
2016-06-24 15:40:27 +08:00 |
|
guange
|
9ec1f916b6
|
.
|
2016-06-24 15:38:46 +08:00 |
|
cxt
|
260759e4db
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-24 15:36:03 +08:00 |
|
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
2016-06-24 15:34:32 +08:00 |
|
cxt
|
ac629440b1
|
课程邀请码
|
2016-06-24 15:33:45 +08:00 |