 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 |
|
huang
|
6cd4e9e71d
|
问吧详情页面优化
|
2016-12-29 16:39:39 +08:00 |
|
huang
|
134bdcebf2
|
问吧 index页面优化
|
2016-12-29 16:21:39 +08:00 |
|
huang
|
9fcd5b48ed
|
forum index页面分页及排序
|
2016-12-29 15:57:52 +08:00 |
|
daiao
|
143e33a891
|
问吧分页样式调整
|
2016-12-29 15:13:55 +08:00 |
|
daiao
|
c8807b29ca
|
贴吧帖子的内容，设置高度限制（可点击“展开”与“收起”）
|
2016-12-29 15:01:21 +08:00 |
|
daiao
|
ba08bbf906
|
贴吧右侧的贴吧列表页面
|
2016-12-29 13:52:45 +08:00 |
|
daiao
|
bca1c84ec9
|
贴吧-我要提问页面
|
2016-12-29 10:39:11 +08:00 |
|
daiao
|
506d7ae82c
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2016-12-28 16:38:30 +08:00 |
|
daiao
|
017ed1b0b0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-28 16:36:45 +08:00 |
|
huang
|
3de52ab856
|
问吧新建的时候关联其它问吧
|
2016-12-28 16:29:25 +08:00 |
|
黄井泉
|
67139f84e0
|
Merge branch 'dev_newproject' into 'develop'
邮件激活页面调整
See merge request !93
|
2016-12-28 16:24:48 +08:00 |
|
huang
|
a423909a71
|
完成memo详情相关页面及功能
|
2016-12-28 16:18:47 +08:00 |
|
daiao
|
527d00f233
|
用户激活页面
|
2016-12-28 16:18:13 +08:00 |
|
黄井泉
|
405aecb440
|
Merge branch 'dev_newproject' into 'develop'
发送邮件的内容调整
See merge request !92
|
2016-12-28 16:08:50 +08:00 |
|
daiao
|
2832c40244
|
发送邮件激活页面
|
2016-12-28 15:48:13 +08:00 |
|
huang
|
da88c43e95
|
完成问吧 memo新建及 forum详情页面相关功能
|
2016-12-28 15:24:26 +08:00 |
|
daiao
|
880c66c659
|
基本资料页面的单位名称被清楚后，重新恢复提示
|
2016-12-28 14:40:42 +08:00 |
|
daiao
|
fc439e562d
|
用户基本资料页面，去除“邮件通知”一项，未完善资料的用户隐藏新建入口
|
2016-12-28 13:46:01 +08:00 |
|
huang
|
c3aa69029e
|
完成问吧idex页面及新家贴吧
|
2016-12-28 11:05:05 +08:00 |
 cxt
|
f10ab4c63d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-28 10:21:30 +08:00 |
|
cxt
|
c1b5f8d77d
|
786竞赛图片更换
|
2016-12-28 10:21:11 +08:00 |
|
daiao
|
64c6fa1f37
|
首页显示的个人信息区域北京，换成灰度背景
|
2016-12-28 09:55:59 +08:00 |
|
huang
|
fe20c45c26
|
新建贴吧弹框
|
2016-12-27 17:12:42 +08:00 |
|
daiao
|
2032ce8a3c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-27 17:01:18 +08:00 |
|
黄井泉
|
04ce4107bb
|
Merge branch 'develop' into 'develop'
在同一项目内的里程碑，不能重名
在同一项目内的里程碑，不能重名
See merge request !90
|
2016-12-27 17:00:25 +08:00 |
|
daiao
|
7c44a14fb5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-27 16:56:54 +08:00 |
|
daiao
|
50fb461f20
|
新建里程碑在项目内不能重名
|
2016-12-27 16:54:53 +08:00 |
|
cxt
|
b10720520b
|
Merge branch 'cxt_course' into develop
|
2016-12-27 16:38:26 +08:00 |
|
cxt
|
2b2498d66a
|
课程列表的班级收藏
|
2016-12-27 16:36:35 +08:00 |
|
黄井泉
|
8e2353d61e
|
Merge branch 'develop' into 'develop'
新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题
新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题
See merge request !88
|
2016-12-27 16:27:19 +08:00 |
|
黄井泉
|
e5b9f0df46
|
Merge branch 'develop' into 'develop'
竞赛发布通知字段过长400问题
See merge request !89
|
2016-12-27 16:21:45 +08:00 |
|
daiao
|
cfa81fc79d
|
新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题
|
2016-12-27 16:18:23 +08:00 |
|
huang
|
465b3e7b52
|
问吧 base框架
|
2016-12-27 16:09:09 +08:00 |
|
cxt
|
f1a4cac61c
|
Merge branch 'develop' into cxt_course
|
2016-12-27 14:20:37 +08:00 |
|
huang
|
4f6e9b2c3b
|
竞赛通知新建路由更改
|
2016-12-27 14:13:51 +08:00 |
|
huang
|
30d0cfc2af
|
Merge branch 'develop' into dev_tieba
|
2016-12-27 13:28:36 +08:00 |
|
huang
|
a354699b42
|
邮件国际化丢失等问题
|
2016-12-27 13:02:22 +08:00 |
|
huang
|
e614a2d111
|
修复500问题
|
2016-12-27 12:33:08 +08:00 |
|
huang
|
8126353b43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
2016-12-27 12:29:43 +08:00 |
|
huang
|
616e7a2a11
|
公共贴吧
|
2016-12-27 12:12:07 +08:00 |
|
huang
|
735cdb6a46
|
公共贴吧
|
2016-12-27 10:41:28 +08:00 |
|
daiao
|
a668ed7a81
|
待审批申请，被其他管理员审批的历史数据依旧还存在的问题
|
2016-12-27 09:07:16 +08:00 |
|
huang
|
d10a51df1b
|
部分用户主页 点击课程后500问题
|
2016-12-26 16:45:56 +08:00 |
|
huang
|
40c3d34a58
|
注册邮件内容后台可配
|
2016-12-26 15:40:43 +08:00 |