 guange
|
ae08031440
|
开放跨域
|
2016-04-05 15:54:30 +08:00 |
|
guange
|
6ae4cd0767
|
merge
|
2016-03-21 16:02:30 +08:00 |
|
guange
|
24a278d7d6
|
加上atall
|
2016-03-11 18:50:37 +08:00 |
|
guange
|
a59f65a455
|
wechat
|
2016-03-01 16:13:37 +08:00 |
|
guange
|
9f49a20a69
|
停用miniprofiler
|
2016-01-20 21:55:50 +08:00 |
|
guange
|
932b0923b1
|
change wechat to guange2015
|
2016-01-15 23:49:03 +08:00 |
|
guange
|
587d347178
|
added wechat
|
2016-01-15 17:01:30 +08:00 |
 huang
|
8d0463169e
|
gemfile文件冲突问题
|
2015-12-18 17:16:25 +08:00 |
 houxiang
|
fc2eae4c62
|
add something by hx
|
2015-12-17 20:56:30 +08:00 |
|
houxiang
|
e9cfe007bb
|
modify by hx
|
2015-12-10 15:59:31 +08:00 |
|
guange
|
55bb9f68e0
|
gemfile处理
|
2015-12-06 10:48:05 +08:00 |
 lizanle
|
c28b8bab14
|
全站搜索
|
2015-11-27 13:09:20 +08:00 |
|
lizanle
|
bf1c1cf0a1
|
全站搜索
|
2015-11-27 13:07:09 +08:00 |
|
lizanle
|
4efb660214
|
全站搜索
|
2015-11-26 09:57:53 +08:00 |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
2015-10-28 15:54:27 +08:00 |
|
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-16 09:07:38 +08:00 |
|
huang
|
94d60e4150
|
修改邮件配置文件
更新gem镜像路径
|
2015-10-15 17:02:16 +08:00 |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
2015-10-15 12:04:55 +08:00 |
|
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
2015-10-10 16:09:05 +08:00 |
|
guange
|
216bc7f70f
|
动态中作业的提交状态修改
|
2015-09-06 22:59:27 +08:00 |
|
guange
|
d36da76685
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-08-15 19:47:53 +08:00 |
|
guange
|
9d8596a14c
|
新增gitlab adapter用于适配gitlab命令
|
2015-08-01 18:48:55 +08:00 |
|
guange
|
7d0a53ec86
|
merge
|
2015-07-21 20:56:33 +08:00 |
 sw
|
0718a28382
|
增加gem
|
2015-07-17 14:17:42 +08:00 |
|
guange
|
6fa67051e1
|
本项目的成员可以使用自己的用户名和密码克隆
|
2015-07-01 22:54:07 +08:00 |
|
guange
|
797ed5081d
|
同步登录
|
2015-06-30 22:12:34 +08:00 |
|
guange
|
b3abf610d9
|
add rest_client
|
2015-06-01 23:10:25 +08:00 |
 alan
|
f47d30f22a
|
项目首页缓存设置
Signed-off-by: alan <547533434@qq.com>
|
2015-05-28 15:14:38 +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 |
|
guange
|
f3a15ce313
|
加入性能分析 oneapm
|
2015-05-26 23:09:10 +08:00 |
|
alan
|
799f561d77
|
Merge branch 'szzh' into memcached_alan
Conflicts:
Gemfile
app/views/issues/index.html.erb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-20 17:42:26 +08:00 |
|
alan
|
34893db465
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-18 14:53:01 +08:00 |
|
guange
|
df8aa72055
|
测试去除spork,有条件可以用zeus
|
2015-05-14 12:44:30 +08:00 |
|
guange
|
69afe8809e
|
经测试，转到rspec各方面成熟一点。
|
2015-05-14 11:41:50 +08:00 |
|
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
2015-05-08 14:28:17 +08:00 |
|
alan
|
54078e114c
|
redis缓存服务器的搭建以及对首页的缓存设置
Signed-off-by: alan <547533434@qq.com>
|
2015-05-04 15:20:40 +08:00 |
|
alan
|
c80263a66e
|
Merge branch 'guange_dev' into memcached_alan
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
config/environments/production.rb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-04 14:58:11 +08:00 |
|
guange
|
3baba9c95e
|
清理gemfile
|
2015-04-27 11:56:10 +08:00 |
|
guange
|
336dba414e
|
缓存修改为redis存储
|
2015-04-22 13:01:33 +08:00 |
|
alanlong9278
|
945192f1d8
|
添加memcached配置
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-04-21 09:41:40 +08:00 |
|
alanlong9278
|
b704555628
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/controllers/discuss_demos_controller.rb
app/models/user.rb
app/views/bids/_bid_homework_show.html.erb
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/poll/publish_poll.js.erb
app/views/poll/republish_poll.js.erb
public/javascripts/application.js
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-04-15 12:36:19 +08:00 |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-04-15 12:30:37 +08:00 |
|
guange
|
893f6af856
|
用回rubyzip, zipruby有bug.
|
2015-04-03 11:29:37 +08:00 |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
2015-04-02 17:20:52 +08:00 |
|
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
2015-03-31 11:51:34 +08:00 |
|
guange
|
f139427f03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/controllers/zipdown_controller.rb
app/views/bids/_homework_list.html.erb
config/routes.rb
db/schema.rb
public/javascripts/attachments.js
|
2015-03-27 18:17:46 +08:00 |
|
sw
|
728f2896d8
|
windows下无法打断点
|
2015-03-27 17:43:19 +08:00 |
|
lizanle
|
0de09e3b36
|
将editor路径指向本工程lib下的editor包
|
2015-03-26 16:20:04 +08:00 |
|
guange
|
15accd7d9f
|
下载功能优化, 功能已实现
|
2015-03-25 10:41:42 +08:00 |
|
guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
2015-03-19 17:41:45 +08:00 |