 daiao
|
432c98881b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-01-04 10:41:38 +08:00 |
|
daiao
|
53d48b7559
|
我发布的Issue
|
2017-01-04 10:41:26 +08:00 |
 黄井泉
|
fefe951234
|
Merge branch 'develop' into 'develop'
注册激活提示方法参数修改
See merge request !105
|
2017-01-03 17:18:16 +08:00 |
|
huang
|
86baa2a850
|
邮件激活成功参数名字修改
|
2017-01-03 17:16:01 +08:00 |
|
daiao
|
8fad30da15
|
admin隐藏非项目信息
|
2017-01-03 16:40:08 +08:00 |
|
daiao
|
e5363e82cf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2017-01-03 16:24:19 +08:00 |
|
黄井泉
|
2a9338666e
|
Merge branch 'develop' into 'develop'
admin 隐藏非项目的一些信息
See merge request !102
|
2017-01-03 16:23:50 +08:00 |
|
黄井泉
|
0e7baab7b4
|
Merge branch 'develop' into 'develop'
评分设置无反应、“我收到的作业”列表成绩显示不准确
See merge request !101
|
2017-01-03 16:23:41 +08:00 |
|
huang
|
148d958de6
|
隐藏非项目信息的一些修改
|
2017-01-03 16:21:50 +08:00 |
|
daiao
|
d87430ae31
|
将用户头像区域的背景换回彩色
|
2017-01-03 16:21:47 +08:00 |
|
daiao
|
58615d93f7
|
隐藏和显示非项目信息
|
2017-01-03 16:16:44 +08:00 |
|
daiao
|
7d085e4930
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
Conflicts:
app/views/forums/_right_bar.html.erb
|
2017-01-03 15:50:56 +08:00 |
|
daiao
|
2a8cd2d935
|
我发布的issue（未完）
|
2017-01-03 15:42:37 +08:00 |
|
huang
|
b9eb320d17
|
用户注册激活、token值过期添加提示
|
2017-01-03 15:20:31 +08:00 |
 cxt
|
64fd365414
|
班级作业的评分设置，选择助教评分后，点击确定没有任何反应
|
2017-01-03 14:26:12 +08:00 |
|
cxt
|
0030a924ec
|
竞赛的成员配置页，列表的显示需要微调
|
2017-01-03 13:54:51 +08:00 |
|
huang
|
ab77cbff12
|
admin界面点击配置报500问题
|
2017-01-03 13:22:35 +08:00 |
|
cxt
|
fc85e2db17
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-01-03 11:20:20 +08:00 |
|
cxt
|
e3a6f0b6b4
|
我“收到的作业”组员评分显示的是组长评分
|
2017-01-03 11:19:48 +08:00 |
|
huang
|
48f3338fbe
|
统计数
|
2016-12-30 22:20:29 +08:00 |
|
huang
|
0c8dff30a8
|
编辑的时候局部刷新
|
2016-12-30 22:11:16 +08:00 |
|
huang
|
6360f9419f
|
memo详情去掉编辑删除
|
2016-12-30 22:07:36 +08:00 |
|
huang
|
fc5e335429
|
问吧统计数字不一致的问题
|
2016-12-30 21:53:55 +08:00 |
|
huang
|
faf43bb8ba
|
问吧样式（数字过多的时候异常）
|
2016-12-30 21:44:22 +08:00 |
|
huang
|
a6b4ec64e2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/memos_controller.rb
|
2016-12-30 21:17:56 +08:00 |
|
黄井泉
|
fd9c423eb7
|
Merge branch 'develop' into 'develop'
周五缺陷修复
周五缺陷修复
See merge request !98
|
2016-12-30 21:16:08 +08:00 |
|
daiao
|
fbfbc0cdeb
|
问吧样式调整
|
2016-12-30 21:05:14 +08:00 |
|
huang
|
118772671c
|
我的组织样式问题
|
2016-12-30 21:04:38 +08:00 |
|
cxt
|
9d6f75fb3e
|
竞赛管理员有权限访问竞赛作品关联的私有项目，但访问关联项目的讨论区却报403
|
2016-12-30 20:59:13 +08:00 |
|
huang
|
8f230c67e0
|
弹框居中
|
2016-12-30 20:55:28 +08:00 |
|
huang
|
bef4e7be12
|
处理贴吧同名问题
|
2016-12-30 20:53:09 +08:00 |
|
cxt
|
055b05bac9
|
竞赛列表的创建者加上链接
|
2016-12-30 20:42:41 +08:00 |
|
cxt
|
a60c83fe00
|
超级管理员要有对竞赛通知编辑、删除的权限
|
2016-12-30 20:35:40 +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 |
|
cxt
|
6d894c53d5
|
竞赛讨论区的置顶和锁定
|
2016-12-30 19:53:00 +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 |
|
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 |
|
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 |