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

15107 Commits

Author SHA1 Message Date
huang 6bd160d642 样式问题 2017-02-23 15:46:07 +08:00
huang 0e48262407 动态中提交评测ajax局部刷新 2017-02-23 15:27:10 +08:00
huang 6f06fde7dc Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 14:13:47 +08:00
huang 727a6fd536 实训项目一些封装 2017-02-23 14:13:25 +08:00
daiao 31d852cd60 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 13:40:07 +08:00
daiao 6d14cb131a 问吧右下角贴吧排序按照帖子发布数和回帖数之和排序 2017-02-23 13:39:44 +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
daiao b36c249a6b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 10:29:21 +08:00
Linda e1be2fda81 实训任务提交测评显示状态增加样式 2017-02-23 10:25:55 +08:00
daiao 7e04e67a5b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 10:10:59 +08:00
daiao 8bd9fc81d6 账号未激活提示页提交留言机制修改（从发送到管理员留言改到贴吧） 2017-02-23 10:09:56 +08:00
huang 04edefac8b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 09:47:39 +08:00
huang ac77c26c50 task写入项目动态中 2017-02-23 09:47:15 +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 006608dca8 修改参数名 2017-02-22 16:30:16 +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 eeba0c362d 实训项目一些ajax控制 2017-02-22 15:49:37 +08:00
daiao 807129aeff 项目实训任务二级回复样式调整 2017-02-22 10:55:24 +08:00
daiao 06306e0214 实训项目叠层回复功能 2017-02-22 10:08: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 41197af763 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-21 16:24:58 +08:00
daiao 43c990c0a9 二级回复功能（回复未刷新） 2017-02-21 16:24:30 +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
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 f7e59c782c Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-21 14:34:40 +08:00
huang f59243ab9f 实训api改进及一些提醒 2017-02-21 14:34:17 +08:00
daiao e4b582fbb7 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-20 15:19:44 +08:00
daiao aacac21110 实训任务详情页面 2017-02-20 15:19:24 +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