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

2210 Commits

Author SHA1 Message Date
huang a365453f9c trustie平台输入版本库地址让其跳入Trustie项目版本库 2017-01-10 14:49:50 +08:00
cxt cc4d46c3ee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/common.css
 2017-01-06 15:06:22 +08:00
cxt 44e1a09906 竞赛图片上传 2017-01-06 15:03:01 +08:00
daiao 03c9ca43ec 新建项目页与项目的配置页，将“项目描述”更新为“项目简介” 2017-01-05 14:42:19 +08:00
daiao 5cc362e6eb 我收到的作业 2017-01-05 10:14:56 +08:00
daiao e43ef02d57 我发布的作业 2017-01-05 09:06:41 +08:00
cxt 9f62c3d22a 竞赛相关消息通知的完善 2017-01-04 15:53:36 +08:00
cxt b539c201bc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-04 14:02:00 +08:00
daiao 82a253765c 我收到的issues 2017-01-04 13:33:01 +08:00
daiao 432c98881b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-04 10:41:38 +08:00
cxt 59853b1558 竞赛的管理员、评委、参赛者列表 2017-01-03 17:05:27 +08:00
daiao 2a8cd2d935 我发布的issue（未完） 2017-01-03 15:42:37 +08:00
huang b9eb320d17 用户注册激活、token值过期添加提示 2017-01-03 15:20:31 +08:00
huang a6b4ec64e2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/memos_controller.rb
 2016-12-30 21:17:56 +08:00
daiao fbfbc0cdeb 问吧样式调整 2016-12-30 21:05:14 +08:00
huang 1ece9cb185 说明文字修改 2016-12-30 20:03:24 +08:00
huang 17d4e45acc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-12-30 17:33:18 +08:00
huang baaaaf95d8 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 
Conflicts:
	config/routes.rb
 2016-12-30 16:51:23 +08:00
cxt cde8a8957c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-30 16:37:43 +08:00
cxt 986fe7db86 竞赛增加讨论区模块 2016-12-30 16:37:20 +08:00
daiao f332307cae 更改贴吧描述 2016-12-30 16:12:25 +08:00
cxt 738db43f34 具体竞赛页的邀请码tip没有显示、竞赛菜单的“暂停加入”和“删除” 2016-12-30 11:18:29 +08:00
cxt 73350e34f1 竞赛作品的相关设置 2016-12-30 10:30:21 +08:00
huang f733e2a276 注册激活页面代码重构，及添加新的字体 2016-12-29 14:38:03 +08:00
黄井泉 8e2353d61e Merge branch 'develop' into 'develop' 
新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题

新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题

See merge request !88
 2016-12-27 16:27:19 +08:00
daiao cfa81fc79d 新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题 2016-12-27 16:18:23 +08:00
huang 4f6e9b2c3b 竞赛通知新建路由更改 2016-12-27 14:13:51 +08:00
huang 8126353b43 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_news_replies.html.erb
 2016-12-27 12:29:43 +08:00
huang 40c3d34a58 注册邮件内容后台可配 2016-12-26 15:40:43 +08:00
cxt e22e1caaed bug修复 2016-12-24 18:48:50 +08:00
cxt de9f5131b6 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-24 16:30:30 +08:00
daiao 84d5b5bc4a 竞赛列表 2016-12-24 16:29:53 +08:00
cxt 9af9945cb4 竞赛 2016-12-24 16:29:10 +08:00
cxt 86bd5b97b1 竞赛头部调整 2016-12-23 21:44:03 +08:00
cxt a03c0f68c2 提交作品 2016-12-23 16:58:50 +08:00
cxt 544702e11f 新建题目 2016-12-23 14:41:21 +08:00
cxt 346dc069ef 加入竞赛的消息通知 2016-12-22 16:02:36 +08:00
cxt cf8725f2ee Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-22 15:08:49 +08:00
cxt 4c5a2aa40b 加入竞赛 2016-12-22 15:08:15 +08:00
huang 55e1b0d8f2 settings 路由， 组织管理员、裁判、参赛人员方法封装 2016-12-22 14:50:26 +08:00
cxt 5242e12373 竞赛框架搭建 2016-12-22 10:01:37 +08:00
cxt a67d809168 在导出的Excel中，如果用户填写了其它，则应该在下方的列表中记录“其它（我录入的其它回复）” 2016-12-16 17:27:24 +08:00
cxt d8f098c6f4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-12-16 16:56:21 +08:00
huang c477d15fae Merge branch 'dev_newproject' into develop 2016-12-16 16:13:26 +08:00
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +08:00
cxt 710c06e41a 匿评成绩的申诉功能 2016-12-16 11:01:58 +08:00
huang 5527adb795 版本406异常处理，pull request 冲突接受后406异常提醒 2016-12-15 17:03:59 +08:00
daiao ffd1e3942c 个人主页tab列表 2016-12-15 09:13:39 +08:00
daiao fb62d4f1b2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/project.css
 2016-12-09 20:00:07 +08:00
黄井泉 b8eee2b131 Merge branch 'cxt_course' into 'develop' 
本周上线任务



See merge request !50
 2016-12-09 16:43:00 +08:00