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

18152 Commits

Author SHA1 Message Date
huang 4c340a5822 个人主页申请类消息统计 2016-12-16 16:03:59 +08:00
daiao ce9f9ff209 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 2016-12-16 15:32:36 +08:00
daiao 27597cf6ed 个人主页 2016-12-16 15:32:30 +08:00
cxt bc16476646 首页待办任务个数的计算调整 2016-12-16 15:28:45 +08:00
daiao c42fd235e8 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css
 2016-12-16 14:51:10 +08:00
cxt 0fe7b96473 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css
 2016-12-16 14:41:37 +08:00
cxt 271cee79d1 待匿评的作业 2016-12-16 14:38:27 +08:00
huang 88f376205d 个人主页待完成作业500问题 2016-12-16 14:33:09 +08:00
huang 7f3b29830e 个人主页任务显示tip简化，及没有内容不显示 2016-12-16 14:21:51 +08:00
huang a148f3c157 Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css
 2016-12-16 14:06:17 +08:00
cxt 6dfebd447c 导入的试卷进入查看页报500 2016-12-16 14:05:14 +08:00
黄井泉 09e0d2d856 Merge branch 'develop' into 'dai_ao' 
个人主页



See merge request !60
 2016-12-16 14:04:57 +08:00
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +08:00
huang ac803cab63 fork项目提示 2016-12-16 14:02:21 +08:00
cxt 1566111d11 新建问卷发布多条班级动态 2016-12-16 13:49:26 +08:00
huang c0391b967f 注册用户发送留言 、留言页面代码优化 2016-12-16 11:42:52 +08:00
cxt 710c06e41a 匿评成绩的申诉功能 2016-12-16 11:01:58 +08:00
huang 6e83d41ea4 pull request留言权限控制，非项目成员不能提交评论 2016-12-15 17:12:41 +08:00
huang 5527adb795 版本406异常处理，pull request 冲突接受后406异常提醒 2016-12-15 17:03:59 +08:00
huang 5b93bf2b4d pull request中如果登录名在Trustie中不存在则有匿名改成登录名；匿名用户改成邮箱显示 2016-12-15 14:36:08 +08:00
huang 53ecbdf8f0 issue详情中添加截止日期 2016-12-15 12:25:36 +08:00
huang 5facd08af6 issue新建和编辑样式调整 2016-12-15 12:24:57 +08:00
cxt ea6078ee5f Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-15 10:20:26 +08:00
cxt d70b779c92 匿评申诉：评分设置 2016-12-15 10:19:16 +08:00
huang 75f2b013a6 个人主页未解决issue分页不能用问题 2016-12-15 09:40:41 +08:00
黄井泉 bf6bdc8c9e Merge branch 'dev_newproject' into 'develop' 
Pull Request冲突提醒及处理、Issue编辑跳详情问题、Issue编辑返回空白问题



See merge request !57
 2016-12-15 09:28:05 +08:00
huang 79fc4b7752 Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into dai_ao 
Conflicts:
	Gemfile
	app/controllers/pull_requests_controller.rb
 2016-12-15 09:26:24 +08:00
黄井泉 cc3f52a78c Merge branch 'develop' into 'dai_ao' 
个人主页（未完）



See merge request !59
 2016-12-15 09:22:19 +08:00
guange 6d272d2034 解决win10浏览器乱码问题 2016-12-15 09:19:15 +08:00
daiao ffd1e3942c 个人主页tab列表 2016-12-15 09:13:39 +08:00
huang 9b2781999c commit 按钮样式调整 2016-12-14 17:04:52 +08:00
huang e205a08573 issue commit 关联样式调整 2016-12-14 16:57:56 +08:00
huang 185e8957e6 student_works_scores_appeal model 2016-12-14 16:00:38 +08:00
huang 58a45e8f16 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-14 15:21:56 +08:00
siteen 4e854776d1 issue详情右侧样式问题 2016-12-14 14:08:08 +08:00
cxt 23e1f2b3bd 作业匿评期间，小铃铛消息、作业动态以及作品详情的回复显示，暴露了评阅人或匿评对象的信息 2016-12-14 13:37:52 +08:00
siteen be1fc144da rake 任务异常跳过 2016-12-14 13:32:25 +08:00
siteen 5f56edda15 rake 任务异常处理 2016-12-14 10:28:14 +08:00
siteen 1561a1176a 修改rake 任务获取gitlab roles方法 2016-12-14 10:22:49 +08:00
daiao 0d4dc89c73 个人主页的tab的JS及其样式 2016-12-14 10:17:39 +08:00
siteen f82ea16102 版本库数据同步任务 2016-12-14 10:08:41 +08:00
cxt 5ef8f19fbd 班级的归档提示不完整 2016-12-14 09:38:19 +08:00
cxt 8c1e2da2d3 新建个人主页的标题栏，去除输入例的说明 2016-12-14 09:16:50 +08:00
daiao f124470af2 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 
Conflicts:
	app/views/users/show.html.erb
 2016-12-13 17:30:09 +08:00
cxt a8335f841d 提示修改 2016-12-13 17:26:44 +08:00
daiao 54687793ec 铃铛样式重新排版 2016-12-13 17:22:30 +08:00
siteen 413efa8d02 gitlab数据同步一致性任务 2016-12-13 17:21:58 +08:00
cxt 633c314a67 IE浏览器提交作品给出提示 2016-12-13 17:21:10 +08:00
cxt ec476cbd74 班级头部的调整 2016-12-13 16:16:32 +08:00
huang a2b7778de1 对齐 2016-12-13 14:22:15 +08:00