 sw
|
61167e55c9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-09 17:37:49 +08:00 |
 z9hang
|
052afefa5e
|
用户课程动态按更新时间倒序排列
|
2015-03-09 17:32:38 +08:00 |
|
z9hang
|
6ca853edc7
|
1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能
|
2015-03-09 17:28:17 +08:00 |
 guange
|
c893a2d99b
|
迁移优化，原来需要1800秒，现只需800秒
|
2015-03-09 16:25:41 +08:00 |
|
z9hang
|
26adc13ca2
|
修改用户课程动态接口
|
2015-03-09 15:45:09 +08:00 |
|
sw
|
81b58e5c87
|
修改base_project中代码错误
|
2015-03-09 15:32:55 +08:00 |
|
z9hang
|
83cc1b41f3
|
修正api配置
|
2015-03-09 15:27:01 +08:00 |
|
z9hang
|
d634532789
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
config/locales/zh.yml
|
2015-03-09 15:26:02 +08:00 |
|
z9hang
|
d96b87cf42
|
修改用户课程动态接口返回数据
|
2015-03-09 15:23:24 +08:00 |
|
sw
|
d1912865d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-09 14:01:46 +08:00 |
 huang
|
0402fee6de
|
修改邮件邀请
|
2015-03-09 11:31:42 +08:00 |
|
huang
|
402f3701da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-09 10:31:51 +08:00 |
|
huang
|
d947ebff0c
|
添加国际化
|
2015-03-09 10:31:05 +08:00 |
|
sw
|
8c44d25750
|
处理资源标签搜索中标签丢失的问题
|
2015-03-09 10:27:32 +08:00 |
|
sw
|
659a87ef60
|
修复部分本地化标签丢失
|
2015-03-09 09:11:57 +08:00 |
 lizanle
|
bd9a645c2c
|
project动态分页页码数显示个数减少
|
2015-03-08 17:36:45 +08:00 |
|
lizanle
|
53d144e8d2
|
project动态当前页在最后。
|
2015-03-08 17:33:55 +08:00 |
|
sw
|
31d22ed8fa
|
Merge branch 'szzh' into develop
|
2015-03-07 17:25:24 +08:00 |
|
sw
|
7c03b03fa9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 17:20:50 +08:00 |
|
sw
|
b0897638d9
|
修改进入问卷结果页面描述样式显示不正确的BUG
|
2015-03-07 17:20:33 +08:00 |
|
sw
|
3cac4336cd
|
修改课程、项目、竞赛首页搜索懒为英文
|
2015-03-07 17:15:01 +08:00 |
|
sw
|
6a7c7a732c
|
修改首页报500
|
2015-03-07 17:08:36 +08:00 |
|
sw
|
770704790d
|
还原修改
|
2015-03-07 16:40:07 +08:00 |
|
z9hang
|
610746301f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 16:20:28 +08:00 |
|
z9hang
|
5a3d324ce4
|
添加课程留言列表接口
|
2015-03-07 16:19:55 +08:00 |
|
sw
|
3af9c63ae0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 16:16:06 +08:00 |
 alan
|
838c39da69
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/projects/_invite_members_by_mail.html.erb
|
2015-03-07 16:08:54 +08:00 |
|
alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 16:07:48 +08:00 |
|
z9hang
|
0f2ded4d25
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 15:36:16 +08:00 |
|
z9hang
|
782071ab64
|
显示接口不能用问题，app版本管理部分代码
|
2015-03-07 15:36:00 +08:00 |
|
sw
|
024e1548c8
|
Merge branch 'szzh' into develop
|
2015-03-07 15:32:59 +08:00 |
|
huang
|
ba09213023
|
添加新闻模块、部分样式
|
2015-03-07 15:32:50 +08:00 |
|
sw
|
b292df42d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 15:32:16 +08:00 |
|
sw
|
c6788e2f40
|
修复首页报错
|
2015-03-07 15:30:37 +08:00 |
|
huang
|
eb6deed682
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 14:47:39 +08:00 |
|
huang
|
749e10592d
|
修改邮件页面样式
|
2015-03-07 14:47:12 +08:00 |
|
sw
|
fea7bd6ad1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 14:44:10 +08:00 |
|
sw
|
3f3bb62678
|
非项目成员添加新闻、添加讨论区按钮不可见
|
2015-03-07 14:43:54 +08:00 |
|
lizanle
|
77f81ac171
|
kaminari分页配置
|
2015-03-07 14:32:34 +08:00 |
|
lizanle
|
a701eb91a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-07 12:26:59 +08:00 |
|
lizanle
|
e8bdc13f24
|
缺陷1975，打开project 330的时候报错
|
2015-03-07 12:25:42 +08:00 |
|
sw
|
945b9ff9cf
|
修复进入我的动态，关注人没有进行权限过滤的BUG
|
2015-03-07 11:38:15 +08:00 |
|
alan
|
6cf7e156d1
|
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 11:35:57 +08:00 |
|
alan
|
5c1a6f7754
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-03-07 11:35:49 +08:00 |
|
sw
|
3e3cde0805
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 11:32:28 +08:00 |
|
alan
|
151fc561ac
|
修改邮件样式，增加相应的提示
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 11:30:25 +08:00 |
|
sw
|
ff2b4c610c
|
1、修改用户动态每页显示条目不正确
2、用户动态增加新闻、留言等权限判断的补全，以及部分权限判断不正确
|
2015-03-07 11:30:21 +08:00 |
|
huang
|
e22b389971
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 11:15:30 +08:00 |
|
huang
|
b043d07d61
|
修改发布新贴显示问题
|
2015-03-07 11:02:12 +08:00 |
|
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 10:52:20 +08:00 |