 alan
|
ac637d8bf0
|
Merge branch 'develop' into szzh
|
2015-06-01 10:43:43 +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 |
|
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 |
 sw
|
86e63b6081
|
Merge branch 'guange_dev' into develop
|
2015-05-29 19:36:00 +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 |
|
sw
|
0891af9e59
|
Merge branch 'szzh' into develop
|
2015-05-29 18:42:44 +08:00 |
|
guange
|
0eace6e598
|
cached导致的个人项目列表问题
|
2015-05-29 18:42:22 +08:00 |
|
sw
|
3ed76859a9
|
Merge branch 'guange_dev' into szzh
|
2015-05-29 18:41:54 +08:00 |
|
sw
|
ff41bd35c7
|
Merge branch 'develop' into szzh
|
2015-05-29 18:39:16 +08:00 |
|
sw
|
b5dc424714
|
bid超过20行才显示更多按钮
|
2015-05-29 18:35:19 +08:00 |
|
guange
|
21a143651a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-29 18:27:32 +08:00 |
|
sw
|
8dd6bb4afa
|
课程首页公开资料数显示错误
|
2015-05-29 18:11:31 +08:00 |
|
sw
|
a924ab5fac
|
Merge branch 'szzh' into develop
|
2015-05-29 17:15:11 +08:00 |
|
sw
|
27314f8b54
|
Merge branch 'memcached_alan' into szzh
|
2015-05-29 17:14:20 +08:00 |
|
guange
|
2981d354ad
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-29 16:34:33 +08:00 |
|
sw
|
8423c01882
|
Merge branch 'szzh' into develop
|
2015-05-29 16:13:21 +08:00 |
|
sw
|
a562cc7409
|
Merge branch 'dev_hjq' into szzh
|
2015-05-29 16:12:50 +08:00 |
 huang
|
7197c33be4
|
注释掉暂时未完成的功能
|
2015-05-29 16:07:57 +08:00 |
|
huang
|
697f891546
|
私有项目邮件邀请权限认证
|
2015-05-29 16:04:21 +08:00 |
|
huang
|
d6aeb5b0e7
|
Merge branch 'szzh' into dev_hjq
|
2015-05-29 14:52:24 +08:00 |
|
huang
|
ee7c1eff32
|
修改已注册用户邮件邀请异常
|
2015-05-29 14:50:27 +08:00 |
|
huang
|
d9ae9c8061
|
修改邮件通知提醒（邀请：未激活
点击链接：激活并加入项目）
|
2015-05-29 14:36:44 +08:00 |
 yutao
|
51a717c3dc
|
...
|
2015-05-29 14:36:14 +08:00 |
|
yutao
|
b9337c8121
|
...
|
2015-05-29 14:31:37 +08:00 |
 lizanle
|
13b504cf17
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-29 14:22:54 +08:00 |
|
lizanle
|
849af9b04b
|
课程评论添加上拉分页
|
2015-05-29 14:22:43 +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
|
6d46c265c1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-29 10:45:03 +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 |
|
yutao
|
75cf77dd13
|
..
|
2015-05-29 10:15:05 +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 |
|
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
|
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 |
|
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 |
|
huang
|
cae882b3d6
|
新增邮件状态表
相关关联
|
2015-05-28 14:44:04 +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 |
|
yutao
|
625023686a
|
...
|
2015-05-28 10:12:43 +08:00 |