 daiao
|
98c18a874c
|
开始挑战的弹框
|
2017-03-15 09:02:59 +08:00 |
 huang
|
19456503da
|
next方法封装
|
2017-03-14 18:11:26 +08:00 |
|
huang
|
c920582fff
|
开启实训权限
|
2017-03-14 17:37:56 +08:00 |
|
daiao
|
d10ac9b7fe
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-14 17:25:14 +08:00 |
|
daiao
|
8886949dc9
|
实训
|
2017-03-14 17:25:06 +08:00 |
|
huang
|
c09f8c0afe
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-14 17:10:56 +08:00 |
|
huang
|
df1b1484f8
|
新建相关关联
|
2017-03-14 17:10:32 +08:00 |
 cxt
|
a1509088e4
|
头像获取延迟一秒
|
2017-03-14 16:51:55 +08:00 |
|
cxt
|
2d38af7c3d
|
头像上传加打印输出
|
2017-03-14 16:42:08 +08:00 |
|
cxt
|
9468257c0c
|
头像上传
|
2017-03-14 16:30:04 +08:00 |
|
daiao
|
f46178b37a
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
app/views/challenges/index.html.erb
|
2017-03-14 16:00:59 +08:00 |
|
daiao
|
c20d13e46b
|
实训任务，index页面
|
2017-03-14 15:59:50 +08:00 |
|
cxt
|
2520058a5d
|
组织子域名申请流程问题
|
2017-03-14 15:17:46 +08:00 |
|
huang
|
a894e6c932
|
实训base权限控制
|
2017-03-14 15:14:03 +08:00 |
|
huang
|
6d55409a85
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-14 14:56:33 +08:00 |
|
huang
|
5992bcc128
|
版本库文件局部刷新
|
2017-03-14 14:56:08 +08:00 |
|
daiao
|
fe021e04c2
|
实训tpm，新建实训页面
|
2017-03-14 14:52:37 +08:00 |
|
daiao
|
fc673fb704
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
public/stylesheets/css/taskstyle.css
|
2017-03-14 14:41:50 +08:00 |
|
daiao
|
0b82b3e994
|
TPM实训index页面
|
2017-03-14 14:39:05 +08:00 |
|
huang
|
f086f5acd3
|
版本库封装
|
2017-03-14 14:38:14 +08:00 |
|
cxt
|
4e2f82a187
|
分组作业和团队竞赛在提交或修改作品时，选择“合作成员“的弹框中无法选择的成员提示不够明显
|
2017-03-14 14:35:14 +08:00 |
|
huang
|
92d23ebb7b
|
base myshixun框架，新字体引入
|
2017-03-14 13:38:02 +08:00 |
|
huang
|
38ff90a8bf
|
myshixun模板
|
2017-03-14 11:25:01 +08:00 |
|
daiao
|
30a33b967f
|
问吧点击综合排序无效
|
2017-03-14 10:57:16 +08:00 |
|
huang
|
e3285eecc9
|
output 输出
|
2017-03-14 10:48:46 +08:00 |
|
huang
|
c069279105
|
myshixuns 版本库entry
|
2017-03-14 10:08:49 +08:00 |
|
cxt
|
e1c8fccf00
|
发布了竞赛题和发布了作业的消息链接改为跳转到作品列表（基于项目的分组作业不应该直接跳转到新建页面）
|
2017-03-14 09:35:56 +08:00 |
|
huang
|
6ec7769c0e
|
Merge branch 'dev_bigdata' into dev_shixun_project
Conflicts:
app/controllers/account_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/_logined_header.html.erb
app/views/layouts/base_contest_community.html.erb
app/views/layouts/base_contests.html.erb
app/views/layouts/base_course_community.html.erb
app/views/layouts/base_courses.html.erb
app/views/layouts/base_project_community.html.erb
app/views/layouts/base_syllabus.html.erb
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/layouts/new_base_user_show.html.erb
public/stylesheets/css/structure.css
|
2017-03-14 09:30:02 +08:00 |
|
huang
|
63881869f6
|
game局部显示版本库路由及相关action
|
2017-03-13 17:39:27 +08:00 |
|
daiao
|
8866b91c8f
|
项目主页动态列表中@功能不正常（课程应该也好了）
|
2017-03-13 17:25:36 +08:00 |
|
cxt
|
931022c7b1
|
团队竞赛补交作品
|
2017-03-13 17:18:36 +08:00 |
|
cxt
|
bb5522332c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-03-13 16:59:03 +08:00 |
|
陈晓婷
|
7a3e1a6a75
|
Merge branch 'develop' into 'develop'
竞赛相关
See merge request !174
|
2017-03-13 16:58:52 +08:00 |
|
cxt
|
54a4a189be
|
作品附件打包下载调整到500M
|
2017-03-13 16:57:46 +08:00 |
|
daiao
|
376847689a
|
课程动态二级回复，讨论区一级/二级回复增加AT功能
|
2017-03-13 15:59:28 +08:00 |
|
daiao
|
cfcf12d7ed
|
强制修改资料页面，点击base弹出空白页问题
|
2017-03-13 15:21:46 +08:00 |
|
huang
|
8bbee334c3
|
实训开启显示权限控制
|
2017-03-13 15:18:53 +08:00 |
|
cxt
|
15b1a82cd4
|
竞赛作品允许补交
|
2017-03-13 15:11:28 +08:00 |
|
huang
|
90efe7cc35
|
tpm版本库目录功能
|
2017-03-13 14:55:18 +08:00 |
|
huang
|
47e87b115a
|
flash闪存处理
|
2017-03-13 14:37:39 +08:00 |
|
cxt
|
55573d2016
|
放宽下载附件限制
|
2017-03-13 14:28:47 +08:00 |
|
cxt
|
907dcf1f7d
|
班级的统计-英雄榜中，在列表右上角增加“导出作业成绩”功能按钮
|
2017-03-13 14:23:23 +08:00 |
|
huang
|
0298c45b20
|
shixun模块版本库创建事务一致性处理
|
2017-03-13 14:12:34 +08:00 |
|
陈晓婷
|
44d88084f8
|
Merge branch 'develop' into 'develop'
bug修复
See merge request !173
|
2017-03-13 14:02:26 +08:00 |
|
cxt
|
38e618f2f5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-03-13 13:48:48 +08:00 |
|
cxt
|
2b16c45ff1
|
消息头像有问题
|
2017-03-13 13:48:11 +08:00 |
 guange
|
981a191b05
|
短信发送测试通过
|
2017-03-13 11:40:07 +08:00 |
|
陈晓婷
|
c9a5f9ed7f
|
Merge branch 'develop' into 'develop'
竞赛相关
See merge request !171
|
2017-03-13 11:30:39 +08:00 |
|
cxt
|
b1f19ccb5f
|
无权限下载
|
2017-03-13 11:29:03 +08:00 |
|
cxt
|
afe439abf3
|
管理员下载竞赛作品附件报没权限
|
2017-03-13 11:15:10 +08:00 |