Commit Graph

12 Commits

Author SHA1 Message Date
黄井泉 74b37947f1 Merge branch 'develop' into 'develop'
本周上限任务



See merge request !95
2016-12-30 17:33:30 +08:00
cxt 6ba5f124e3 竞赛相关icon更换 2016-12-30 13:58:40 +08:00
daiao 64c6fa1f37 首页显示的个人信息区域北京,换成灰度背景 2016-12-28 09:55:59 +08:00
daiao b4d4fa4e28 待办任务的所有列表页,首列加上发布人的头像 2016-12-22 14:49:19 +08:00
cxt 16fe5f58a1 详细列表的样式调整 2016-12-17 09:38:48 +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
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
daiao ffd1e3942c 个人主页tab列表 2016-12-15 09:13:39 +08:00
huang 6e67e4a5c7 0 2016-12-12 10:55:19 +08:00
daiao e6763c6d0c 用户消息铃铛样式调整 2016-12-07 09:00:33 +08:00
daiao 35fdf9a8a7 个人首页头部及其左侧导航(未完) 2016-12-06 09:36:13 +08:00