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

18611 Commits

Author SHA1 Message Date
陈晓婷 3a8769bbbc Merge branch 'develop' into 'develop' 
bug修复



See merge request !136
 2017-01-20 17:00:26 +08:00
cxt 7d1dbc1656 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-20 16:59:54 +08:00
陈晓婷 166511b7f8 Merge branch 'develop' into 'develop' 
上线缺陷修改



See merge request !137
 2017-01-20 16:59:37 +08:00
cxt bd7e595695 班级/项目/组织资源库：更新资源版本、删除资源，如图显示不用加粗的 2017-01-20 16:58:54 +08:00
daiao abe20963a6 查看别人的个人留言，无数据时，样式调整 2017-01-20 16:56:26 +08:00
daiao 208f426e83 加入班级申请类消息，当鼠标放在如图处时显示完全 2017-01-20 16:46:04 +08:00
daiao 695c9a022b 我收到的Issue列表导出的excel名称改为：我收到的isuee 2017-01-20 16:37:03 +08:00
daiao 9f063e024a 先注册新用户返回资料修改页面，再用老用户登录，却还是返回的资料修改页面，且不能对资料修改除外的其他模块进行操作 2017-01-20 16:31:35 +08:00
cxt 8c80573fef 如图“我收到的作业”页面中，“查看详情”感觉不合理，且点击查看详情却报404 2017-01-20 16:30:07 +08:00
cxt f47f9487dc 班级具体分班中导出成绩报500 2017-01-20 16:22:43 +08:00
cxt a01d0d75e7 如图竞赛类消息不管是已读或未读，始终是加粗的 2017-01-20 16:16:07 +08:00
cxt 6d84085d61 santo用户的铃铛消息-未读消息列表一直显示“正在加载中。。” 2017-01-20 15:39:40 +08:00
cxt f24e7346a2 班级配置-组织：如图取消关联，点击确定按钮，确认弹框不消失，且关联的组织列表未自动刷新 2017-01-20 15:37:36 +08:00
cxt 2851e52d9b 班级配置-讨论区设置：样式问题 2017-01-20 15:15:37 +08:00
cxt c52baaf29a 班级配置-成员：如图点击确认按钮，确认弹框却还在 2017-01-20 15:07:39 +08:00
cxt 532db3dec9 参与问卷答题，提交弹框点击确定时，总是提示如下“确认导航”弹框，容易让用户误解 2017-01-20 15:00:46 +08:00
陈晓婷 28f0f1edad Merge branch 'guange_dev' into 'develop' 
性能优化issue11269



See merge request !131
 2017-01-20 14:01:15 +08:00
guange 99741daef5 merge 2017-01-20 14:00:22 +08:00
guange d9ba7896df merge 2017-01-20 13:57:50 +08:00
陈晓婷 00628a0c83 Merge branch 'develop' into 'develop' 
本周上线任务



See merge request !133
 2017-01-20 13:57:21 +08:00
guange 3c5b4b0086 . 2017-01-20 13:57:15 +08:00
cxt 65bfaedb3a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2017-01-20 13:56:34 +08:00
黄井泉 0345a0a5fe Merge branch 'develop' into 'develop' 
本周上线内容

本周上线内容

See merge request !134
 2017-01-20 13:45:39 +08:00
daiao c12c335d8c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-20 13:45:06 +08:00
huang dd2fc230d0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-20 13:42:24 +08:00
黄井泉 2100eba325 Merge branch 'develop' into 'develop' 
界面bug

* 班级学生列表中的分班“编辑”“删除”按钮
* 博客：标题为非汉字类型显示超出边框已改，弊端是如果是英文单词会自动断开

See merge request !132
 2017-01-20 13:41:18 +08:00
cxt 6b9a847fe2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/common.css
	public/stylesheets/css/courses.css
 2017-01-20 13:39:44 +08:00
daiao c90d60e881 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/common.css
	public/stylesheets/css/public.css
 2017-01-20 13:39:26 +08:00
cxt 2995c05b06 sw_1用户访问875班级却报403 2017-01-20 11:16:35 +08:00
daiao 548f4e457b 项目配置-成员翻页更新成新版样式 2017-01-20 11:13:27 +08:00
huang d13940af61 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-20 10:26:28 +08:00
huang 4fdbe43b70 Merge branch 'dev_tieba' into develop 2017-01-20 10:26:12 +08:00
huang 74ed832b68 开源检索数据迁移 2017-01-20 10:25:15 +08:00
cxt ac80805932 班级统计功能（暂未完成） 2017-01-20 10:16:51 +08:00
huang c50266e264 开源检索按钮调整 2017-01-20 10:13:30 +08:00
huang 94822a5c95 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2017-01-20 09:57:05 +08:00
daiao 95c671a0e5 Merge branch 'develop' into dev_tieba 2017-01-20 09:55:27 +08:00
daiao 6619ee9c20 开源检索功能 2017-01-20 09:52:10 +08:00
huang a8d25dab60 项目历史记录中“查看差别”：建议只有当issue描述内容更行时才“查看差别”，否则只显示一条更新记录即可 2017-01-20 09:08:26 +08:00
huang 113d7e9fc1 修复blog消息和小铃铛中的bug 2017-01-19 17:46:18 +08:00
huang 5a961c8ee7 解决blog删除、blog回复500问题 2017-01-19 17:26:26 +08:00
Linda 0db1aea9f1 里程碑缺陷统计表格样式显示问题 2017-01-19 16:46:31 +08:00
Linda 33d5ed9d95 未登录导航搜索样式显示问题 2017-01-19 16:32:08 +08:00
daiao a2aea42868 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-19 15:57:55 +08:00
huang 0a0b3fbf9b Merge branch 'develop' into dev_tieba 2017-01-19 15:56:44 +08:00
huang e1f107bf4f 课程提供开源检索配置功能 2017-01-19 15:51:53 +08:00
Linda 4095fb5509 班级资源库：上传资源弹框样式、延期发布弹框样式 2017-01-19 15:17:05 +08:00
daiao 9dff530d49 点击小铃铛查看全部，跳入个人主页 2017-01-19 14:12:19 +08:00
daiao 0fc90ba6fc 正式版footer中除掉“关于我们” 2017-01-19 14:02:30 +08:00
daiao 73402735af 个人留言数据为空时，加上无数据显示提示 2017-01-19 13:53:37 +08:00