guange
|
adb21cc617
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-06-01 13:50:23 +08:00 |
guange
|
7bbd85f8c2
|
去除首页贴吧回复缓存
|
2015-06-01 13:50:06 +08:00 |
alan
|
70330f0f4b
|
Merge branch 'develop' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
app/views/layouts/_user_project_list.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2015-06-01 10:42:18 +08:00 |
alan
|
3967b632b5
|
去除导航的缓存
Signed-off-by: alan <547533434@qq.com>
|
2015-06-01 10:41:23 +08:00 |
guange
|
97fe43c8a1
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-29 19:34:11 +08:00 |
guange
|
f4c1cc839c
|
资源库标签显示错误
|
2015-05-29 19:33:33 +08:00 |
guange
|
0eace6e598
|
cached导致的个人项目列表问题
|
2015-05-29 18:42:22 +08:00 |
sw
|
b5dc424714
|
bid超过20行才显示更多按钮
|
2015-05-29 18:35:19 +08:00 |
sw
|
8dd6bb4afa
|
课程首页公开资料数显示错误
|
2015-05-29 18:11:31 +08:00 |
sw
|
27314f8b54
|
Merge branch 'memcached_alan' into szzh
|
2015-05-29 17:14:20 +08:00 |
sw
|
a562cc7409
|
Merge branch 'dev_hjq' into szzh
|
2015-05-29 16:12:50 +08:00 |
huang
|
d6aeb5b0e7
|
Merge branch 'szzh' into dev_hjq
|
2015-05-29 14:52:24 +08:00 |
yutao
|
51a717c3dc
|
...
|
2015-05-29 14:36:14 +08:00 |
yutao
|
b9337c8121
|
...
|
2015-05-29 14:31:37 +08:00 |
alan
|
a76b345495
|
课程首页优化
Signed-off-by: alan <547533434@qq.com>
|
2015-05-29 11:40:12 +08:00 |
yutao
|
b1331569f9
|
...
|
2015-05-29 10:50:55 +08:00 |
alan
|
6835fb29cd
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-29 10:34:04 +08:00 |
yutao
|
75cf77dd13
|
..
|
2015-05-29 10:15:05 +08:00 |
yutao
|
56a8e48a2b
|
...
|
2015-05-28 17:14:52 +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
|
709c026910
|
...
|
2015-05-28 15:48:52 +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 |
yutao
|
625023686a
|
...
|
2015-05-28 10:12:43 +08:00 |
yutao
|
586c3709db
|
...
|
2015-05-28 09:18:02 +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 |
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 |
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 |
yutao
|
e97503647d
|
...
|
2015-05-27 17:26:11 +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
|
8e74712b86
|
Merge branch 'szzh' into dev_hjq
|
2015-05-27 16:10:44 +08:00 |
huang
|
df5c040aab
|
添加项目issue复制功能
|
2015-05-27 16:00:11 +08:00 |
yutao
|
cd38e9aa70
|
...
|
2015-05-27 15:50:31 +08:00 |
huang
|
04c54d4f6e
|
项目新闻显示页面时间和附件换位
|
2015-05-27 14:50:09 +08:00 |
huang
|
95f3d89afa
|
项目新闻添加编辑器:显示页面、列表页面新样式显示
|
2015-05-27 14:45:36 +08:00 |
yutao
|
94c7c68b7f
|
...
|
2015-05-27 14:42:36 +08:00 |
sw
|
93c4a54598
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-27 11:27:33 +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 |
guange
|
1919292c58
|
还是issues count计算问题
|
2015-05-27 09:23:48 +08:00 |
yutao
|
dc557f7826
|
...
|
2015-05-27 09:04:39 +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 |
alan
|
0b6f35055d
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-26 17:44:39 +08:00 |