jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,724 Commits 98 Branches 0 Tags 0 B
Commit Graph

18724 Commits

Author SHA1 Message Date
huang f59243ab9f 实训api改进及一些提醒 2017-02-21 14:34:17 +08:00
huang d21350b754 tpi先建任务权限判断 2017-02-20 14:39:39 +08:00
huang 32f14e957d Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-20 14:23:25 +08:00
huang 8063932500 fork项目的时候一并forkmodule 2017-02-20 14:23:02 +08:00
daiao c115fad8a1 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 
Conflicts:
	db/schema.rb
 2017-02-20 14:09:59 +08:00
daiao 8039f89d92 实训项目的列表页面 2017-02-20 14:08:48 +08:00
huang 336c28ccdb 实训项目权限控制 2017-02-20 12:33:27 +08:00
Linda 1fb79f717c 留言界面，留言与留言直接间隔修改 2017-02-20 11:27:18 +08:00
Linda 54eb9b0bca 网站底部版权信息居中 2017-02-20 10:48:36 +08:00
Linda 72f085e13e Merge branch 'develop' into dev_raining 
Conflicts:
	db/migrate/20170219062646_add_positon_to_training_task.rb
	db/schema.rb
 2017-02-20 10:15:47 +08:00
huang e5cfc7280b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-19 17:50:17 +08:00
huang 8d1987567e 实训项目相关模块相关api的开发 2017-02-19 17:49:58 +08:00
Linda dae19d7be6 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/projects/settings/_new_modules.html.erb
 2017-02-19 15:30:38 +08:00
Linda 89dc320027 合作伙伴图片 及项目管理脚本录入界面 2017-02-19 15:28:57 +08:00
daiao 2aa025cf32 实训项目新建页面样式调整 2017-02-19 15:17:46 +08:00
daiao 0bce2f25b4 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-19 14:40:48 +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 568bc4e6b7 项目配置-模块页面加入提示 2017-02-19 11:24:43 +08:00
daiao 243062bee2 实训项目module中“实训项目”和"issue”不能同时选中，只选中一个 2017-02-19 10:50:08 +08:00
daiao 11ab4da9ef Merge branch 'develop' into dev_raining 2017-02-19 09:22:21 +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
陈晓婷 decd5e49ac Merge branch 'develop' into 'develop' 
bug修复



See merge request !153
 2017-02-17 19:03:04 +08:00
cxt 78614e18ca 添加学生报错 2017-02-17 19:01:53 +08:00
陈晓婷 6df43565f7 Merge branch 'develop' into 'develop' 
bug修复



See merge request !152
 2017-02-17 18:56:12 +08:00
cxt 4054a0d913 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-17 18:54:23 +08:00
cxt c6ae00c6be 作品列表出现重复的数据 2017-02-17 18:54:15 +08:00
陈晓婷 d5d37ec683 Merge branch 'develop' into 'develop' 
bug修复



See merge request !151
 2017-02-17 16:43:02 +08:00
cxt 3b67291ed0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-17 16:41:51 +08:00
cxt de7b29c260 从课程界面进入的新建班级页面，班级名称未自动添加上课程名称 2017-02-17 16:33:01 +08:00
cxt 24f766d0a5 更换管理员发送微信模板消息 2017-02-17 16:19:49 +08:00
陈晓婷 37342fda32 Merge branch 'develop' into 'develop' 
本周上线内容



See merge request !150
 2017-02-17 15:04:06 +08:00
cxt c1301bbd7d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-17 15:02:24 +08:00
陈晓婷 540c07a92a Merge branch 'develop' into 'develop' 
本周上线内容



See merge request !149
 2017-02-17 15:00:49 +08:00
cxt b81d9b86c4 班级的配置页面，管理员增加“更换管理员”功能 2017-02-17 15:00:14 +08:00
cxt 49c6b3be12 导入的在线测验，进入编辑页面，没有填写日期信息，也成功提交了 2017-02-17 10:32:27 +08:00
daiao 3cad78a991 增加合作伙伴的显示 2017-02-17 10:09:10 +08:00
daiao 2c42a51195 平台管理员的首页报500 2017-02-17 09:00:35 +08:00
daiao cb5548c853 博客回复发送的消息，点击之后没有自动更新为已读 2017-02-16 15:18:35 +08:00
daiao 0d1738cf91 我收到的issue，标题没有居中显示，有错位 2017-02-16 14:54:56 +08:00
daiao 9af54a9288 我发布的issue列表，标题没有居中对齐，视觉上有错位 2017-02-16 14:09:15 +08:00
daiao 2cad08614f 系统发出的加入班级\项目\竞赛消息通知,点击后自动变为已读（并优化消息代码结构） 2017-02-15 10:54:09 +08:00
daiao 1f2fadc9f6 消息结构优化 2017-02-15 10:03:09 +08:00
cxt 11eba7637f 班级头部信息展示由三行更新成两行 2017-02-14 16:29:28 +08:00
cxt 10b7063791 新建班级选择课程后，在班级名称中自动带入课程名称，减少用户输入 2017-02-14 15:22:12 +08:00
cxt 89eab427aa 班级统计中的项目活跃度增加按作业过滤 2017-02-14 15:07:38 +08:00
daiao bc0be4c890 项目社区首页的左侧导航栏，样式问题 2017-02-14 10:03:38 +08:00
daiao 603d5d5703 底部导航的版权限制中，空格太大 2017-02-14 09:59:06 +08:00