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

1916 Commits

Author SHA1 Message Date
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
cxt 2238cef9f1 竞赛提交截止后不可补交作品 2016-12-30 17:04:13 +08:00
cxt 73350e34f1 竞赛作品的相关设置 2016-12-30 10:30:21 +08:00
daiao 506d7ae82c Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-28 16:38:30 +08:00
daiao fc439e562d 用户基本资料页面，去除“邮件通知”一项，未完善资料的用户隐藏新建入口 2016-12-28 13:46:01 +08:00
cxt bdd2a60d00 竞赛：加入竞赛、发布竞赛、发布通知等的消息 2016-12-28 11:30:31 +08:00
huang 465b3e7b52 问吧 base框架 2016-12-27 16:09:09 +08:00
cxt 4067a9c4a7 title修改、通知的编辑删除、附件下载 2016-12-24 20:22:09 +08:00
cxt cbefe70e00 bug修复 2016-12-24 19:12:33 +08:00
cxt e22e1caaed bug修复 2016-12-24 18:48:50 +08:00
daiao e86bd6728e Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/views/users/_user_activities.html.erb
	db/schema.rb
 2016-12-24 16:48:48 +08:00
cxt 9af9945cb4 竞赛 2016-12-24 16:29:10 +08:00
huang 87c134c007 登录名能修改 2016-12-24 11:16:33 +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
黄井泉 4125c1b44a Merge branch 'develop' into 'develop' 
issue详情页面一、二级回复、一级删除局部刷新



See merge request !80
 2016-12-23 14:35:51 +08:00
daiao 1f10a75150 项目社区首页，点击动态选项“论坛动态”报500问题 2016-12-23 11:12:05 +08:00
huang 244303f0e4 课程问卷 其它选项如果过多的时候默认显示， 添加“隐藏”和“显示”按钮 2016-12-23 10:54:19 +08:00
daiao a40b7f6fd0 申请项目，申请人接受到的消息调整为：申请人头像+申请姓名+消息 2016-12-23 09:34:23 +08:00
cxt 5a27b84e97 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-22 17:13:25 +08:00
cxt 9331525304 竞赛消息的调整 2016-12-22 17:13:10 +08:00
huang b74c034237 项目配置添加ke编辑 base中去掉配置 2016-12-22 16:39:54 +08:00
huang 55e1b0d8f2 settings 路由， 组织管理员、裁判、参赛人员方法封装 2016-12-22 14:50:26 +08:00
daiao 884a201953 项目加入申请，被审批后，其他管理员的消息显示加入操作人姓名（并将提示弹框改为新版） 2016-12-22 13:48:03 +08:00
cxt 5242e12373 竞赛框架搭建 2016-12-22 10:01:37 +08:00
daiao 51f5bb6050 课程和项目的首页，在标签名称中显示 2016-12-21 10:29:54 +08:00
huang ff34ec6de8 版本库下载 参数加密 gitlab添加解密功能 2016-12-20 16:33:26 +08:00
huang 611494ec93 系统消息只显示30天前的 2016-12-16 19:36:37 +08:00
huang f71ccb6c67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-16 16:30:25 +08:00
huang c477d15fae Merge branch 'dev_newproject' into develop 2016-12-16 16:13:26 +08:00
cxt bc16476646 首页待办任务个数的计算调整 2016-12-16 15:28:45 +08:00
huang 7f3b29830e 个人主页任务显示tip简化，及没有内容不显示 2016-12-16 14:21:51 +08:00
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +08:00
huang 5b93bf2b4d pull request中如果登录名在Trustie中不存在则有匿名改成登录名；匿名用户改成邮箱显示 2016-12-15 14:36:08 +08:00
daiao 0f328d36e1 代码改进 2016-12-12 10:00:05 +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
daiao 224c0b686c 个人首页的课程社区 2016-12-08 09:59:22 +08:00
huang a1a96e4667 issue编辑优化，性能简单优化 2016-12-08 09:55:41 +08:00
huang 122946804d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-12-08 09:36:36 +08:00
huang c84d17bd6a 用户邮箱没注册时候显示用户邮箱方法封装 2016-12-08 09:36:01 +08:00
cxt c24f9b8c3b 作业的小齿轮菜单增加“启用匿评”的选项，同时更新“禁用匿评”的提示信息、禁用匿评的作业截止后也可以编辑“是否启用匿评” 2016-12-07 17:23:52 +08:00
daiao 69d9228808 个人主页的消息页面 2016-12-07 15:13:51 +08:00
daiao e6763c6d0c 用户消息铃铛样式调整 2016-12-07 09:00:33 +08:00
cxt 5a6e64beb2 Revert "测验头部和新建题目的改版" 
This reverts commit c33bf1b163.

Conflicts:
	public/stylesheets/css/courses.css
 2016-12-06 15:02:32 +08:00
cxt 5bbe9e71ba Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into sx_cxt 
Conflicts:
	db/schema.rb
 2016-12-06 14:12:40 +08:00
daiao 35fdf9a8a7 个人首页头部及其左侧导航(未完) 2016-12-06 09:36:13 +08:00
huang 66066e6899 commit导出方法及显示页面 2016-12-05 14:52:46 +08:00
huang 20e07bb1ba 学生列表得分显示 2016-12-03 10:56:35 +08:00
黄井泉 42775a82f9 Merge branch 'cxt_course' into 'develop' 
班级作业增加设置选项：成绩公开范围



See merge request !37
 2016-12-02 14:53:55 +08:00
cxt 2fd4cb9064 班级作业增加设置选项：成绩公开范围 2016-12-02 13:30:49 +08:00
daiao 77f252b538 Merge branch 'develop' into dai_ao 
Conflicts:
	app/controllers/pull_requests_controller.rb
	app/views/users/_user_message_course.html.erb
	app/views/users/_user_message_forge.html.erb
 2016-12-02 13:26:41 +08:00
陈晓婷 39258f4ac5 Merge branch 'develop' into 'develop' 
课程相关bug修复；叠层回复的“回复”、“赞”的显隐



See merge request !32
 2016-12-02 10:14:07 +08:00
cxt 423018fa15 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-01 15:47:46 +08:00
cxt c33bf1b163 测验头部和新建题目的改版 2016-12-01 15:42:07 +08:00
daiao 2e5cd96bb9 pullrequest发送消息 2016-12-01 11:31:48 +08:00
huang dbc8c5811a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	app/controllers/pull_requests_controller.rb
 2016-11-30 09:55:45 +08:00
daiao 2cee4448ea pullrequest消息通知（未完） 2016-11-29 18:19:29 +08:00
daiao b2de81394e 项目PullRequest列表，显示创建者的名字 2016-11-29 14:44:28 +08:00
cxt 3f35b7f806 贴吧回复改版 2016-11-29 09:36:38 +08:00
huang 42e301659e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-28 09:24:29 +08:00
huang ecf5101ef2 pull request 列表增加源项目/姓名 目标项目/姓名 2016-11-25 20:34:59 +08:00
cxt e202a7b99c 二级回复 2016-11-25 20:13:01 +08:00
cxt c965f72ce3 还原回复的隐藏 2016-11-25 19:19:38 +08:00
huang 872d8295e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-25 17:51:30 +08:00
huang 9c12e774d1 pull request 文件内容正则修改 2016-11-25 17:50:37 +08:00
daiao f1b6e67e50 项目头部样式修改，fork数目错误 2016-11-25 17:10:49 +08:00
cxt 785f027a63 Merge branch 'cxt_course' into develop 2016-11-25 14:56:24 +08:00
daiao 599d233176 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao 2016-11-25 10:49:57 +08:00
cxt 8743460134 动态与详情的回复叠层调整 2016-11-25 09:59:03 +08:00
huang 30a0347cd6 项目头部修改，及其成员列表，关注列表新版样式（未完） 2016-11-24 17:40:33 +08:00
daiao f7db47be41 Merge branch 'dai_ao' into develop 2016-11-24 10:45:43 +08:00
huang 67a9d04a64 版本库添加删除功能 2016-11-23 17:14:49 +08:00
daiao 85f9f636a2 修复：里程碑关闭，编辑issue，里程碑被清空的情况 2016-11-22 16:51:16 +08:00
daiao 196d3b31a1 为完 切换分支 2016-11-22 14:29:03 +08:00
daiao e585687e9c 铃铛消息，将登录名改为用户姓名，并将部分没有链接的加链接 2016-11-21 16:30:37 +08:00
daiao 609d1d2fb4 新建和编辑issue时，里程碑被清空的bug 2016-11-18 21:19:34 +08:00
cxt 003c6a7551 新建作业初始显示调整 2016-11-18 18:37:41 +08:00
huang de61d699a8 Merge branch 'dev_newproject' into develop 2016-11-18 16:22:03 +08:00
daiao 290a301cee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/common.css
 2016-11-18 15:48:40 +08:00
cxt db71b1578b 新建作业的时候，必须先选择作业类型 2016-11-18 10:43:49 +08:00
huang f87d1ce3bd ISSUE中指派者按中文姓名排序 2016-11-18 10:04:02 +08:00
daiao d65a062737 所有我的issue功能 2016-11-17 17:02:02 +08:00
huang 386b41d08e pull requst优化 2016-11-17 11:32:39 +08:00
daiao e956d20d6e 我的issue部分功能 2016-11-16 16:57:02 +08:00
daiao acffe8ec19 我的issue未完 2016-11-16 11:26:17 +08:00
cxt acfbe6f03e 某用户为某班级的助教和学生两种角色成员，当前身份是助教，点击个人主页“我的作业”，如图对应的班级作品显示的却是“提交作品”-》 “查看作品” 2016-11-11 18:12:22 +08:00
huang f71a21155f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:54:47 +08:00
huang a655e73c50 配置中成员链接改成登录名 2016-11-11 16:54:24 +08:00
cxt cb5ca96bb5 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_homework.html.erb
	db/schema.rb
 2016-11-11 16:53:20 +08:00
daiao 812c74134a Merge branch 'develop' into dev_newproject 2016-11-11 14:55:29 +08:00
daiao 5742a9951e 项目-配置-成员，翻页时，当前页用蓝色颜色标识 2016-11-11 13:44:39 +08:00
huang aab24ea34a 解决顶部fork路由错误，已经fork过该项目的添加提示 2016-11-11 10:37:20 +08:00
cxt 0d8d2fbc90 班级活跃度排行去除老师和教辅 2016-11-11 09:29:29 +08:00
cxt 1e0c2e5d6a 班级首页的活跃度和英雄榜由3个增加到6个 2016-11-10 17:28:14 +08:00
huang 0f328c9c58 解决用户ID转换成用户名后引发的问题 2016-11-10 10:27:57 +08:00
cxt 070e18a9b2 作业动态优化 2016-11-08 15:39:00 +08:00
cxt 70a6a26819 班级作业：分组作业，开启了匿评后，某组再加了某组员，如图该组员看到的作业列表中不应该是“作品匿评” 2016-11-07 14:38:10 +08:00
cxt 78ca68b5e3 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/moduel.css
	public/stylesheets/css/public.css
 2016-11-04 16:15:56 +08:00