 huang
|
b5b988fb58
|
Merge branch 'dev_tieba' into develop
|
2016-12-30 17:30:29 +08:00 |
 daiao
|
114d7664f2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-30 17:29:51 +08:00 |
|
daiao
|
78c8a006fc
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2016-12-30 17:27:33 +08:00 |
|
daiao
|
23dc37d5d2
|
点击右侧贴吧名，跳新页面
|
2016-12-30 17:26:47 +08:00 |
 cxt
|
b92bb88985
|
匿评的rake
|
2016-12-30 17:25:44 +08:00 |
|
huang
|
2f864dbd99
|
memo点赞样式问题
|
2016-12-30 17:25:34 +08:00 |
|
huang
|
a69e576fbc
|
问吧列表也只显示主贴
|
2016-12-30 17:10:12 +08:00 |
|
cxt
|
2238cef9f1
|
竞赛提交截止后不可补交作品
|
2016-12-30 17:04:13 +08:00 |
|
daiao
|
2eaca7312a
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2016-12-30 16:52:46 +08:00 |
|
daiao
|
4c8ddde50d
|
贴吧保存失败提示
|
2016-12-30 16:52:16 +08:00 |
|
huang
|
baaaaf95d8
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
Conflicts:
config/routes.rb
|
2016-12-30 16:51:23 +08:00 |
|
cxt
|
79ba4cd9b7
|
竞赛社区首页点击竞赛列表后，标签的名称变更了，应该始终显示“竞赛”
|
2016-12-30 16:45:53 +08:00 |
|
cxt
|
7f7edf53ac
|
平台超级管理员无法访问私有的竞赛，正确的应该是可以访问并进行操作
|
2016-12-30 16:43:29 +08:00 |
|
cxt
|
cde8a8957c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-30 16:37:43 +08:00 |
|
cxt
|
986fe7db86
|
竞赛增加讨论区模块
|
2016-12-30 16:37:20 +08:00 |
|
daiao
|
157d747b57
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2016-12-30 16:22:14 +08:00 |
|
daiao
|
f332307cae
|
更改贴吧描述
|
2016-12-30 16:12:25 +08:00 |
|
huang
|
a30ed19b40
|
moemo的创建与编辑公共部分封装；按钮过长隐藏
|
2016-12-30 15:52:08 +08:00 |
|
daiao
|
44acf1a383
|
贴吧的左侧导航栏样式调整，并调整新建贴吧提示样式
|
2016-12-30 15:34:01 +08:00 |
|
huang
|
d9b6294883
|
解决个别user点击个人主页项目500问题
|
2016-12-30 15:14:52 +08:00 |
|
huang
|
2c7e7bed0b
|
Merge branch 'develop' into dev_tieba
|
2016-12-30 15:04:43 +08:00 |
|
huang
|
58162dab95
|
问吧帖子编辑
|
2016-12-30 14:53:02 +08:00 |
|
daiao
|
a8d16a15de
|
去除贴吧右侧tag
|
2016-12-30 14:20:01 +08:00 |
|
cxt
|
6ba5f124e3
|
竞赛相关icon更换
|
2016-12-30 13:58:40 +08:00 |
|
cxt
|
d1fbaa27b9
|
竞赛 ：作品--》提交
|
2016-12-30 13:58:09 +08:00 |
|
huang
|
48645e1d43
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2016-12-30 13:55:10 +08:00 |
|
huang
|
912752d646
|
问吧编辑的时候ajax局部刷新
|
2016-12-30 13:54:42 +08:00 |
|
daiao
|
cc7f6b7d55
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2016-12-30 13:50:37 +08:00 |
|
daiao
|
70e8e51a5e
|
问吧-贴吧右侧js调整
|
2016-12-30 13:49:57 +08:00 |
|
huang
|
53cd3a197b
|
问吧编辑和新建代码封装
|
2016-12-30 13:47:31 +08:00 |
|
daiao
|
e883194eaf
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2016-12-30 11:33:06 +08:00 |
|
daiao
|
37d82f6c8a
|
问吧的贴吧右上角标签，编辑和删除js
|
2016-12-30 11:32:32 +08:00 |
|
huang
|
11135bfabf
|
问吧编辑
|
2016-12-30 11:30:40 +08:00 |
|
cxt
|
619dfa7a7a
|
竞赛首页的图标更改
|
2016-12-30 11:30:28 +08:00 |
|
cxt
|
738db43f34
|
具体竞赛页的邀请码tip没有显示、竞赛菜单的“暂停加入”和“删除”
|
2016-12-30 11:18:29 +08:00 |
|
daiao
|
6acb0b0a5d
|
问吧的我要提问，默认选择其进入的贴吧
|
2016-12-30 11:03:30 +08:00 |
|
daiao
|
16e1f0c701
|
导航栏“帮助中心”改为“问吧”，并调整帖子展示内容的高度
|
2016-12-30 10:45:22 +08:00 |
|
huang
|
6c86f655fd
|
贴吧没数据的显示
|
2016-12-30 10:44:28 +08:00 |
|
cxt
|
73350e34f1
|
竞赛作品的相关设置
|
2016-12-30 10:30:21 +08:00 |
|
huang
|
fd291850ae
|
问吧帖子权限控制
|
2016-12-30 10:21:00 +08:00 |
|
huang
|
a7bf421df8
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2016-12-30 10:03:10 +08:00 |
|
daiao
|
b2bafe9c94
|
新建贴吧页面功能
|
2016-12-30 10:00:33 +08:00 |
|
huang
|
c22ee7664f
|
邮件显示内容距离调整
|
2016-12-30 09:45:03 +08:00 |
|
huang
|
365c9f810c
|
memo新建
|
2016-12-29 18:02:56 +08:00 |
|
huang
|
edee7adae3
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2016-12-29 17:19:27 +08:00 |
|
huang
|
aa2dcb6719
|
先建帖子的时候添加返回按钮
|
2016-12-29 17:18:56 +08:00 |
|
huang
|
e8cc1633d3
|
问吧一些改进
|
2016-12-29 17:15:54 +08:00 |
|
daiao
|
5137c1b4f2
|
新建贴吧页面样式调整
|
2016-12-29 17:10:26 +08:00 |
|
huang
|
3bdf26c63e
|
问吧位置加链接
|
2016-12-29 17:07:34 +08:00 |
|
daiao
|
b70101b4ec
|
问吧提问界面样式调整
|
2016-12-29 16:56:08 +08:00 |