Commit Graph

2208 Commits

Author SHA1 Message Date
cxt 46df3c2d67 班级相关页面的优化 2018-03-23 15:54:50 +08:00
daiao 8d437eb539 课程代码优化 2018-03-22 16:53:14 +08:00
cxt 2ea79057c9 课程下创建新班级,提供可选项选择是否继承原有资源等实现方法 2018-03-16 16:08:39 +08:00
caishi a38c68a791 数据新建和列表 2018-02-06 17:41:39 +08:00
huang 11dfd8dbb2 数据统计功能(增删查改) 2018-02-05 12:03:35 +08:00
cxt 60445fcb3f 批量设置 2017-09-13 16:41:36 +08:00
cxt d5488ba806 班级资源的批量设置 2017-09-13 16:05:55 +08:00
cxt 3f36453548 请将头像尺寸换成正方形 2017-07-25 09:10:27 +08:00
cxt 06eebec1c1 博客的调整 2017-07-14 13:50:31 +08:00
cxt efe9e643ad 获取用户学校时增加判断 2017-04-05 14:43:51 +08:00
cxt 357b7c5aa0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-17 14:30:44 +08:00
陈晓婷 676ef6e176 Merge branch 'develop' into 'develop'
周一修改的内容



See merge request !175
2017-03-17 14:30:26 +08:00
cxt e1c8fccf00 发布了竞赛题和发布了作业的消息链接改为跳转到作品列表(基于项目的分组作业不应该直接跳转到新建页面) 2017-03-14 09:35:56 +08:00
daiao cfcf12d7ed 强制修改资料页面,点击base弹出空白页问题 2017-03-13 15:21:46 +08:00
cxt 77c25db233 竞赛者加入,无需身份验证,发送消息通知给竞赛所有管理员即可 2017-03-13 10:22:55 +08:00
cxt 34dee33edb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/boards/_course_new.html.erb
	db/schema.rb
2017-03-10 13:57:44 +08:00
cxt 42ab249651 小铃铛的数字标识和事情情况有冲突 2017-03-09 10:58:46 +08:00
daiao e88918916a 点击消息后红色按钮不消失 2017-03-07 14:19:17 +08:00
cxt 95595c6fe6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2017-03-03 15:37:55 +08:00
cxt 96312c6dfa Merge branch 'cxt_course' into develop 2017-03-03 14:45:30 +08:00
cxt f30507b6f0 在线测验改版 2017-03-03 14:43:51 +08:00
daiao 138a342613 首页左侧导航栏的底部地区为空时,不显示 2017-03-02 13:41:17 +08:00
daiao f15d00f0bd 新建项目如果描述为空的时候显示怪异 2017-03-01 09:40:20 +08:00
daiao 7fbfeef8f3 首页显示的个人信息区域需要更新显示 2017-02-28 15:24:28 +08:00
huang f459609c81 解决实训任务验证问题 用户名后添加导师 2017-02-25 11:08:37 +08:00
huang b510994365 竞赛添加访问统计 2017-02-24 19:42:23 +08:00
daiao f4ea11c4c2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-24 16:20:38 +08:00
daiao d05b3419d7 项目列表样式调整 2017-02-24 16:20:12 +08:00
黄井泉 af959a1260 Merge branch 'develop' into 'develop'
本周上线任务



See merge request !156
2017-02-24 15:35:17 +08:00
huang c613e29299 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-24 15:33:51 +08:00
huang bd0bd02084 权限控制 2017-02-24 15:33:15 +08:00
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 01484701d2 竞赛首页的简介下方直接显示竞赛动态 2017-02-24 15:14:09 +08:00
daiao 91017041ac 组织底部导航修改 2017-02-24 15:06:48 +08:00
huang 2e81633308 TPM TPi权限控制 2017-02-24 14:46:29 +08:00
huang 6e96f6e9ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-24 13:52:18 +08:00
huang 6e9ef8ee12 Merge branch 'develop' into dev_raining
Conflicts:
	app/controllers/repositories_controller.rb
	app/views/layouts/_base_project_top.html.erb
2017-02-24 10:26:22 +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 3f105cefe7 版本库访问权限控制清理 2017-02-22 12:33:45 +08:00
cxt da4aaca1ea 消息首页报500 2017-02-22 12:26:56 +08:00
cxt 422b5ffa95 首页申请加入竞赛的消息报500 2017-02-22 10:01:54 +08:00
huang 96aa9b7261 实训项目一些调整,api和结构 2017-02-22 08:54:38 +08:00
Linda 81ac923e3b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-21 14:57:49 +08:00
Linda 7451838509 syllablus.css和sy.public.css简化转移到 css文件夹;修改页面中引用这两个样式的路径 2017-02-21 14:51:48 +08:00
huang f59243ab9f 实训api改进及一些提醒 2017-02-21 14:34:17 +08:00
huang d21350b754 tpi先建任务权限判断 2017-02-20 14:39:39 +08:00
huang 336c28ccdb 实训项目权限控制 2017-02-20 12:33:27 +08:00
Linda 54eb9b0bca 网站底部版权信息居中 2017-02-20 10:48:36 +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