 Tim
|
399f757811
|
0
|
2016-05-04 09:01:51 +08:00 |
 huang
|
39dd62580a
|
完成2级目录详情页面
|
2016-05-03 20:08:40 +08:00 |
|
huang
|
a9059c4c2e
|
帖子添加编辑删除功能
|
2016-05-03 19:32:38 +08:00 |
|
huang
|
48002eb247
|
二级目录讨论区添加帖子回复功能
|
2016-05-03 19:03:28 +08:00 |
|
huang
|
4489bc13d7
|
课程列表按创建时间排序
|
2016-05-03 18:17:03 +08:00 |
 yuanke
|
8b672cc7c3
|
项目、课程列表增加更新时间
|
2016-05-03 17:57:24 +08:00 |
|
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
2016-05-03 17:15:46 +08:00 |
|
huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
2016-05-03 17:12:38 +08:00 |
|
huang
|
5fb5a2e8bc
|
二级域名帖子列表两种形式区分
|
2016-05-03 16:49:13 +08:00 |
|
yuanke
|
96e7c9d134
|
新闻排序时间改为更新时间
|
2016-05-03 16:34:31 +08:00 |
 cxt
|
c49627913b
|
更改评分设置中的教师优先，评分未更新
|
2016-05-03 15:12:56 +08:00 |
|
yuanke
|
d5805e8103
|
课程、项目列表不显示已删除的
|
2016-05-03 11:24:16 +08:00 |
|
cxt
|
6b1137980e
|
挂起的作业编辑截止日期后报500
|
2016-05-03 10:58:49 +08:00 |
|
cxt
|
39c2365338
|
已拒绝的私有作业不可引用
|
2016-05-03 10:15:09 +08:00 |
|
cxt
|
3f7a391214
|
课程和项目的排序
|
2016-04-29 20:45:14 +08:00 |
|
yuanke
|
b199a6b8b2
|
列表人气排序修改
|
2016-04-29 19:24:20 +08:00 |
|
cxt
|
0bb6d42c80
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-29 19:22:08 +08:00 |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
2016-04-29 19:21:54 +08:00 |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
2016-04-29 17:57:32 +08:00 |
|
cxt
|
389b75f7ab
|
申请引用私有作业时发送消息
|
2016-04-29 17:55:57 +08:00 |
|
huang
|
253189ea7a
|
帖子列表中添加分页
|
2016-04-29 16:33:10 +08:00 |
|
huang
|
f6c3e89454
|
二级目录帖子详细页面
|
2016-04-29 16:14:08 +08:00 |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-04-29 15:58:05 +08:00 |
|
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
2016-04-29 15:54:37 +08:00 |
|
yuanke
|
f8abd46ae9
|
列表修改
|
2016-04-29 15:52:44 +08:00 |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
2016-04-29 15:46:26 +08:00 |
|
huang
|
2b4f16e5f1
|
二级目录新界面的帖子列表页面
|
2016-04-29 14:46:40 +08:00 |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
2016-04-29 13:42:58 +08:00 |
|
huang
|
d8480ea3c6
|
二级目录内容页面
|
2016-04-29 11:33:56 +08:00 |
|
huang
|
1685449381
|
二级目录框架及结构
|
2016-04-28 17:36:29 +08:00 |
|
yuanke
|
f185c59e90
|
Merge branch 'yuanke' into develop
|
2016-04-28 14:33:30 +08:00 |
|
yuanke
|
2cb9f0cd05
|
组织还原
|
2016-04-28 14:31:40 +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
|
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 |
|
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 |
|
yuanke
|
dac717bd97
|
列表左边菜单收缩
|
2016-04-27 14:12:56 +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 |
|
yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
2016-04-27 09:54:49 +08:00 |
|
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
2016-04-26 15:10:47 +08:00 |
|
cxt
|
49a7e2ce1d
|
关注和绑定登录后发送欢迎消息
|
2016-04-26 09:03:01 +08:00 |
|
yuanke
|
bb80cad1e3
|
Merge branch 'yuanke' into yuanke_1
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-25 14:03:27 +08:00 |
|
yuanke
|
d34b3780c8
|
课程列表修改
|
2016-04-25 10:44:46 +08:00 |
|
huang
|
c1437bb75b
|
北斗界面
|
2016-04-24 14:39:33 +08:00 |
|
yuanke
|
f6d09e0554
|
配置中增加一个 隐藏课程信息的功能
|
2016-04-24 14:23:08 +08:00 |
|
yuanke
|
c8eaf293e7
|
课程列表
|
2016-04-24 10:49:33 +08:00 |
|
yuanke
|
81cd30cbda
|
Merge branch 'cxt_course' into yuanke_1
Conflicts:
db/schema.rb
|
2016-04-23 13:22:28 +08:00 |
|
yuanke
|
a4d250e168
|
博客列表
|
2016-04-23 13:20:49 +08:00 |
|
cxt
|
379859db67
|
评分设置
|
2016-04-22 17:33:49 +08:00 |
|
cxt
|
5695bcdda9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-22 16:33:04 +08:00 |
|
cxt
|
e2b18b3f48
|
作业编辑报500
|
2016-04-22 16:32:59 +08:00 |
|
huang
|
eb0e88d805
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-22 14:21:07 +08:00 |
|
yuanke
|
5c5d212193
|
博客列表
|
2016-04-22 13:52:33 +08:00 |
|
huang
|
17b5832df0
|
Merge branch 'hjq_beidou' into develop
|
2016-04-22 12:45:05 +08:00 |
|
cxt
|
da73d2b004
|
Merge branch 'cxt_course' into develop
|
2016-04-22 12:40:20 +08:00 |
|
cxt
|
9b4c275869
|
作品动态添加追加附件功能
|
2016-04-22 11:27:30 +08:00 |
|
huang
|
aaeec3ab6c
|
版本库show页面代码简化封装
|
2016-04-22 10:58:41 +08:00 |
|
cxt
|
4448cb0891
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-21 17:02:04 +08:00 |
|
cxt
|
16348654a5
|
启用匿评和禁用匿评时修改评分设置
|
2016-04-21 17:00:30 +08:00 |
|
huang
|
cccc2a7eb7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-21 16:21:49 +08:00 |
|
huang
|
ab8c1a0bad
|
Merge branch 'hjq_beidou' into develop
|
2016-04-21 16:21:39 +08:00 |
|
yuanke
|
eddea2eabd
|
Merge branch 'yuanke' into yuanke_1
|
2016-04-21 14:01:54 +08:00 |
|
huang
|
42076a137d
|
项目统计添加判断
|
2016-04-21 11:19:21 +08:00 |
|
yuanke
|
5a5afd6d24
|
Merge branch 'yuanke' into develop
|
2016-04-21 11:17:30 +08:00 |
|
yuanke
|
d538d1967b
|
解决管理员界面代码测试列表404的问题
|
2016-04-21 11:16:32 +08:00 |
|
cxt
|
7a90c0ea10
|
评分设置修改多项时不应发多条模板消息
|
2016-04-21 10:51:43 +08:00 |
|
yuanke
|
85055f2a84
|
博客列表修改
|
2016-04-21 09:39:21 +08:00 |
|
yuanke
|
8f62cccfd6
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-20 16:14:26 +08:00 |
|
yuanke
|
ff177557c8
|
修改代码测试列表报500
|
2016-04-20 16:13:06 +08:00 |
|
yuanke
|
29115bca3a
|
博客列表修改
|
2016-04-20 16:12:20 +08:00 |
|
yuanke
|
4182bb5fe7
|
111
|
2016-04-20 14:39:38 +08:00 |
|
yuanke
|
c6174406fb
|
数据库语句使用rails已有的
|
2016-04-20 10:39:07 +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 |
|
huang
|
ade19af9f2
|
未登录附件不能下载问题
|
2016-04-19 10:55:17 +08:00 |
|
huang
|
200307ec9f
|
组织模块访问统计修改
|
2016-04-19 09:18:58 +08:00 |
|
yuanke
|
8c5497ac45
|
Merge branch 'yuanke' into develop
|
2016-04-15 19:21:11 +08:00 |
|
yuanke
|
fcfd17c8c9
|
修改代码评测的一个BUG
|
2016-04-15 19:20:24 +08:00 |
|
yuanke
|
5aba3fb11b
|
修改查重有时候失败的问题
|
2016-04-15 18:48:39 +08:00 |
|
cxt
|
51478bd232
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 17:21:07 +08:00 |
|
cxt
|
b07c3947d6
|
Merge branch 'cxt_course' into develop
|
2016-04-15 17:20:55 +08:00 |
|
yuanke
|
3dbedcdcbf
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-15 17:08:51 +08:00 |
|
yuanke
|
764dffd95e
|
动态里面加上代码查重
|
2016-04-15 17:07:38 +08:00 |
|
cxt
|
eeecc5ad08
|
禁用匿评的作业点击评分设置时不应出现缺评扣分的选项
|
2016-04-15 17:06:45 +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 |
|
huang
|
5e5f677bab
|
动态中显示默认分支的统计
|
2016-04-15 16:50:39 +08:00 |
|
huang
|
a21200ab14
|
动态中添加分支
|
2016-04-15 15:53:29 +08:00 |
|
cxt
|
9fdd229b2c
|
Merge branch 'cxt_course' into develop
|
2016-04-15 15:45:54 +08:00 |
|
huang
|
4a8d572cb1
|
项目动态中版本库统计样式
|
2016-04-15 15:38:08 +08:00 |
|
cxt
|
7f3fcb7d01
|
精品课程列表中的全部课程可点击动态数排序
|
2016-04-15 14:54:17 +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 |
|
cxt
|
36e8b05f9c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 11:32:38 +08:00 |
|
cxt
|
bca0a4bf39
|
Merge branch 'cxt_course' into develop
|
2016-04-15 11:32:24 +08:00 |
|
yuanke
|
e58f1ab94b
|
Merge branch 'yuanke' into develop
|
2016-04-15 11:29:40 +08:00 |
|
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
2016-04-15 11:28:20 +08:00 |
|
cxt
|
143f3f8f9a
|
管理员界面增加精品课程的设置
|
2016-04-15 11:26:56 +08:00 |
|
cxt
|
3b4f6f4846
|
添加分班和修改分班名称时刷新学生列表
|
2016-04-14 17:24:56 +08:00 |
|
cxt
|
2d4f724e33
|
导出的学生列表作品排序按作业发布时间升序排列
|
2016-04-14 15:01:18 +08:00 |
|
cxt
|
d91d2bfa17
|
作业下拉列表显示全部作业
|
2016-04-14 14:45:42 +08:00 |
|
huang
|
fddf03d80c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-14 13:44:14 +08:00 |
|
huang
|
7d8715e82b
|
Merge branch 'hjq_beidou' into develop
|
2016-04-14 13:43:58 +08:00 |
|
huang
|
2a00c4ddd7
|
版本库统计show权限统计
|
2016-04-14 13:39:19 +08:00 |
|
cxt
|
d948536a10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-14 12:33:15 +08:00 |
|
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 12:33:11 +08:00 |
|
cxt
|
19861ba8c6
|
超级管理员的组织可关联所有公开课程和项目
|
2016-04-14 12:30:33 +08:00 |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-14 11:32:35 +08:00 |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 11:29:26 +08:00 |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
2016-04-14 11:29:22 +08:00 |
|
huang
|
c87611dfec
|
动态中添加版本库统计
|
2016-04-14 11:18:17 +08:00 |
|
huang
|
acf4e15f09
|
统计数左侧刷新
|
2016-04-14 10:26:25 +08:00 |
|
huang
|
adf6cca435
|
完成代码行数的提交和统计
|
2016-04-13 20:39:20 +08:00 |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-13 16:52:52 +08:00 |
|
cxt
|
062af3c57a
|
作业积分出现负分
|
2016-04-13 16:11:57 +08:00 |
|
huang
|
f9c4c4b86f
|
版本库不同分支之间的统计
|
2016-04-13 16:03:59 +08:00 |
|
cxt
|
a21ea98b37
|
个人主页中的课程列表出现重复课程
|
2016-04-13 15:14:35 +08:00 |
|
huang
|
426f5a76cc
|
提交列表中添加不分支的提交记录功能
|
2016-04-13 14:44:57 +08:00 |
|
huang
|
f7cb451feb
|
gitlab版本库添加提交信息统计接口
|
2016-04-13 14:36:43 +08:00 |
|
cxt
|
fcd1684658
|
作业列表按更新时间排序 作业列表左上角添加作业的下拉列表
|
2016-04-13 11:20:38 +08:00 |
|
huang
|
04849659de
|
版本库统计
|
2016-04-12 16:00:54 +08:00 |
|
huang
|
dc0b7defa1
|
版本库show页面简化及注释
|
2016-04-12 11:10:30 +08:00 |
 guange
|
055ba00de5
|
绑定成功后关闭页面
|
2016-04-09 23:20:24 +08:00 |
|
huang
|
ab34fec172
|
资源导入的时候记数没有自动增加问题
|
2016-04-08 21:30:59 +08:00 |
|
huang
|
cd9ad535f5
|
1、修改默认图片
2、作品弹框问题
|
2016-04-08 20:44:09 +08:00 |
|
cxt
|
e007ee58ef
|
博客动态
|
2016-04-08 14:46:42 +08:00 |
|
guange
|
0731405828
|
重新再次进来的用户提示欢迎信息
|
2016-04-08 10:50:05 +08:00 |
|
guange
|
aa9cb4e579
|
merge
|
2016-04-08 10:44:36 +08:00 |
|
huang
|
549ee9daa2
|
上传非图片格式的不显示问题
|
2016-04-08 10:41:11 +08:00 |
|
huang
|
23a4a29c76
|
关联项目、课程中过滤掉私有课程、项目
|
2016-04-07 14:12:24 +08:00 |
|
huang
|
623114dc41
|
解决删除项目的私有资源显示在我的资源中的问题
|
2016-04-06 19:02:07 +08:00 |
|
huang
|
a6f6f63d6d
|
图片上传添加提示
|
2016-04-06 11:05:13 +08:00 |
|
huang
|
2162d7d4b8
|
组织banner上传功能
|
2016-04-06 10:40:38 +08:00 |
|
guange
|
ff93e9f79b
|
修改返回为json
|
2016-04-02 07:56:12 +08:00 |
|
guange
|
1926f0ba53
|
修改openid路由
|
2016-04-02 07:49:36 +08:00 |
|
guange
|
a25fe6cef8
|
修改openid路由
|
2016-04-02 07:47:34 +08:00 |
|
guange
|
9c93b3f9a6
|
修改openid调用位置
|
2016-04-02 07:43:55 +08:00 |
|
huang
|
e4b5a4df05
|
500wenti
|
2016-04-02 00:14:48 +08:00 |
|
huang
|
86aecd21b9
|
上传图片
|
2016-04-01 23:56:05 +08:00 |
|
huang
|
0459856a2c
|
上线logo更换
|
2016-04-01 21:30:32 +08:00 |
|
huang
|
ac1b3338c5
|
logo图标替换
|
2016-04-01 20:10:28 +08:00 |
|
huang
|
218a6b9358
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-01 19:25:01 +08:00 |
|
huang
|
c00c674c34
|
Merge branch 'develop' into hjq_beidou
Conflicts:
app/controllers/organizations_controller.rb
|
2016-04-01 19:24:41 +08:00 |
|
huang
|
9e7c595e55
|
组织发送动态的显示
|
2016-04-01 17:23:15 +08:00 |