 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 |
 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 |
|
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 |
|
lizanle
|
aa86be1d8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-26 11:31:21 +08:00 |
|
lizanle
|
3318d11c6d
|
个人留言
|
2015-05-26 09:48:22 +08:00 |
|
alanlong9278
|
b1a60d3118
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-26 00:01:15 +08:00 |
|
alanlong9278
|
a27b3e9dc6
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-25 23:22:11 +08:00 |
|
huang
|
fc8b5c60c6
|
切换分支处理
|
2015-05-25 15:33:52 +08:00 |
|
sw
|
6d85535a4d
|
Merge branch 'guange_dev' into szzh
|
2015-05-25 14:45:58 +08:00 |
|
lizanle
|
122de16180
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-25 11:05:43 +08:00 |
|
lizanle
|
42fab7c784
|
schema
|
2015-05-25 11:05:28 +08:00 |
|
guange
|
437d4e1009
|
zip下载必须得登录
|
2015-05-24 13:52:58 +08:00 |
|
guange
|
c9b46e4e3a
|
头像上传bug修复
|
2015-05-24 13:52:27 +08:00 |
|
lizanle
|
3fc02585c5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-23 17:13:52 +08:00 |
|
lizanle
|
6353a2e2c8
|
留言分页
|
2015-05-23 17:13:38 +08:00 |
|
sw
|
0769da1426
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-23 17:13:09 +08:00 |
|
sw
|
26ae4b7d74
|
用户头像不能上传
|
2015-05-23 17:12:50 +08:00 |
|
sw
|
14aa3e83a8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-23 16:51:46 +08:00 |
|
sw
|
822ac5ade8
|
公共贴吧引用上传图片异常
|
2015-05-23 16:50:28 +08:00 |
 yutao
|
fa26f649f2
|
...
|
2015-05-23 16:49:54 +08:00 |
|
yutao
|
fe404f8cb1
|
...
|
2015-05-23 16:35:57 +08:00 |
|
yutao
|
8781eb3238
|
...
|
2015-05-23 16:26:15 +08:00 |
|
yutao
|
6fcdae517a
|
Merge branch 'memcached_alan' of http://repository.trustie.net/xianbo/trustie2 into memcached_alan
|
2015-05-23 16:02:55 +08:00 |
|
yutao
|
72b93fa8f0
|
...
|
2015-05-23 16:02:41 +08:00 |
|
sw
|
85b7a43cb1
|
Merge branch 'szzh' into develop
|
2015-05-23 15:19:50 +08:00 |
|
sw
|
74fe58217f
|
Merge branch 'guange_dev' into szzh
|
2015-05-23 15:19:01 +08:00 |
|
sw
|
3b433cb751
|
Merge branch 'szzh' into guange_dev
|
2015-05-23 15:17:46 +08:00 |
|
sw
|
161edea879
|
修复课程讨论区无法新建帖子
|
2015-05-23 14:46:30 +08:00 |