 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 |
|
guange
|
7e2482167d
|
.
|
2016-06-24 15:31:45 +08:00 |
|
guange
|
16a9f017b6
|
error
|
2016-06-24 15:28:44 +08:00 |
|
huang
|
09b78fc546
|
中文
|
2016-06-24 15:13:09 +08:00 |
|
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 15:11:52 +08:00 |
|
guange
|
485d0e3743
|
ticket处理
|
2016-06-24 14:59:50 +08:00 |
|
Your Name
|
06fe02890f
|
index for sonar result
|
2016-06-24 14:59:17 +08:00 |
|
yuanke
|
c61c14fa97
|
Merge branch 'yuanke' into develop
|
2016-06-24 14:35:59 +08:00 |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
2016-06-24 14:16:39 +08:00 |
|
guange
|
e21f4e0b4d
|
merge
|
2016-06-24 13:52:11 +08:00 |
|
yuanke
|
64d87b7398
|
修改组织添加成员的BUG
|
2016-06-24 13:50:28 +08:00 |
|
guange
|
f9075e08ba
|
merge
|
2016-06-24 13:35:26 +08:00 |
|
guange
|
d348981721
|
加入邀请码
|
2016-06-24 13:29:36 +08:00 |
|
Your Name
|
128f6721be
|
stoped the zhizhen
|
2016-06-24 13:00:02 +08:00 |
|
Your Name
|
de80403e8d
|
add address to config
|
2016-06-24 12:38:39 +08:00 |
|
Your Name
|
e4e0e7b166
|
helper
|
2016-06-24 12:17:05 +08:00 |
|
yuanke
|
2a971c3bc6
|
修改有的组织添加成员的BUG
|
2016-06-24 11:24:48 +08:00 |
|
yuanke
|
e818b5fb07
|
旧的注册页面去掉
|
2016-06-24 11:22:43 +08:00 |
|
cxt
|
2959391438
|
作业列表：没有作业时下拉框被点击后，显示一条记录：目前尚未发布作业
|
2016-06-24 11:20:48 +08:00 |
|
Your Name
|
e17aa4c5d8
|
color
|
2016-06-24 11:20:39 +08:00 |
|
cxt
|
a41d18dd0e
|
编程作业的作品详情在顶部增加“收起”
|
2016-06-24 11:02:29 +08:00 |
|
cxt
|
bd3277681c
|
分组作业的作业成绩导出、学生列表的导出
|
2016-06-24 10:50:40 +08:00 |
|
Your Name
|
580b232d62
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-06-24 10:47:28 +08:00 |
|
Your Name
|
05eb71036d
|
some css to added
|
2016-06-24 10:47:24 +08:00 |