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

1075 Commits

Author SHA1 Message Date
daiao 8866b91c8f 项目主页动态列表中@功能不正常（课程应该也好了） 2017-03-13 17:25:36 +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
huang 679a6274e6 版本库删除功能 2017-03-08 18:32:08 +08:00
huang ca6058d120 项目删除功能 2017-03-07 10:58:50 +08:00
huang 065cd95714 删除项目后依旧能fork项目功能 2017-03-07 09:25:51 +08:00
cxt 6f3f54b1a8 竞赛基于项目的团队提交，在创建项目时点击取消，应该回到作业页面 2017-03-06 17:25:05 +08:00
cxt 0141735db4 问吧帖子回复的时候，二级回复的Url没有自动调整为超链接 2017-03-06 11:03:33 +08:00
daiao abcaf33a17 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-02 09:45:45 +08:00
huang 3582f70a6b 局部刷新测试 2017-03-01 16:53:01 +08:00
daiao f15d00f0bd 新建项目如果描述为空的时候显示怪异 2017-03-01 09:40:20 +08:00
huang 7804ea69bd 项目动态ajax刷新 2017-02-28 20:50:40 +08:00
huang be1b507354 ajax刷新 2017-02-28 17:22:00 +08:00
huang 5be7e048cf 没登陆情况不允许开启任务 2017-02-24 21:21:48 +08:00
huang 374323eb32 已经实训过的跳转问题 2017-02-24 17:43:43 +08:00
huang bd0bd02084 权限控制 2017-02-24 15:33:15 +08:00
huang 2e81633308 TPM TPi权限控制 2017-02-24 14:46:29 +08:00
huang bd2d0d3869 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 
Conflicts:
	app/views/training_tasks/_content_list.html.erb
 2017-02-24 09:58:52 +08:00
daiao c76db2cb24 项目问题动态回复功能修复 2017-02-24 09:56:58 +08:00
huang 658023cbe0 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-24 09:04:07 +08:00
daiao 9697a9b5c1 实训项目展开/收起回复加载KE 2017-02-23 17:26:22 +08:00
huang 7074cbdba6 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 17:24:12 +08:00
huang 019ce762f8 针对实训子项目，一些权限修改 2017-02-23 17:23:52 +08:00
daiao 75f1fc964a 实训任务项目动态展开更多与收起回复功能 2017-02-23 17:09:22 +08:00
huang 705f94428e Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 16:18:16 +08:00
huang 49f63992d8 任务开启的时候权限控制 2017-02-23 16:17:37 +08:00
daiao f817aef5d2 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 16:13:16 +08:00
daiao 1e56a69eed 动态消息的实训动态添加回复/二级回复功能 2017-02-23 16:12:29 +08:00
huang 6bd160d642 样式问题 2017-02-23 15:46:07 +08:00
huang 0e48262407 动态中提交评测ajax局部刷新 2017-02-23 15:27:10 +08:00
huang 727a6fd536 实训项目一些封装 2017-02-23 14:13:25 +08:00
huang 384ae2764a Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 10:45:50 +08:00
huang 9a3793ffa9 完成training_task 编辑功能 2017-02-23 10:45:28 +08:00
Linda e1be2fda81 实训任务提交测评显示状态增加样式 2017-02-23 10:25:55 +08:00
huang ac77c26c50 task写入项目动态中 2017-02-23 09:47:15 +08:00
huang eeba0c362d 实训项目一些ajax控制 2017-02-22 15:49:37 +08:00
huang 96aa9b7261 实训项目一些调整，api和结构 2017-02-22 08:54:38 +08:00
huang f59243ab9f 实训api改进及一些提醒 2017-02-21 14:34:17 +08:00
huang 336c28ccdb 实训项目权限控制 2017-02-20 12:33:27 +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 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 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