 cxt
|
099fcde246
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2017-02-24 15:20:34 +08:00 |
|
cxt
|
0e40bf6daf
|
题库改版
|
2017-02-24 10:32:48 +08:00 |
 huang
|
9a3793ffa9
|
完成training_task 编辑功能
|
2017-02-23 10:45:28 +08:00 |
 daiao
|
8d51e896fa
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 09:32:36 +08:00 |
|
daiao
|
fa7b15db47
|
注册成功提示页与账号未激活提示页，增加‘更换邮箱的功能’
|
2017-02-23 09:32:13 +08:00 |
|
huang
|
b08a8e8050
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-22 15:52:05 +08:00 |
|
huang
|
96aa9b7261
|
实训项目一些调整，api和结构
|
2017-02-22 08:54:38 +08:00 |
|
daiao
|
4a925201eb
|
实训任务增加二级回复功能
|
2017-02-21 17:23:44 +08:00 |
|
daiao
|
818d7ad2ef
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-21 14:38:32 +08:00 |
|
daiao
|
544432adce
|
实训任务详情页面的一级回复功能
|
2017-02-21 14:38:05 +08:00 |
|
huang
|
f59243ab9f
|
实训api改进及一些提醒
|
2017-02-21 14:34:17 +08:00 |
|
huang
|
8d1987567e
|
实训项目相关模块相关api的开发
|
2017-02-19 17:49:58 +08:00 |
|
huang
|
82c6799953
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
Conflicts:
db/schema.rb
|
2017-02-19 14:40:27 +08:00 |
|
huang
|
df66e6d60c
|
启动任务相关接口
|
2017-02-19 14:39:15 +08:00 |
|
daiao
|
77f58d76a5
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop
# Conflicts:
# db/schema.rb
|
2017-02-19 09:21:55 +08:00 |
|
huang
|
a43c5cdb2f
|
启动实训Api等
|
2017-02-18 17:44:50 +08:00 |
|
huang
|
d4eb4c0d56
|
实训任务模块
|
2017-02-17 19:29:00 +08:00 |
|
cxt
|
b81d9b86c4
|
班级的配置页面，管理员增加“更换管理员”功能
|
2017-02-17 15:00:14 +08:00 |
|
daiao
|
3e705fabb8
|
平台底部调整（去除底部图片，增加合作伙伴一栏）
|
2017-02-09 10:47:18 +08:00 |
 guange
|
99741daef5
|
merge
|
2017-01-20 14:00:22 +08:00 |
|
guange
|
d9ba7896df
|
merge
|
2017-01-20 13:57:50 +08:00 |
|
cxt
|
65bfaedb3a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2017-01-20 13:56:34 +08:00 |
|
cxt
|
ac80805932
|
班级统计功能（暂未完成）
|
2017-01-20 10:16:51 +08:00 |
|
daiao
|
6619ee9c20
|
开源检索功能
|
2017-01-20 09:52:10 +08:00 |
|
daiao
|
a2aea42868
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-01-19 15:57:55 +08:00 |
|
guange
|
3146342586
|
merge
|
2017-01-18 00:18:58 +08:00 |
|
guange
|
6d1503f3bd
|
issue 11269 性能问题，从12秒到6秒多，还有优化空间
|
2017-01-18 00:17:41 +08:00 |
|
huang
|
55d16eb589
|
完成组织域名申请消息重构
|
2017-01-17 13:22:03 +08:00 |
|
cxt
|
9ccef85600
|
班级留言改版
|
2017-01-16 16:34:51 +08:00 |
|
daiao
|
10ed174801
|
全部设为已读优化
|
2017-01-13 18:51:34 +08:00 |
|
黄井泉
|
c177230b08
|
Merge branch 'develop' into 'develop'
这周上线任务
See merge request !122
|
2017-01-13 11:24:07 +08:00 |
|
cxt
|
cd23ba37b5
|
作业评价时，此次评价会覆盖该账号上传评价的信息，请在评分详情的页面上增加历史评分的隐藏功能
|
2017-01-12 17:25:16 +08:00 |
|
cxt
|
ee4d676f11
|
竞赛提交增加作品成绩的导出
|
2017-01-12 11:14:27 +08:00 |
|
cxt
|
231fa56c49
|
管理员界面增加竞赛列表
|
2017-01-11 16:45:41 +08:00 |
|
cxt
|
c44af451ce
|
竞赛增加留言模块
|
2017-01-11 10:16:25 +08:00 |
|
huang
|
a365453f9c
|
trustie平台输入版本库地址让其跳入Trustie项目版本库
|
2017-01-10 14:49:50 +08:00 |
|
cxt
|
fe24382157
|
竞赛的成员配置页，增加“单位名称”的显示，同时增加excel导出功能
|
2017-01-10 11:00:18 +08:00 |
|
cxt
|
cc4d46c3ee
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/common.css
|
2017-01-06 15:06:22 +08:00 |
|
cxt
|
44e1a09906
|
竞赛图片上传
|
2017-01-06 15:03:01 +08:00 |
|
daiao
|
03c9ca43ec
|
新建项目页与项目的配置页，将“项目描述”更新为“项目简介”
|
2017-01-05 14:42:19 +08:00 |
|
daiao
|
5cc362e6eb
|
我收到的作业
|
2017-01-05 10:14:56 +08:00 |
|
daiao
|
e43ef02d57
|
我发布的作业
|
2017-01-05 09:06:41 +08:00 |
|
cxt
|
9f62c3d22a
|
竞赛相关消息通知的完善
|
2017-01-04 15:53:36 +08:00 |
|
cxt
|
b539c201bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-01-04 14:02:00 +08:00 |
|
daiao
|
82a253765c
|
我收到的issues
|
2017-01-04 13:33:01 +08:00 |
|
daiao
|
432c98881b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-01-04 10:41:38 +08:00 |
|
cxt
|
59853b1558
|
竞赛的管理员、评委、参赛者列表
|
2017-01-03 17:05:27 +08:00 |
|
daiao
|
2a8cd2d935
|
我发布的issue（未完）
|
2017-01-03 15:42:37 +08:00 |
|
huang
|
b9eb320d17
|
用户注册激活、token值过期添加提示
|
2017-01-03 15:20:31 +08:00 |
|
huang
|
a6b4ec64e2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/memos_controller.rb
|
2016-12-30 21:17:56 +08:00 |