 huang
|
bef4e7be12
|
处理贴吧同名问题
|
2016-12-30 20:53:09 +08:00 |
|
huang
|
6fcf80cd3c
|
修改统计数字
|
2016-12-30 20:31:19 +08:00 |
 cxt
|
a5e6ed0d39
|
竞赛“提交”的相关bug修复
|
2016-12-30 20:30:45 +08:00 |
|
cxt
|
0f4e3f0189
|
竞赛：进入通知详情页面后，如图左侧导航的“讨论区”却加亮显示了
|
2016-12-30 20:29:54 +08:00 |
|
huang
|
82a3ff01ef
|
贴吧详情统计数修改
|
2016-12-30 20:14:31 +08:00 |
|
huang
|
e33c62419a
|
贴吧编辑的时候tip修改；回复的时候去掉“发布成功”提示
|
2016-12-30 19:37:18 +08:00 |
|
huang
|
17d4e45acc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2016-12-30 17:33:18 +08:00 |
|
huang
|
a69e576fbc
|
问吧列表也只显示主贴
|
2016-12-30 17:10:12 +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
|
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 |
|
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 |
|
huang
|
912752d646
|
问吧编辑的时候ajax局部刷新
|
2016-12-30 13:54:42 +08:00 |
|
huang
|
11135bfabf
|
问吧编辑
|
2016-12-30 11:30:40 +08:00 |
|
cxt
|
738db43f34
|
具体竞赛页的邀请码tip没有显示、竞赛菜单的“暂停加入”和“删除”
|
2016-12-30 11:18:29 +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
|
365c9f810c
|
memo新建
|
2016-12-29 18:02:56 +08:00 |
|
huang
|
6cd4e9e71d
|
问吧详情页面优化
|
2016-12-29 16:39:39 +08:00 |
|
huang
|
134bdcebf2
|
问吧 index页面优化
|
2016-12-29 16:21:39 +08:00 |
|
huang
|
b57384778e
|
解决注册激活页面刷新404的问题
|
2016-12-29 14:38:51 +08:00 |
|
huang
|
b2a53b65f8
|
邮件激活页面，并添加留言功能
|
2016-12-29 10:47:35 +08:00 |
|
huang
|
91e452b0c8
|
邮件激活新页面
|
2016-12-28 17:58:27 +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 |
|
huang
|
3de52ab856
|
问吧新建的时候关联其它问吧
|
2016-12-28 16:29:25 +08:00 |
|
huang
|
a423909a71
|
完成memo详情相关页面及功能
|
2016-12-28 16:18:47 +08:00 |
|
huang
|
da88c43e95
|
完成问吧 memo新建及 forum详情页面相关功能
|
2016-12-28 15:24:26 +08:00 |
|
cxt
|
bdd2a60d00
|
竞赛：加入竞赛、发布竞赛、发布通知等的消息
|
2016-12-28 11:30:31 +08:00 |
|
huang
|
c3aa69029e
|
完成问吧idex页面及新家贴吧
|
2016-12-28 11:05:05 +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 |
|
daiao
|
cfa81fc79d
|
新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题
|
2016-12-27 16:18:23 +08:00 |
|
huang
|
465b3e7b52
|
问吧 base框架
|
2016-12-27 16:09:09 +08:00 |
|
huang
|
30d0cfc2af
|
Merge branch 'develop' into dev_tieba
|
2016-12-27 13:28:36 +08:00 |
|
huang
|
616e7a2a11
|
公共贴吧
|
2016-12-27 12:12:07 +08:00 |
|
daiao
|
a668ed7a81
|
待审批申请，被其他管理员审批的历史数据依旧还存在的问题
|
2016-12-27 09:07:16 +08:00 |
|
cxt
|
4067a9c4a7
|
title修改、通知的编辑删除、附件下载
|
2016-12-24 20:22:09 +08:00 |
|
cxt
|
e22e1caaed
|
bug修复
|
2016-12-24 18:48:50 +08:00 |
|
daiao
|
e86bd6728e
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/views/users/_user_activities.html.erb
db/schema.rb
|
2016-12-24 16:48:48 +08:00 |
|
cxt
|
de9f5131b6
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-24 16:30:30 +08:00 |
|
daiao
|
84d5b5bc4a
|
竞赛列表
|
2016-12-24 16:29:53 +08:00 |
|
cxt
|
9af9945cb4
|
竞赛
|
2016-12-24 16:29:10 +08:00 |
|
huang
|
a3dc06a4f7
|
新注册用户更改用户的时候用户名参数为空的问题处理
|
2016-12-24 12:05:48 +08:00 |
|
huang
|
4336d28dda
|
gitlab同步修改用户
|
2016-12-24 11:57:10 +08:00 |
|
huang
|
87c134c007
|
登录名能修改
|
2016-12-24 11:16:33 +08:00 |
|
cxt
|
44b3f6019c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-23 21:44:20 +08:00 |
|
cxt
|
86bd5b97b1
|
竞赛头部调整
|
2016-12-23 21:44:03 +08:00 |
|
huang
|
b563b170bd
|
竞赛动态新闻
|
2016-12-23 21:13:40 +08:00 |
|
huang
|
854de1fae6
|
新建竞赛通知发送消息， 及竞赛通知删除
|
2016-12-23 20:19:17 +08:00 |
|
huang
|
2c97f12538
|
竞赛编辑功能
|
2016-12-23 19:56:00 +08:00 |
|
huang
|
bc5846c2d6
|
竞赛通知 详情页面完成
|
2016-12-23 19:48:39 +08:00 |
|
huang
|
43bb3fe4eb
|
完成竞赛通知 列表页面
|
2016-12-23 19:35:02 +08:00 |
|
huang
|
c98a8b5113
|
竞赛通知新建
|
2016-12-23 19:08:13 +08:00 |
|
huang
|
345d8b5045
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-23 17:00:37 +08:00 |
|
huang
|
0877aae0d6
|
竞赛通知 index方法
|
2016-12-23 17:00:11 +08:00 |
|
cxt
|
a03c0f68c2
|
提交作品
|
2016-12-23 16:58:50 +08:00 |
|
cxt
|
544702e11f
|
新建题目
|
2016-12-23 14:41:21 +08:00 |
|
黄井泉
|
4125c1b44a
|
Merge branch 'develop' into 'develop'
issue详情页面一、二级回复、一级删除局部刷新
See merge request !80
|
2016-12-23 14:35:51 +08:00 |
|
huang
|
37f1aa1442
|
邮件相关改进
|
2016-12-23 14:29:48 +08:00 |
|
daiao
|
fd97d8b421
|
课程社区的首页动态，加入班级资源库动态
|
2016-12-23 14:03:43 +08:00 |
|
daiao
|
a40b7f6fd0
|
申请项目，申请人接受到的消息调整为：申请人头像+申请姓名+消息
|
2016-12-23 09:34:23 +08:00 |
|
cxt
|
5a27b84e97
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-22 17:13:25 +08:00 |
|
cxt
|
9331525304
|
竞赛消息的调整
|
2016-12-22 17:13:10 +08:00 |
|
huang
|
3406d4ba0d
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-22 17:11:15 +08:00 |
|
huang
|
f37c292e99
|
添加成员
|
2016-12-22 17:02:54 +08:00 |
|
huang
|
b74c034237
|
项目配置添加ke编辑 base中去掉配置
|
2016-12-22 16:39:54 +08:00 |
|
cxt
|
c4927070a0
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-22 16:05:12 +08:00 |
|
cxt
|
346dc069ef
|
加入竞赛的消息通知
|
2016-12-22 16:02:36 +08:00 |
|
huang
|
0d00b6ca74
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-22 15:17:54 +08:00 |
|
huang
|
037e717937
|
竞赛邀请码 竞赛settings（部分）
|
2016-12-22 15:17:02 +08:00 |
|
cxt
|
cf8725f2ee
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-22 15:08:49 +08:00 |
|
cxt
|
4c5a2aa40b
|
加入竞赛
|
2016-12-22 15:08:15 +08:00 |
|
huang
|
01d9fbbef3
|
组织base框架
|
2016-12-22 14:47:42 +08:00 |
|
daiao
|
884a201953
|
项目加入申请，被审批后，其他管理员的消息显示加入操作人姓名（并将提示弹框改为新版）
|
2016-12-22 13:48:03 +08:00 |
|
cxt
|
fddcbe2a56
|
新建竞赛
|
2016-12-22 11:17:13 +08:00 |
|
cxt
|
5242e12373
|
竞赛框架搭建
|
2016-12-22 10:01:37 +08:00 |
|
daiao
|
2f86fa5c5f
|
待审判用户，管理员批准时，其实管理员依旧还显示的问题
|
2016-12-21 14:56:49 +08:00 |
|
daiao
|
51f5bb6050
|
课程和项目的首页，在标签名称中显示
|
2016-12-21 10:29:54 +08:00 |
|
huang
|
ff34ec6de8
|
版本库下载 参数加密 gitlab添加解密功能
|
2016-12-20 16:33:26 +08:00 |
|
daiao
|
de44385548
|
Issue统计页面，增加用户筛选过滤条件的提示
|
2016-12-20 15:45:33 +08:00 |
|
daiao
|
c2924e06e6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-20 11:04:39 +08:00 |
|
daiao
|
2b60143f78
|
博客，班级的帖子标题和内容，留言显示出现英文单词分隔显示问题
|
2016-12-20 11:04:16 +08:00 |
|
huang
|
d304555044
|
用户修改密码、删除项目成员 添加事务处理
|
2016-12-19 17:26:56 +08:00 |
|
huang
|
7faddc30c5
|
项目成员编辑 添加事务
|
2016-12-19 17:08:32 +08:00 |
|
huang
|
05d10e20d1
|
项目添加成员 使用事务处理
|
2016-12-19 17:04:27 +08:00 |
|
huang
|
a3e3c9d4db
|
版本库创建添加事务处理（两边数据一致性）
|
2016-12-19 16:36:25 +08:00 |
|
huang
|
cc68f33a5a
|
issue 详情删除局部刷新
|
2016-12-19 15:29:39 +08:00 |
|
huang
|
1caf8d9935
|
issue 详情页面二级回复局部刷新
|
2016-12-19 15:16:45 +08:00 |
|
huang
|
3c1de111c6
|
issue回复局部刷新（项目动态、用户动态。issue详情）
|
2016-12-19 15:02:40 +08:00 |
 guange
|
34f8450885
|
ids为空时不需要执行
|
2016-12-18 18:29:24 +08:00 |