huang
|
14e6db457b
|
rake
|
2016-07-20 09:38:23 +08:00 |
huang
|
0c0dfbd093
|
changeset关联
|
2016-07-19 17:38:11 +08:00 |
huang
|
cf04bb5ec6
|
迁移上线
|
2016-07-19 15:59:52 +08:00 |
huang
|
04fe06eff9
|
gitlab数据迁移
|
2016-07-19 09:39:47 +08:00 |
huang
|
facf3ae8f8
|
提交次数写入动态中
|
2016-07-18 16:45:49 +08:00 |
yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-18 11:08:09 +08:00 |
guange
|
51692eadd6
|
改进上线流程
|
2016-07-17 00:49:35 +08:00 |
cxt
|
c9e0143fe8
|
作业动态的时间
|
2016-07-15 19:36:46 +08:00 |
huang
|
87e1e0c4b1
|
rake任务,课程作业关联项目后获取最新版本库提交时间
|
2016-07-15 14:45:06 +08:00 |
huang
|
3485d48163
|
Merge branch 'develop' into rep_quality
Conflicts:
app/controllers/quality_analysis_controller.rb
|
2016-07-14 14:08:03 +08:00 |
huang
|
e766adf087
|
add delete to qa
|
2016-07-12 16:23:30 +08:00 |
cxt
|
66c40ba139
|
动态的更新时间
|
2016-07-12 09:41:00 +08:00 |
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
2016-07-11 15:10:55 +08:00 |
huang
|
6b8b20e127
|
logger to puts
|
2016-07-08 19:45:15 +08:00 |
huang
|
b0aa3c18c3
|
Merge branch 'rep_quality' into develop
|
2016-07-08 14:43:29 +08:00 |
huang
|
8916cc7730
|
update homeworkcommon time
|
2016-07-08 14:40:21 +08:00 |
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-08 13:18:46 +08:00 |
cxt
|
13bae8f8a5
|
线下作业
|
2016-07-08 13:17:14 +08:00 |
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
2016-07-08 11:33:51 +08:00 |
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
2016-07-07 09:02:41 +08:00 |
huang
|
f50c4a879b
|
modified total commits
|
2016-07-05 17:35:56 +08:00 |
huang
|
74ee3205bd
|
淘宝源
|
2016-06-02 15:47:17 +08:00 |
cxt
|
7b7f9cf8f2
|
删除wechat无用代码
|
2016-05-24 19:52:51 +08:00 |
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
2016-05-19 16:11:06 +08:00 |
huang
|
fe54a19940
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
app/views/blogs/_article.html.erb
app/views/users/_project_boardlist.html.erb
public/stylesheets/new_user.css
|
2016-05-19 16:10:18 +08:00 |
txz
|
1b3bc38f8e
|
拖代码改动
|
2016-05-19 13:44:03 +08:00 |
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
2016-05-16 16:57:18 +08:00 |
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
2016-05-13 15:12:26 +08:00 |
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
2016-05-13 11:39:01 +08:00 |
yuanke
|
a39702f962
|
图片自动上传,代码测试编译错误过长。
|
2016-05-13 08:38:28 +08:00 |
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
2016-05-12 10:40:35 +08:00 |
huang
|
922958e732
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-11 16:23:58 +08:00 |
yuanke
|
5180fdab39
|
图片自动上传修改
|
2016-05-11 14:04:31 +08:00 |
huang
|
43f06c0826
|
版本库ZIP下载
|
2016-05-11 13:44:15 +08:00 |
yuanke
|
135e02504e
|
图片自动上传
|
2016-05-11 11:40:01 +08:00 |
yuanke
|
e502aa7c43
|
KE表格项目问题,自动上传图片做了一点
|
2016-05-10 12:51:42 +08:00 |
cxt
|
f6d7df7393
|
管理员界面添加“分享作业申请”列表
|
2016-05-09 18:40:21 +08:00 |
cxt
|
644e097dc8
|
定时更新关联项目的作业更新时间
|
2016-05-09 16:16:03 +08:00 |
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
2016-05-06 18:12:08 +08:00 |
cxt
|
10d26f89d9
|
作业列表的二级回复
|
2016-05-06 17:36:28 +08:00 |
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
2016-05-06 12:22:43 +08:00 |
cxt
|
0fafbffa49
|
项目的更新加到作业的最后更新时间中
|
2016-05-06 08:52:54 +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 |
guange
|
cc9825e6a2
|
将wechat放到项目里面
|
2016-04-26 10:50:54 +08:00 |
guange
|
744c04b54a
|
修改gem源
|
2016-04-24 22:20:29 +08:00 |
huang
|
ab8c1a0bad
|
Merge branch 'hjq_beidou' into develop
|
2016-04-21 16:21:39 +08:00 |
huang
|
cb2033c80f
|
去掉rake中输出
|
2016-04-21 16:20:29 +08:00 |
huang
|
81f8559c48
|
gitlab版本库成员同步任务
|
2016-04-21 16:04:00 +08:00 |
huang
|
adc17c5038
|
代码优化
文件目录动态获取接口
文件目录显示样式
|
2016-04-19 09:34:55 +08:00 |
huang
|
7259d607dc
|
Merge branch 'hjq_beidou' into develop
|
2016-04-18 15:38:11 +08:00 |
huang
|
41aa81f966
|
rake 任务:同步文件数
|
2016-04-18 14:44:29 +08:00 |
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-15 14:13:44 +08:00 |
cxt
|
d948536a10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-14 12:33:15 +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 |
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
2016-04-14 11:29:22 +08:00 |
huang
|
f7cb451feb
|
gitlab版本库添加提交信息统计接口
|
2016-04-13 14:36:43 +08:00 |
huang
|
2162d7d4b8
|
组织banner上传功能
|
2016-04-06 10:40:38 +08:00 |
alan
|
1f0f7708c6
|
fix pagination bug
|
2016-03-30 15:09:06 +08:00 |
alan
|
03d855f5d5
|
修改资源区分页问题
|
2016-03-29 15:46:13 +08:00 |
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
2016-03-28 22:37:01 +08:00 |
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
2016-03-25 14:58:17 +08:00 |
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
2016-03-21 14:40:47 +08:00 |
guange
|
59923dfb03
|
merge
|
2016-03-18 16:38:21 +08:00 |
huang
|
7c624cd571
|
公共资源只包括公开资源
|
2016-03-14 16:35:18 +08:00 |
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
guange
|
24a278d7d6
|
加上atall
|
2016-03-11 18:50:37 +08:00 |
linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
2016-03-11 17:25:30 +08:00 |
luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
huang
|
a6c7766b00
|
修复部分用户不能删除的问题
|
2016-03-09 18:06:26 +08:00 |
linchun
|
3c66a29767
|
完善课程资源列表,完成项目资源列表
|
2016-03-08 11:01:08 +08:00 |
linchun
|
b7f4b584f2
|
完成管理员界面课程资源列表
|
2016-03-07 16:46:02 +08:00 |
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面,目前该页面中的精品课程是固定的
|
2016-03-04 15:31:40 +08:00 |
huang
|
a10e973c75
|
版本库配置默认分支
|
2016-02-26 19:25:12 +08:00 |
huang
|
ed7183b1a9
|
0
|
2016-02-23 11:31:34 +08:00 |
huang
|
929afea196
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-23 09:13:10 +08:00 |
huang
|
e62386ad65
|
版本局角色同步
|
2016-02-23 09:12:50 +08:00 |
cxt
|
6b4be999ee
|
资源的定时发布
|
2016-02-22 18:35:04 +08:00 |
guange
|
1f7bcbed20
|
处理导入题库标题中的换行字符
|
2016-02-02 21:28:52 +08:00 |
guange
|
eb3644a197
|
将一堆的rake命令变为一条
|
2016-02-02 19:16:15 +08:00 |
guange
|
609d98f8a3
|
执行task时没有代入环境变量
|
2016-02-02 16:33:08 +08:00 |
guange
|
ed2a3c976d
|
执行task时没有代入环境变量
|
2016-02-02 16:25:26 +08:00 |
cxt
|
184e0ee689
|
管理员界面增加项目、组织、课程、用户、作业个数的显示
|
2016-01-25 16:50:34 +08:00 |
huang
|
655cc0d2db
|
issue截止时间邮件通知
|
2016-01-22 20:26:44 +08:00 |
huang
|
59aa1e9c6f
|
issue截止修改
|
2016-01-22 09:55:58 +08:00 |
huang
|
024e299817
|
gitlab同步问题
|
2016-01-21 15:29:06 +08:00 |
huang
|
524e152b24
|
Issue截止时间到了邮件提醒
|
2016-01-21 11:19:08 +08:00 |
huang
|
500527a12d
|
gitlab同步问题
|
2016-01-12 10:42:25 +08:00 |
guange
|
1b177a8498
|
默认禁用自动高度
|
2016-01-05 11:55:30 +08:00 |
huang
|
1a549eda46
|
版本库显示问题
|
2015-12-21 14:33:28 +08:00 |
huang
|
ab1397d982
|
恢复版本
|
2015-12-21 13:53:22 +08:00 |
huang
|
3de4c7129a
|
版本库读取错误问题
|
2015-12-21 13:48:25 +08:00 |
huang
|
52adcb378d
|
注释任务
|
2015-12-18 21:29:25 +08:00 |
huang
|
dae6e68623
|
renwu
|
2015-12-18 20:46:17 +08:00 |
huang
|
747493993b
|
上线测试
|
2015-12-18 19:57:08 +08:00 |
huang
|
88cdb5a3ed
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/repositories_controller.rb
解决冲突
|
2015-12-18 17:08:26 +08:00 |
cxt
|
2eaa05306f
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/boards/_course_show.html.erb
|
2015-12-18 15:08:38 +08:00 |
cxt
|
b65e84d166
|
未答测验的学生在测验截止时间到了后算作零分
|
2015-12-18 12:47:34 +08:00 |
guange
|
d703f75c98
|
merge
|
2015-12-18 09:23:52 +08:00 |
houxiang
|
fc2eae4c62
|
add something by hx
|
2015-12-17 20:56:30 +08:00 |
huang
|
1dae37f613
|
添加commit总数 api
|
2015-12-17 18:28:12 +08:00 |
houxiang
|
0324282641
|
查询每个项目的各个成员中的提交贡献次数
|
2015-12-16 14:30:46 +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
|
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 |
huang
|
f2c1595d0d
|
1、同步没成功检测程序
2、注册验证修改
|
2015-12-09 16:57:12 +08:00 |
huang
|
da04607859
|
Merge branch 'gitlab_guange' of http://git.trustie.net/jacknudt/trustieforge into gitlab_guange
|
2015-12-08 16:53:56 +08:00 |
lizanle
|
ef2ef7111c
|
添加对帖子的全文搜索
|
2015-12-07 14:31:05 +08:00 |
guange
|
af31946586
|
issue列表开启AT功能
|
2015-12-06 15:03:12 +08:00 |
lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
2015-12-04 16:42:02 +08:00 |
huang
|
4d0956dff1
|
Merge branch 'develop' into gitlab_guange
|
2015-12-04 15:54:56 +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
|
e2f5dcc3f9
|
当天截止的测验需要发布截止消息
|
2015-12-04 13:39:17 +08:00 |
lizanle
|
06122dab1d
|
当天截止的测验需要发布截止消息
|
2015-12-04 11:24:24 +08:00 |
lizanle
|
03588ca88d
|
发布测验的时候发布消息
|
2015-12-04 11:21:41 +08:00 |
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
2015-12-04 10:59:14 +08:00 |
lizanle
|
6553559929
|
发送消息
|
2015-12-04 10:56:16 +08:00 |
cxt
|
838140ada8
|
在线测验的自动发布和截止
|
2015-12-03 19:08:15 +08:00 |
cxt
|
259cb67c58
|
rake命令的消息通知
|
2015-12-01 09:22:01 +08:00 |
cxt
|
b16acda21e
|
匿评结束消息暂时不发送
|
2015-11-30 17:22:03 +08:00 |
cxt
|
fee438cc0b
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-30 16:27:39 +08:00 |
cxt
|
ebeaac5798
|
作业匿评的结束状态未更新
|
2015-11-30 16:27:26 +08:00 |
huang
|
364c9a3a9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
合并
|
2015-11-30 14:35:37 +08:00 |
cxt
|
7f4e47eadc
|
删除匿评评分数据
|
2015-11-30 13:12:35 +08:00 |
Gan Yi.ang
|
3516cde555
|
sync_gitlab_user加验证加日志
|
2015-11-28 10:25:53 +08:00 |
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:02 +08:00 |
huang
|
2749066908
|
单个项目同步输出
|
2015-11-27 18:43:22 +08:00 |
Gan Yi.ang
|
e9caf0980a
|
同步用户sync_gitlab_user,加异常处理
|
2015-11-27 17:57:43 +08:00 |
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-11-27 14:49:49 +08:00 |
lizanle
|
3d9f632105
|
全站搜索
|
2015-11-27 14:42:25 +08:00 |
lizanle
|
7cb39d1754
|
全站搜索
|
2015-11-27 10:40:58 +08:00 |
huang
|
8c83bbfff3
|
课程英雄榜数据
|
2015-11-27 00:48:08 +08:00 |
huang
|
aca7684414
|
课程英雄榜
各模块动作 触发加分
|
2015-11-26 18:22:03 +08:00 |
huang
|
1426557b6d
|
解决密码500问题
|
2015-11-23 22:10:28 +08:00 |
huang
|
591984ba63
|
密码问题
|
2015-11-23 21:54:40 +08:00 |
houxiang
|
4a9da97f9b
|
modify by hx add commit_count_detail_show
|
2015-11-18 16:23:02 +08:00 |
huang
|
55d3b8abb3
|
去掉同步过程中输出
|
2015-11-16 17:19:53 +08:00 |
houxiang
|
9350841d50
|
change by hx
|
2015-11-16 10:44:36 +08:00 |
huang
|
ca8b62b8bd
|
Merge branch 'szzh' into gitlab_guange
|
2015-11-14 15:22:05 +08:00 |
cxt
|
7a93fddb83
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-12 17:20:11 +08:00 |
cxt
|
3f60893591
|
禁用匿评的作业在截止时作业状态变为3
|
2015-11-12 14:53:12 +08:00 |
huang
|
af70dc0ca3
|
Merge branch 'develop' into gitlab_guange
|
2015-11-12 09:52:25 +08:00 |
huang
|
3aa73fba35
|
Gitlab权限修改
更新项目Gitlab同步更新
|
2015-11-11 16:33:09 +08:00 |
huang
|
16c31e254e
|
区分Gitlab公开项目和私有项目
|
2015-11-11 15:33:43 +08:00 |
huang
|
cc0afa7d9b
|
添加删除迁移版本库
|
2015-11-11 12:43:59 +08:00 |
huang
|
8164ffc1b2
|
Merge branch 'szzh' into gitlab_guange
|
2015-11-11 10:25:41 +08:00 |