cxt
|
fa4a2eb0dd
|
未答题的学生测验分数为0
|
2015-12-15 18:37:00 +08:00 |
lizanle
|
b7ae8d866f
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
2015-12-15 18:12:49 +08:00 |
lizanle
|
ef2f142f62
|
论坛资源允许下载
|
2015-12-15 18:12:32 +08:00 |
cxt
|
f7a932d7b9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-15 17:37:28 +08:00 |
ouyangxuhua
|
dc45321454
|
组织文章二级回复代码被覆盖,恢复代码
|
2015-12-15 17:34:40 +08:00 |
cxt
|
44ce4fe592
|
多次点击留言不会重复提交
|
2015-12-15 17:34:08 +08:00 |
cxt
|
45726576cf
|
学生测验列表的点击
|
2015-12-15 17:31:27 +08:00 |
ouyangxuhua
|
af157a9c63
|
组织资源栏目增加标签功能
|
2015-12-15 17:30:24 +08:00 |
cxt
|
086cfa3867
|
学生列表不可点击
|
2015-12-15 16:51:21 +08:00 |
guange
|
4ce9eb428e
|
at样式问题
|
2015-12-15 16:28:11 +08:00 |
cxt
|
90c7822c38
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-15 16:06:59 +08:00 |
cxt
|
72c475e8a2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-15 16:03:26 +08:00 |
cxt
|
d6c2b95858
|
学生测验列表的提示信息
|
2015-12-15 16:02:10 +08:00 |
cxt
|
0215e5e38c
|
若测验已截止且学生已提交则在测验列表后面显示“已答”
|
2015-12-15 15:37:57 +08:00 |
cxt
|
0deffdba33
|
在线测验学生答题时可点击保存也可点击提交
|
2015-12-15 15:21:52 +08:00 |
Tim
|
b687c42de3
|
Merge branch 'dev_zanle' of https://git.trustie.net/jacknudt/trustieforge into dev_zanle
|
2015-12-15 15:01:21 +08:00 |
Tim
|
b761121f9f
|
"指派给"颜色更换
|
2015-12-15 15:00:24 +08:00 |
guange
|
da5709e3f0
|
.
|
2015-12-15 14:52:24 +08:00 |
cxt
|
0b25f36a7f
|
在线测验再次编辑时默认隐藏头部编辑块
|
2015-12-15 14:39:32 +08:00 |
ouyangxuhua
|
d9df926c2b
|
组织添加项目/组织弹窗,点击取消后,关闭弹窗。
|
2015-12-15 10:47:35 +08:00 |
cxt
|
1f4454d908
|
课程左侧的在线测验统计数
|
2015-12-15 10:43:43 +08:00 |
ouyangxuhua
|
3efb36a28e
|
在组织非资源栏目页面中,添加资源后跳转至资源栏目页面。
|
2015-12-15 09:59:11 +08:00 |
guange
|
8d797c5c0b
|
项目动态添加at
|
2015-12-15 09:09:41 +08:00 |
huang
|
ea1849e51f
|
去掉邮件token值
|
2015-12-15 09:09:26 +08:00 |
lizanle
|
88c2db47b7
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/helpers/application_helper.rb
|
2015-12-15 08:48:08 +08:00 |
guange
|
4f57e48b92
|
merge
|
2015-12-14 18:20:32 +08:00 |
guange
|
d1315e35b5
|
merge
|
2015-12-14 17:26:40 +08:00 |
guange
|
f61f639af2
|
转换为remote js
|
2015-12-14 17:13:57 +08:00 |
cxt
|
2b5bf9540d
|
关闭了匿评再补交作品,给学生的提示信息中“当前作业已开启匿评...”改为“当前作业已关闭匿评...”
|
2015-12-14 17:11:07 +08:00 |
cxt
|
438ae82980
|
非课程学生不能关联项目
|
2015-12-14 17:02:44 +08:00 |
ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
2015-12-14 16:41:18 +08:00 |
cxt
|
85b11010d2
|
在线测验报500、 学生看不到已截止的测验、测验列表的样式调整
|
2015-12-14 16:18:39 +08:00 |
lizanle
|
f3013ca3e7
|
修改了搜索的提示描述
|
2015-12-14 11:22:36 +08:00 |
lizanle
|
c5f903146d
|
博客资源下载问题
|
2015-12-14 11:19:43 +08:00 |
lizanle
|
9aebafee09
|
课程添加更新时间
|
2015-12-14 11:11:09 +08:00 |
lizanle
|
14912078ee
|
博客资源允许下载
|
2015-12-14 11:03:04 +08:00 |
ouyangxuhua
|
b72cc82e4d
|
组织资源栏目添加文件标签功能
|
2015-12-14 10:59:32 +08:00 |
lizanle
|
85e2eab8c3
|
发送资源
|
2015-12-14 10:57:17 +08:00 |
huang
|
5ca8d4cd66
|
修改http链接自动换域名
|
2015-12-14 10:54:37 +08:00 |
lizanle
|
c004b05991
|
资源库搜索 sql注入
|
2015-12-14 10:52:19 +08:00 |
lizanle
|
f6867068f5
|
项目 帖子 更新时间
资源 下载次数
用户 最后登陆时间
|
2015-12-14 10:27:30 +08:00 |
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目,增加搜索功能
|
2015-12-14 10:26:34 +08:00 |
lizanle
|
9b86ec3044
|
更新时间
|
2015-12-14 10:07:55 +08:00 |
cxt
|
eb8e9f32a3
|
作品列表的私有项目不可点击
|
2015-12-14 10:06:19 +08:00 |
guange
|
91b245ad2c
|
lastname为空时也可以加,可以省掉查询extensions的语句
|
2015-12-12 18:06:59 +08:00 |
lizanle
|
7c114e1a13
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-11 19:34:29 +08:00 |
lizanle
|
f028992a18
|
帖子搜索
|
2015-12-11 19:34:17 +08:00 |
cxt
|
7a0828a826
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 19:13:43 +08:00 |
cxt
|
502310425b
|
匿评成绩为空
|
2015-12-11 19:13:34 +08:00 |
huang
|
a791c39b4b
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 18:12:25 +08:00 |
cxt
|
dfd0c95f2a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 18:11:48 +08:00 |
huang
|
616679e9c1
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 18:07:57 +08:00 |
cxt
|
42f0fc62e9
|
分组成员不能修改作品
|
2015-12-11 18:07:30 +08:00 |
cxt
|
1d2b6165ef
|
分组作业报500
|
2015-12-11 18:00:55 +08:00 |
huang
|
6b9a612594
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-11 17:58:37 +08:00 |
huang
|
0ac4821f14
|
修改密码导航栏错误
|
2015-12-11 17:56:26 +08:00 |
lizanle
|
df1d1a4685
|
论坛上传资源没有保存成功
|
2015-12-11 17:54:07 +08:00 |
cxt
|
1674391e4b
|
若删除追加的附件,则“追加附件”字样及“追加时间”也应删除
|
2015-12-11 17:39:34 +08:00 |
ouyangxuhua
|
c2d21b5a6b
|
隐藏组织栏目资源列表
|
2015-12-11 17:11:11 +08:00 |
cxt
|
e5192c7b1a
|
记录学生作品的提交和编辑记录
|
2015-12-11 17:02:34 +08:00 |
ouyangxuhua
|
de0b5d1897
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-11 16:58:19 +08:00 |
ouyangxuhua
|
be590497b9
|
组织文章设为首页后,跳转至首页
|
2015-12-11 16:58:00 +08:00 |
cxt
|
6c9a139450
|
编辑分组作业的作品报500
|
2015-12-11 16:36:19 +08:00 |
cxt
|
ac77f0d40a
|
点击学号、班级也要弹出答题详情页面
|
2015-12-11 16:35:43 +08:00 |
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型,可以添加文件、删除文件、显示文件等
|
2015-12-11 16:30:50 +08:00 |
cxt
|
d4bde8e73c
|
调整学生作品列表的样式
|
2015-12-11 16:05:18 +08:00 |
lizanle
|
b178fb7f0a
|
消息提醒 病句
|
2015-12-11 15:56:37 +08:00 |
huang
|
b981f3dcea
|
修复项目删除403问题
课程回复的时候不显示删除按钮
|
2015-12-11 15:39:38 +08:00 |
lizanle
|
abc0598ed2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-11 15:37:14 +08:00 |
lizanle
|
03318aac97
|
登录名不可修改要变成灰色
|
2015-12-11 15:36:59 +08:00 |
cxt
|
c6470bc69b
|
提交作品选择分组成员时若某一个学生已加入到其他分组则不可选择
|
2015-12-11 15:31:15 +08:00 |
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2015-12-11 15:00:35 +08:00 |
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
2015-12-11 14:59:52 +08:00 |
cxt
|
a3715051b1
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 14:59:13 +08:00 |
cxt
|
f880ccd749
|
分组作业
|
2015-12-11 14:57:09 +08:00 |
lizanle
|
ec79ed04ee
|
Merge branch 'szzh' into dev_zanle
|
2015-12-11 14:47:32 +08:00 |
lizanle
|
b6607f7418
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 14:46:48 +08:00 |
huang
|
f2b8335912
|
移出成员时,删除项目后没有关联删除而引起的400问题
|
2015-12-11 13:48:52 +08:00 |
huang
|
fed989753a
|
修复林处账号不能查看消息的问题
|
2015-12-11 13:46:23 +08:00 |
huang
|
75fecc0402
|
项目删除功能
项目删除权限
课程列表用户颜色
|
2015-12-11 12:53:01 +08:00 |
huang
|
9c472b9358
|
课程成员列表乱的问题
|
2015-12-11 11:23:02 +08:00 |
huang
|
35c918cb40
|
Merge branch 'hjq_new_course' into develop
|
2015-12-11 11:02:09 +08:00 |
huang
|
fbd1b2f541
|
用户留言重复提交问题
|
2015-12-11 10:53:14 +08:00 |
huang
|
01b21ceda1
|
项目留言重复提交问题
|
2015-12-11 09:52:17 +08:00 |
huang
|
1ba0dae3c4
|
修复课程留言重复提交问题
|
2015-12-11 09:42:19 +08:00 |
cxt
|
ba5d72b315
|
管理员查看在线测验的权限
|
2015-12-11 09:18:12 +08:00 |
huang
|
670df76c70
|
注释掉项目邀请加入功能
|
2015-12-10 20:24:42 +08:00 |
huang
|
9710731a2c
|
课程配置添加登录名
|
2015-12-10 20:03:59 +08:00 |
huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
2015-12-10 18:59:54 +08:00 |
huang
|
a9510f4869
|
Merge branch 'dev_hjq' into develop
|
2015-12-10 17:29:52 +08:00 |
huang
|
4f7f4acb1f
|
课程删除
|
2015-12-10 17:26:03 +08:00 |
ouyangxuhua
|
aab9594ac9
|
1.解决英文版下,组织成员列表编辑成员显示错误;
2.解决在组织文章详情页面,删除文章报错的问题
|
2015-12-10 17:22:59 +08:00 |
houxiang
|
87be2dd7fe
|
modify the repositories_controller.rb conflict
|
2015-12-10 16:41:18 +08:00 |
huang
|
fbba933a46
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2015-12-10 16:09:42 +08:00 |
huang
|
be940ee3aa
|
Merge branch 'develop' into hjq_new_course
|
2015-12-10 16:09:36 +08:00 |
houxiang
|
e9cfe007bb
|
modify by hx
|
2015-12-10 15:59:31 +08:00 |
huang
|
dbadbf8621
|
修改密码gitlab同步
|
2015-12-10 15:54:44 +08:00 |
ouyangxuhua
|
0a85fbf613
|
1.配置栏目列表,增加类型一列;
2.暂时隐藏类型为“资源”的栏目的链接
|
2015-12-10 15:53:05 +08:00 |
huang
|
74fe2607f3
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-10 10:58:34 +08:00 |
ouyangxuhua
|
1e652faec7
|
Merge branch 'develop' into dev_hjq
|
2015-12-10 10:55:59 +08:00 |
huang
|
4e0b442309
|
修改邮箱的时候同步到gitlab
|
2015-12-10 10:50:15 +08:00 |
lizanle
|
7f866a0b3a
|
课程被删除后不能被搜索
|
2015-12-10 10:00:14 +08:00 |
ouyangxuhua
|
2f7260cba2
|
1.在栏目表中增加field_type(类型)字段;
2.在组织配置-》栏目,增加栏目类型。
|
2015-12-09 17:24:59 +08:00 |
huang
|
db582fd639
|
修改不同分支之间的显示最新提交状态
|
2015-12-09 17:08:03 +08:00 |
huang
|
f2c1595d0d
|
1、同步没成功检测程序
2、注册验证修改
|
2015-12-09 16:57:12 +08:00 |
cxt
|
4e04df7a8a
|
分组作业的动态显示及关联项目
|
2015-12-09 16:33:48 +08:00 |
ouyangxuhua
|
78fb8b6254
|
1.编辑或者删除栏目的帖子返回对应页面
|
2015-12-09 16:19:52 +08:00 |
lizanle
|
2fbad38522
|
优化排序参数
用于排序的字段最好不要分词
不然就是多值字段的排序会浪费大量的内存
|
2015-12-09 12:57:25 +08:00 |
cxt
|
f2f81d5243
|
作品列表的代码缩进
|
2015-12-09 10:52:56 +08:00 |
ouyangxuhua
|
333c0e41a0
|
1.栏目增加新建帖子功能;
2.点击某栏目,显示相应的动态;
3.编辑栏目里的文章后,返回相应的栏目动态。
|
2015-12-09 10:48:15 +08:00 |
cxt
|
53f9141cf1
|
分组作业动态
|
2015-12-09 10:29:54 +08:00 |
lizanle
|
6c02115f3f
|
不允许修改登录名
|
2015-12-09 10:17:30 +08:00 |
guange
|
3476731b83
|
将at js data整合到文件中
|
2015-12-09 09:59:13 +08:00 |
lizanle
|
c1d82d6348
|
输入框 和 ke对齐
|
2015-12-09 09:39:07 +08:00 |
ouyangxuhua
|
09f0d0201e
|
组织增加栏目发帖功能
|
2015-12-09 09:23:22 +08:00 |
cxt
|
a9f6e817b4
|
分组作业关联项目
|
2015-12-08 17:37:15 +08:00 |
cxt
|
c26778b41c
|
分组作业关联项目
|
2015-12-08 17:36:35 +08:00 |
huang
|
ac9f13c842
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
Conflicts:
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
2015-12-08 17:13:50 +08:00 |
huang
|
916d99be82
|
课程删除功能
|
2015-12-08 16:45:26 +08:00 |
houxiang
|
56cb83ffba
|
版本库首页没有统计commit_count,具体的详情页在开始统计
|
2015-12-08 15:56:31 +08:00 |
lizanle
|
92bc3361fe
|
匿评失败消息改变
|
2015-12-08 15:33:17 +08:00 |
ouyangxuhua
|
1881e18742
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-08 15:31:17 +08:00 |
ouyangxuhua
|
bb7bcf46a9
|
1.设置首页后,跳转至组织首页
|
2015-12-08 15:30:58 +08:00 |
huang
|
42f5b86d95
|
添加字段删除课程
|
2015-12-08 10:32:10 +08:00 |
huang
|
7c34122ff6
|
fork的时候如果用户没有同步,则自动同步
|
2015-12-08 09:46:29 +08:00 |
huang
|
068c305c06
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
Conflicts:
app/views/courses/member.html.erb
app/views/courses/settings.html.erb
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
2015-12-08 09:10:21 +08:00 |
lizanle
|
5fcbde2ff1
|
资源库监听回车键
|
2015-12-07 17:29:14 +08:00 |
ouyangxuhua
|
8b14e7c549
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-07 17:19:52 +08:00 |
ouyangxuhua
|
5198f4dde4
|
Merge branch 'dev_hjq' into develop
|
2015-12-07 17:19:26 +08:00 |
ouyangxuhua
|
9d6b4783df
|
删除组织配置栏目的组织首页项
|
2015-12-07 17:18:46 +08:00 |
ouyangxuhua
|
a8b7d1b81f
|
回复项目里的message,不增加项目动态及组织动态
|
2015-12-07 17:11:30 +08:00 |
huang
|
91fa3f6fab
|
解决项目样式冲突问题
|
2015-12-07 16:52:23 +08:00 |
lizanle
|
ee661bb6d4
|
input光光标到最后的折中解决方案
|
2015-12-07 16:21:00 +08:00 |
ouyangxuhua
|
e45ce0fb95
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-07 15:52:32 +08:00 |
lizanle
|
9e01f02a66
|
作业题目统一改为作业标题
作业匿评截止消息改造
|
2015-12-07 15:52:22 +08:00 |
ouyangxuhua
|
76db95aa03
|
1.组织页面中,退出后刷新组织页面;
2.组织页面中,点击“个人主页”,打开新的页面;
3.组织页面页首部分,用户名不链接用户页面。
|
2015-12-07 15:52:13 +08:00 |
lizanle
|
ad2d9fa374
|
添加对帖子的全文搜索
|
2015-12-07 15:32:57 +08:00 |
cxt
|
cb7ad682cf
|
Merge branch 'develop' into cxt_course
|
2015-12-07 15:21:43 +08:00 |
cxt
|
c8f4149206
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-07 15:18:43 +08:00 |
cxt
|
8e999ed9f0
|
作业动态的回复删除功能只在鼠标进入时显示
|
2015-12-07 15:18:32 +08:00 |
huang
|
5eb249515c
|
版本库显示样式
|
2015-12-07 15:12:30 +08:00 |
guange
|
57d05d147e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-12-07 15:06:15 +08:00 |
guange
|
71a5504017
|
去除at功能,合并
|
2015-12-07 15:05:51 +08:00 |
huang
|
9ff41c214b
|
Merge branch 'develop' into dev_hjq
|
2015-12-07 14:40:25 +08:00 |
ouyangxuhua
|
9f30c7a44e
|
如果用户没有登陆,不能在组织页面中,增加项目或课程。
|
2015-12-07 14:37:35 +08:00 |
ouyangxuhua
|
7057a4cfea
|
组织页首增加退出功能
|
2015-12-07 14:31:08 +08:00 |
lizanle
|
ef2ef7111c
|
添加对帖子的全文搜索
|
2015-12-07 14:31:05 +08:00 |
guange
|
1a2aff99be
|
调整显示的格式
|
2015-12-07 14:18:01 +08:00 |
guange
|
0c7db76371
|
tag没闭合的错误
|
2015-12-07 13:54:52 +08:00 |
ouyangxuhua
|
c229104d78
|
修改编辑组织标题
|
2015-12-07 13:03:21 +08:00 |
ouyangxuhua
|
5034ddb4b6
|
修复组织的bug
|
2015-12-07 12:53:51 +08:00 |
cxt
|
79ce5c9ac5
|
匿评已结束时作业动态的作品按钮显示成“查看作品”
|
2015-12-07 11:31:37 +08:00 |
cxt
|
73e9a00a1a
|
作业动态添加回复的删除功能
|
2015-12-07 11:25:41 +08:00 |
cxt
|
0472a5ed0c
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-07 10:54:28 +08:00 |
cxt
|
a62ecc10ad
|
作业动态设置评分后无法刷新
|
2015-12-07 10:54:18 +08:00 |
huang
|
ab1c945a30
|
修改版本库库权限
自己不能fork自己的项目
|
2015-12-07 10:34:10 +08:00 |
Tim
|
75d79c6c47
|
问题跟踪样式调整
|
2015-12-07 10:14:39 +08:00 |
huang
|
f67386e8a0
|
组织模块丢失代码还原
|
2015-12-07 10:06:51 +08:00 |
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
2015-12-07 09:47:18 +08:00 |
guange
|
3d2ac4b59f
|
KE引用统一使用import_ke
|
2015-12-06 15:03:36 +08:00 |
guange
|
af31946586
|
issue列表开启AT功能
|
2015-12-06 15:03:12 +08:00 |
huang
|
bd3d0547f5
|
组织样式修改
|
2015-12-05 14:34:16 +08:00 |
ouyangxuhua
|
4c9d9dee35
|
组织首页样式
|
2015-12-05 13:27:58 +08:00 |
ouyangxuhua
|
108865968b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-05 12:01:49 +08:00 |
ouyangxuhua
|
12c57e7e4b
|
将Jquery引入组织首页
|
2015-12-05 12:01:04 +08:00 |
huang
|
9d68fd7d28
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-05 11:39:50 +08:00 |
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
2015-12-05 11:39:40 +08:00 |
ouyangxuhua
|
37a7abea53
|
组织首页
|
2015-12-05 11:31:20 +08:00 |
ouyangxuhua
|
01b82e59d8
|
实现组织首页功能
|
2015-12-05 11:30:05 +08:00 |
ouyangxuhua
|
5b0bdb5069
|
修改组织栏目的内容及样式
|
2015-12-04 18:19:35 +08:00 |
huang
|
c7058e6bbf
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-04 17:45:18 +08:00 |
huang
|
4cb58211ad
|
邮件消息提示语修改
|
2015-12-04 17:44:46 +08:00 |
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
2015-12-04 17:34:48 +08:00 |
huang
|
6fad26cabf
|
去死奥placebold
|
2015-12-04 17:32:56 +08:00 |
cxt
|
8b160b1c38
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-04 17:29:55 +08:00 |
cxt
|
19c34de643
|
编辑作品时弹出的作品确认框不提供重试的按钮
|
2015-12-04 17:29:39 +08:00 |
huang
|
120a7274d3
|
fork样式显示
|
2015-12-04 17:22:22 +08:00 |
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
2015-12-04 16:43:48 +08:00 |
huang
|
61d76e6744
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-04 16:42:55 +08:00 |
lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
2015-12-04 16:42:02 +08:00 |
huang
|
9716e99533
|
课程成员提交“修改角色”
|
2015-12-04 16:33:56 +08:00 |
huang
|
7daaa59010
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-12-04 16:22:02 +08:00 |
huang
|
b6edabed9c
|
修改角色
|
2015-12-04 16:21:48 +08:00 |
cxt
|
8fe53468e1
|
作品追加附件
|
2015-12-04 16:21:11 +08:00 |
Tim
|
dfa9b4cf74
|
学生列表调整
|
2015-12-04 16:13:55 +08:00 |
huang
|
4a41039fa6
|
课程英雄榜改成课程活跃度
|
2015-12-04 15:58:56 +08:00 |
huang
|
4d0956dff1
|
Merge branch 'develop' into gitlab_guange
|
2015-12-04 15:54:56 +08:00 |
huang
|
9f73807e05
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
处理冲突
|
2015-12-04 15:54:18 +08:00 |
huang
|
c1747ab217
|
fork重名,提交
|
2015-12-04 15:49:05 +08:00 |
lizanle
|
dbfc4969e0
|
测验消息bug
|
2015-12-04 15:36:19 +08:00 |
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
2015-12-04 10:59:14 +08:00 |
ouyangxuhua
|
2855c0e409
|
修改项目动态,使其与课程动态及个人动态的样式一致,包括有回复框、过滤菜单、宽度、间距等
|
2015-12-04 10:59:09 +08:00 |
lizanle
|
6553559929
|
发送消息
|
2015-12-04 10:56:16 +08:00 |
huang
|
8f024bdf4d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
|
2015-12-04 09:12:24 +08:00 |
huang
|
7fe3a02d81
|
Merge branch 'gitlab_guange' into develop
|
2015-12-04 09:11:22 +08:00 |
huang
|
89b8f7783d
|
添加forked_form的id
|
2015-12-04 08:57:29 +08:00 |
huang
|
5d18b14e73
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
|
2015-12-04 00:16:21 +08:00 |
huang
|
057d9a3337
|
0
|
2015-12-04 00:15:47 +08:00 |
huang
|
8d891a9faa
|
fork权限
|
2015-12-03 20:57:09 +08:00 |
huang
|
b91c65798d
|
课程成员添加设置
|
2015-12-03 20:44:29 +08:00 |