Commit Graph

11197 Commits

Author SHA1 Message Date
ouyangxuhua 1a7a97dbc5 引用了ke的页面下方存在一个可见的uploadbutton 2015-12-09 15:53:36 +08:00
ouyangxuhua 333c0e41a0 1.栏目增加新建帖子功能;
2.点击某栏目,显示相应的动态;
3.编辑栏目里的文章后,返回相应的栏目动态。
2015-12-09 10:48:15 +08:00
ouyangxuhua 09f0d0201e 组织增加栏目发帖功能 2015-12-09 09:23:22 +08:00
ouyangxuhua 1881e18742 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-08 15:31:17 +08:00
ouyangxuhua bb7bcf46a9 1.设置首页后,跳转至组织首页 2015-12-08 15:30:58 +08:00
huang 07e414a2cd Merge branch 'develop' into dev_hjq 2015-12-07 17:31:03 +08:00
huang 298bf037ad Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 17:25:51 +08:00
huang 3459164e64 过滤条件样式 2015-12-07 17:25:32 +08:00
ouyangxuhua 8b14e7c549 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 17:19:52 +08:00
ouyangxuhua 5198f4dde4 Merge branch 'dev_hjq' into develop 2015-12-07 17:19:26 +08:00
ouyangxuhua 9d6b4783df 删除组织配置栏目的组织首页项 2015-12-07 17:18:46 +08:00
huang 5f6d9f2425 项目动态新样式 2015-12-07 17:14:13 +08:00
ouyangxuhua a8b7d1b81f 回复项目里的message,不增加项目动态及组织动态 2015-12-07 17:11:30 +08:00
huang 91fa3f6fab 解决项目样式冲突问题 2015-12-07 16:52:23 +08:00
ouyangxuhua e45ce0fb95 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-07 15:52:32 +08:00
ouyangxuhua 76db95aa03 1.组织页面中,退出后刷新组织页面;
2.组织页面中,点击“个人主页”,打开新的页面;
3.组织页面页首部分,用户名不链接用户页面。
2015-12-07 15:52:13 +08:00
cxt c8f4149206 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 15:18:43 +08:00
cxt 8e999ed9f0 作业动态的回复删除功能只在鼠标进入时显示 2015-12-07 15:18:32 +08:00
huang 5eb249515c 版本库显示样式 2015-12-07 15:12:30 +08:00
huang a5b9927365 Merge branch 'dev_hjq' into develop 2015-12-07 14:40:53 +08:00
huang 9ff41c214b Merge branch 'develop' into dev_hjq 2015-12-07 14:40:25 +08:00
ouyangxuhua 9f30c7a44e 如果用户没有登陆,不能在组织页面中,增加项目或课程。 2015-12-07 14:37:35 +08:00
ouyangxuhua 7057a4cfea 组织页首增加退出功能 2015-12-07 14:31:08 +08:00
ouyangxuhua c229104d78 修改编辑组织标题 2015-12-07 13:03:21 +08:00
ouyangxuhua 5034ddb4b6 修复组织的bug 2015-12-07 12:53:51 +08:00
cxt 79ce5c9ac5 匿评已结束时作业动态的作品按钮显示成“查看作品” 2015-12-07 11:31:37 +08:00
cxt 73e9a00a1a 作业动态添加回复的删除功能 2015-12-07 11:25:41 +08:00
cxt 0472a5ed0c Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 10:54:28 +08:00
cxt a62ecc10ad 作业动态设置评分后无法刷新 2015-12-07 10:54:18 +08:00
huang ab1c945a30 修改版本库库权限
自己不能fork自己的项目
2015-12-07 10:34:10 +08:00
huang 9ef7cdf91f Merge branch 'dev_hjq' into develop 2015-12-07 10:07:24 +08:00
huang f67386e8a0 组织模块丢失代码还原 2015-12-07 10:06:51 +08:00
huang de5990f484 Merge branch 'develop' into dev_hjq 2015-12-07 09:59:36 +08:00
huang 79a893d5c1 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-05 14:35:34 +08:00
huang c218b09945 Merge branch 'dev_hjq' into develop 2015-12-05 14:34:41 +08:00
huang bd3d0547f5 组织样式修改 2015-12-05 14:34:16 +08:00
huang 7fe112c337 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 13:30:19 +08:00
ouyangxuhua 4c9d9dee35 组织首页样式 2015-12-05 13:27:58 +08:00
ouyangxuhua 108865968b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 12:01:49 +08:00
ouyangxuhua 12c57e7e4b 将Jquery引入组织首页 2015-12-05 12:01:04 +08:00
huang 01ca1850f8 Merge branch 'dev_hjq' into develop 2015-12-05 11:40:38 +08:00
huang 9d68fd7d28 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 11:39:50 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua 37a7abea53 组织首页 2015-12-05 11:31:20 +08:00
ouyangxuhua 01b82e59d8 实现组织首页功能 2015-12-05 11:30:05 +08:00
ouyangxuhua 5b0bdb5069 修改组织栏目的内容及样式 2015-12-04 18:19:35 +08:00
huang c7058e6bbf Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 17:45:18 +08:00
huang 4cb58211ad 邮件消息提示语修改 2015-12-04 17:44:46 +08:00
huang 33df6ec608 Merge branch 'gitlab_guange' into develop 2015-12-04 17:42:57 +08:00
huang 1cf774d6a5 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-04 17:39:39 +08:00