 alan
|
4332cfd416
|
Merge branch 'develop' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
2015-06-01 10:38:53 +08:00 |
|
alan
|
a76b345495
|
课程首页优化
Signed-off-by: alan <547533434@qq.com>
|
2015-05-29 11:40:12 +08:00 |
|
alan
|
2545a5a7e0
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
2015-05-29 10:34:20 +08:00 |
|
alan
|
6835fb29cd
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-29 10:34:04 +08:00 |
 lizanle
|
1e4afc24b9
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-28 17:52:10 +08:00 |
|
lizanle
|
ad99cb8535
|
与我相关 查看相关的详细内容
|
2015-05-28 17:51:50 +08:00 |
|
alan
|
98f38b0a5b
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
2015-05-28 16:34:56 +08:00 |
 yutao
|
4494e5cd64
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-28 16:19:18 +08:00 |
|
yutao
|
065c196edc
|
...
|
2015-05-28 16:18:48 +08:00 |
 huang
|
e2ec7d5f3e
|
QQ在线支持功能
|
2015-05-28 15:45:36 +08:00 |
|
alan
|
1c760e8117
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
2015-05-28 15:14:57 +08:00 |
|
alan
|
f47d30f22a
|
项目首页缓存设置
Signed-off-by: alan <547533434@qq.com>
|
2015-05-28 15:14:38 +08:00 |
 sw
|
6c67b829c5
|
Merge branch 'guange_dev' into develop
|
2015-05-28 14:15:37 +08:00 |
 guange
|
6f15738817
|
换一个autologin,解决老数据问题
|
2015-05-28 12:23:56 +08:00 |
|
sw
|
bf1574db59
|
Merge branch 'szzh' into develop
|
2015-05-28 10:31:48 +08:00 |
|
sw
|
a58a548095
|
Merge branch 'guange_dev' into szzh
|
2015-05-28 10:31:06 +08:00 |
|
guange
|
5279c2d3e5
|
删除所有的域的autologin
|
2015-05-28 09:51:32 +08:00 |
|
sw
|
356dd21c52
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-28 08:47:28 +08:00 |
|
sw
|
bcb1b8dc39
|
Merge branch 'guange_dev' into szzh
|
2015-05-28 08:47:14 +08:00 |
|
sw
|
ec42497417
|
Merge branch 'guange_dev' into develop
|
2015-05-28 08:45:31 +08:00 |
|
guange
|
aaf7d645ba
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
2015-05-27 19:39:31 +08:00 |
|
guange
|
1fe49c8cb1
|
添加删除作业功能
|
2015-05-27 19:39:06 +08:00 |
|
guange
|
47e3e93a2f
|
cookies 删除也需要domain
|
2015-05-27 19:37:46 +08:00 |
|
alan
|
32a6c29c7c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
Gemfile
app/views/layouts/base_projects.html.erb
app/views/projects/_development_group.html.erb
app/views/projects/_research_team.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-27 17:42:25 +08:00 |
|
alan
|
d2720d8fb8
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-27 17:40:46 +08:00 |
|
alan
|
59c77e870c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
db/schema.rb
public/javascripts/course.js
Signed-off-by: alan <547533434@qq.com>
|
2015-05-27 17:01:52 +08:00 |
|
huang
|
df5c040aab
|
添加项目issue复制功能
|
2015-05-27 16:00:11 +08:00 |
|
huang
|
04c54d4f6e
|
项目新闻显示页面时间和附件换位
|
2015-05-27 14:50:09 +08:00 |
|
huang
|
95f3d89afa
|
项目新闻添加编辑器：显示页面、列表页面新样式显示
|
2015-05-27 14:45:36 +08:00 |
|
huang
|
e0ea57b213
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-27 13:39:24 +08:00 |
|
sw
|
93c4a54598
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-27 11:27:33 +08:00 |
|
sw
|
05674f991f
|
Merge branch 'guange_dev' into szzh
|
2015-05-27 11:27:18 +08:00 |
|
huang
|
6bf76fdba1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-27 11:15:47 +08:00 |
|
huang
|
1e8ef39369
|
Merge branch 'guange_dev' into szzh
|
2015-05-27 11:15:30 +08:00 |
|
huang
|
f770702d0b
|
issue编辑时候去掉铅笔图标
|
2015-05-27 11:08:05 +08:00 |
|
huang
|
5af284e8a4
|
项目资源统计代码优化
|
2015-05-27 10:43:03 +08:00 |
|
sw
|
eab44ddaeb
|
Merge branch 'guange_dev' into develop
|
2015-05-27 09:30:05 +08:00 |
|
guange
|
1919292c58
|
还是issues count计算问题
|
2015-05-27 09:23:48 +08:00 |
|
lizanle
|
144b68df19
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-27 08:56:56 +08:00 |
|
sw
|
44d452cdb5
|
Merge branch 'guange_dev' into develop
|
2015-05-27 08:56:56 +08:00 |
|
lizanle
|
10e24bebd5
|
动态首页改变
|
2015-05-27 08:56:34 +08:00 |
|
huang
|
6bb649e831
|
issue引用在项目动态的显示格式调整
|
2015-05-27 08:36:32 +08:00 |
|
guange
|
1975df63d4
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-26 23:11:34 +08:00 |
|
guange
|
3fa5179026
|
issue数统计拖慢性能
|
2015-05-26 23:11:10 +08:00 |
|
guange
|
9ce1916fbb
|
autologin token cookies domain修改
|
2015-05-26 23:10:08 +08:00 |
|
guange
|
f3a15ce313
|
加入性能分析 oneapm
|
2015-05-26 23:09:10 +08:00 |
|
alan
|
0b6f35055d
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-26 17:44:39 +08:00 |
|
huang
|
a7aa83be8c
|
module配置未选时候，禁止其它方式的访问
去掉无用文件代码
|
2015-05-26 16:50:10 +08:00 |
|
huang
|
b89ff45fc2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-26 16:30:28 +08:00 |
|
huang
|
a6da2b4a01
|
项目添加新的编辑器
显示页面显示样式调整
|
2015-05-26 16:30:06 +08:00 |