Commit Graph

15342 Commits

Author SHA1 Message Date
cxt 0146ac1f11 访问他人主页时,对于动态过滤按钮,“我的动态”应改为“他的动态”;但浏览自己的主页时,应该显示为“我的动态”。 2016-07-21 10:50:53 +08:00
cxt c84a9e6e10 个人主页,不需要对其他用户显示关注人的动态。例如,我看周老师的个人主页时,不应该显示我的博客动态;但他本人看自己的主页时,应该显示尹刚的博客动态,因为他关注我了。 2016-07-21 10:47:01 +08:00
cxt f3c95906d8 项目缺陷的二级回复 2016-07-21 10:30:48 +08:00
Tim 53c515b8d1 课程大纲侧导航js控制 2016-07-21 10:28:50 +08:00
Tim fe105c84ad 弹框定位改为fixed 2016-07-21 10:18:58 +08:00
Tim 541440135f css中引用图片路径修改 2016-07-21 10:11:02 +08:00
huang d58167f4bc Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-07-21 09:27:33 +08:00
huang 6357f5be2a 解决成员列表获取单位不准确的问题 2016-07-21 09:27:14 +08:00
Tim efd452db2c Merge branch 'cs_optimize_txz' into develop 2016-07-20 17:13:40 +08:00
Tim dcb541e889 资源库资源列表取消虚线 2016-07-20 17:10:51 +08:00
Tim 2850fe1b2b 预览图片边框阴影效果 2016-07-20 17:08:31 +08:00
huang f979e80f24 Gitlab数据清理及迁移,主要是历史数据 2016-07-20 17:05:55 +08:00
Tim 85c9fb5dce 二级回复图片超出显示 2016-07-20 17:00:54 +08:00
cxt 7853b8aa54 班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复, 二级回复代码的整合 2016-07-20 17:00:18 +08:00
Tim 635b3beb32 新建issue版本图标问题 2016-07-20 16:46:58 +08:00
Tim 5adc4e1e5a 项目issue上传附件与填写正确加间距 2016-07-20 16:41:53 +08:00
Tim bf87ffb992 组织历史版本弹框文件夹图标问题 2016-07-20 16:21:58 +08:00
Tim f3494489c2 Merge branch 'develop' into cs_optimize_txz 2016-07-20 15:14:32 +08:00
Tim 525169fa4a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-20 15:12:44 +08:00
Tim 78e4d37d8b 大纲base页引入弹框样式;作业列表调整 2016-07-20 15:09:01 +08:00
yuanke ff42de619b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-20 14:06:16 +08:00
txz c56f7732a1 二级回复新样式 2016-07-20 14:05:17 +08:00
yuanke 67e87df4d5 微信动态详情回复显示修改 2016-07-20 13:34:58 +08:00
huang 3a43b7beb5 redirect to repository when delete jenkins job 2016-07-20 11:20:48 +08:00
huang e99c76a0de resolve edit problem of jenkins job 2016-07-20 10:09:55 +08:00
yuanke bf600e8f76 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-20 10:09:37 +08:00
yuanke 1ce7b22c0e 博客动态回复二级回复修改 2016-07-20 10:09:27 +08:00
huang 1935176500 Merge branch 'develop' into rep_quality 2016-07-20 09:38:59 +08:00
huang 14e6db457b rake 2016-07-20 09:38:23 +08:00
txz 53feb0bbd4 课程列表课程名称宽度限制 2016-07-20 09:11:05 +08:00
guange 674c45f1d9 去掉上传的csrf报错 2016-07-19 17:44:27 +08:00
huang 0c0dfbd093 changeset关联 2016-07-19 17:38:11 +08:00
Tim eb503cc3e8 Merge branch 'develop' into cs_optimize_txz 2016-07-19 16:50:30 +08:00
Tim ce5cf8bf4f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-19 16:44:14 +08:00
txz 707df88c7f tab容器宽度百分百 2016-07-19 16:05:39 +08:00
huang cf04bb5ec6 迁移上线 2016-07-19 15:59:52 +08:00
txz 5b3c6cc012 输入框高度控制 2016-07-19 15:41:40 +08:00
huang 26d4be6518 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2016-07-19 15:25:54 +08:00
huang 1a129722eb Merge branch 'rep_quality' into develop 2016-07-19 15:25:13 +08:00
huang 25da65d565 恢复gemfile 2016-07-19 15:24:50 +08:00
txz 2af1a5ffb9 新增班级和管理班级输入框高度控制 2016-07-19 15:07:11 +08:00
Tim 10871d26a2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-19 11:21:06 +08:00
huang 4e3bfd9254 some bugs for sonar show 2016-07-19 11:17:54 +08:00
txz 27965bee01 加入班级弹框样式统一 2016-07-19 11:17:46 +08:00
yuanke ea88c92d31 测试用 2016-07-19 10:54:04 +08:00
yuanke 80843d5084 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-19 10:50:46 +08:00
yuanke bc1b4c1b85 班级邀请码弹框修改,我的动态回复数计算修改 2016-07-19 10:50:36 +08:00
txz bc0d8cd299 管理班级重命名字体变灰 2016-07-19 10:25:45 +08:00
huang c50ca34b0e 代码质量分析部分数据转换成整型 2016-07-19 09:48:02 +08:00
huang 04fe06eff9 gitlab数据迁移 2016-07-19 09:39:47 +08:00