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

2328 Commits

Author SHA1 Message Date
cxt 44b3f6019c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-23 21:44:20 +08:00
cxt 86bd5b97b1 竞赛头部调整 2016-12-23 21:44:03 +08:00
daiao 110bbd6c3b issue 动态样式宽度 2016-12-23 21:34:21 +08:00
huang b563b170bd 竞赛动态新闻 2016-12-23 21:13:40 +08:00
daiao dbd8802b9c 项目动态内容样式调整，重发邮件调整 2016-12-23 21:11:39 +08:00
huang 43bb3fe4eb 完成竞赛通知 列表页面 2016-12-23 19:35:02 +08:00
daiao d10a12fadd 邮箱激活页面调整 2016-12-23 15:30:39 +08:00
cxt 544702e11f 新建题目 2016-12-23 14:41:21 +08:00
daiao fd97d8b421 课程社区的首页动态，加入班级资源库动态 2016-12-23 14:03:43 +08:00
daiao 1f10a75150 项目社区首页，点击动态选项“论坛动态”报500问题 2016-12-23 11:12:05 +08:00
daiao a40b7f6fd0 申请项目，申请人接受到的消息调整为：申请人头像+申请姓名+消息 2016-12-23 09:34:23 +08:00
cxt 9331525304 竞赛消息的调整 2016-12-22 17:13:10 +08:00
cxt 346dc069ef 加入竞赛的消息通知 2016-12-22 16:02:36 +08:00
daiao b4d4fa4e28 待办任务的所有列表页，首列加上发布人的头像 2016-12-22 14:49:19 +08:00
daiao 884a201953 项目加入申请，被审批后，其他管理员的消息显示加入操作人姓名（并将提示弹框改为新版） 2016-12-22 13:48:03 +08:00
cxt 5242e12373 竞赛框架搭建 2016-12-22 10:01:37 +08:00
daiao c42861c8b5 个人主页，待办任务数字实时刷新 2016-12-21 17:27:53 +08:00
daiao adce17c877 首页的消息列表头像换成圆形 2016-12-21 09:49:09 +08:00
daiao c481ee6536 项目的讨论区和资源库翻页做成新样式 2016-12-21 08:48:16 +08:00
daiao 34e250f953 动态文字内容宽度调整至于齿轮中线对齐 2016-12-20 16:59:01 +08:00
daiao c2924e06e6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-20 11:04:39 +08:00
daiao 2b60143f78 博客，班级的帖子标题和内容，留言显示出现英文单词分隔显示问题 2016-12-20 11:04:16 +08:00
huang 9a6a4a5203 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-19 09:55:07 +08:00
cxt 35dfdeea98 消息报500 2016-12-17 18:01:08 +08:00
cxt fc6d2f1155 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-17 17:59:05 +08:00
cxt c444096a04 消息列表报500 2016-12-17 17:58:31 +08:00
daiao 96e02cd48f 项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误 2016-12-17 17:04:44 +08:00
daiao d16e9e4ecd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-17 15:38:49 +08:00
daiao 73747a81d6 个人主页消息铃铛翻页 2016-12-17 15:34:26 +08:00
cxt d9dcb3b291 “我的作业”页面中“评分”建议跳转到作品列表，而不是作业信息页面 2016-12-17 10:41:30 +08:00
cxt fc67e6e3be Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_anonymous_evaluation_list.html.erb
 2016-12-17 10:25:48 +08:00
daiao b76dd30b6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-17 10:17:34 +08:00
daiao 882ceb6a63 个人主页样式调整 2016-12-17 10:12:56 +08:00
cxt 16fe5f58a1 详细列表的样式调整 2016-12-17 09:38:48 +08:00
cxt 2275a0ecae 首页、课程社区、项目社区的点击展开更多 2016-12-17 09:38:32 +08:00
huang ea3b71df8d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-16 21:01:27 +08:00
huang de86584850 个人主页 我的issue 分页不能点的问题 2016-12-16 20:58:53 +08:00
黄井泉 353073c82a Merge branch 'develop' into 'develop' 
个人主页功能

个人主页功能

See merge request !67
 2016-12-16 20:57:21 +08:00
daiao 0c8774416e 个人主页样式调整 2016-12-16 20:50:48 +08:00
daiao 72ff880424 个人主页样式调整 2016-12-16 20:19:57 +08:00
cxt 48045cf85b 首页消息列表样式调整 2016-12-16 19:55:38 +08:00
huang 611494ec93 系统消息只显示30天前的 2016-12-16 19:36:37 +08:00
cxt 7777e63647 首页消息列表样式修改 2016-12-16 19:08:54 +08:00
daiao e30006be39 个人主页样式调整 2016-12-16 18:47:15 +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 f71ccb6c67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-16 16:30:25 +08:00
daiao 122d3964ed 个人主页样式调整 2016-12-16 16:25:18 +08:00
daiao db3d403ec9 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 2016-12-16 16:12:30 +08:00
cxt 552b6429ef 消息列表的样式调整 2016-12-16 16:11:19 +08:00
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
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +08:00
cxt 710c06e41a 匿评成绩的申诉功能 2016-12-16 11:01:58 +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
daiao ffd1e3942c 个人主页tab列表 2016-12-15 09:13:39 +08:00
huang 58a45e8f16 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-14 15:21:56 +08:00
cxt 23e1f2b3bd 作业匿评期间，小铃铛消息、作业动态以及作品详情的回复显示，暴露了评阅人或匿评对象的信息 2016-12-14 13:37:52 +08:00
daiao 0d4dc89c73 个人主页的tab的JS及其样式 2016-12-14 10:17:39 +08:00
cxt 5ef8f19fbd 班级的归档提示不完整 2016-12-14 09:38:19 +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
daiao 54687793ec 铃铛样式重新排版 2016-12-13 17:22:30 +08:00
cxt 633c314a67 IE浏览器提交作品给出提示 2016-12-13 17:21:10 +08:00
cxt 30dccdec90 个人首页的待匿评作品、待完成问卷 2016-12-13 13:57:25 +08:00
huang 0c8447ac83 多个地方的Issue编辑跳至详情页面问题 2016-12-13 13:51:08 +08:00
cxt 93cf24cf41 首页消息提醒、消息动态样式 2016-12-12 15:57:26 +08:00
huang 6e67e4a5c7 0 2016-12-12 10:55:19 +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
daiao 92bc7aa813 个人首页的7个tab 2016-12-09 19:32:00 +08:00
cxt 67d23a2161 多级回复的显示调整 2016-12-09 10:01:53 +08:00
daiao 1875b6ecf7 个人首页的项目社区 2016-12-08 14:14:52 +08:00
daiao 224c0b686c 个人首页的课程社区 2016-12-08 09:59:22 +08:00
cxt c24f9b8c3b 作业的小齿轮菜单增加“启用匿评”的选项，同时更新“禁用匿评”的提示信息、禁用匿评的作业截止后也可以编辑“是否启用匿评” 2016-12-07 17:23:52 +08:00
cxt 9a830fc907 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/views/layouts/new_base_user.html.erb
 2016-12-07 15:21:25 +08:00
cxt 27d800a94a 新版首页架构 2016-12-07 15:15:00 +08:00
daiao 69d9228808 个人主页的消息页面 2016-12-07 15:13:51 +08:00
daiao e6763c6d0c 用户消息铃铛样式调整 2016-12-07 09:00:33 +08:00
cxt 03b00f0af5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-06 16:17:46 +08:00
cxt 9e9f1d44a1 具体班级页里的班级动态，不需要显示班级名称，直接显示栏目名称就可、具体作业的详情页，也不需要显示班级名称 2016-12-06 10:00:18 +08:00
daiao 35fdf9a8a7 个人首页头部及其左侧导航(未完) 2016-12-06 09:36:13 +08:00
cxt 88c8c4144b 编程作业新建和编辑的时候，测试输出集很长的显示不友好，调整 2016-12-05 17:18:56 +08:00
daiao 585d1ebb0d 申请加入班级，将课程改为班级 2016-12-02 19:14:09 +08:00
daiao ffce6f074f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-02 16:19:42 +08:00
daiao b48fc7ba3b pullrequest发送消息 2016-12-02 16:18:31 +08:00
黄井泉 42775a82f9 Merge branch 'cxt_course' into 'develop' 
班级作业增加设置选项：成绩公开范围



See merge request !37
 2016-12-02 14:53:55 +08:00
黄井泉 ef86b6da2a Merge branch 'develop' into 'develop' 
项目提交动态的方法优化，及多个样式调整风格一致



See merge request !38
 2016-12-02 14:47:25 +08:00
黄井泉 9a83b81269 Merge branch 'develop' into 'develop' 
项目没有数据的页面调整为新版；项目3类成员页面调整；组织列表新增新建功能；issue显示加长;

项目没有数据的页面调整为新版；项目3类成员页面调整；组织列表新增新建功能；issue显示加长;

See merge request !35
 2016-12-02 13:36:25 +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
daiao 7e5fda197e 组织列表增加新建组织按钮，并将我的issue与issue列表的issue标题显示加长 2016-12-02 10:21:56 +08:00
陈晓婷 39258f4ac5 Merge branch 'develop' into 'develop' 
课程相关bug修复；叠层回复的“回复”、“赞”的显隐



See merge request !32
 2016-12-02 10:14:07 +08:00
daiao 7a8c937173 项目issue列表，讨论区，版本库，pullrequests，里程碑及其里程碑详情页面，数据为空时，页面调整 2016-12-01 17:29:14 +08:00