guange
|
ee35de5447
|
忽略redis配置文件
|
10 years ago |
 alanlong9278
|
b1a60d3118
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
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>
|
10 years ago |
|
guange
|
3baba9c95e
|
清理gemfile
|
10 years ago |
|
guange
|
336dba414e
|
缓存修改为redis存储
|
10 years ago |
|
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>
|
10 years ago |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
 sw
|
19edc8f586
|
1、忽略logo文件夹
2、忽略editor上传图片文件夹
|
10 years ago |
|
guange
|
af6db916d9
|
将files文件夹忽略
|
10 years ago |
|
guange
|
0880ca2e1d
|
--amend
|
10 years ago |
 huang
|
f898e2aa91
|
16:22
|
10 years ago |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
10 years ago |
 lizanle
|
a3aea4434b
|
忽略newrelic.yml
|
10 years ago |
 z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
10 years ago |
|
lizanle
|
b26f2029ef
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
|
10 years ago |
|
lizanle
|
e96302d219
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
10 years ago |
|
alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
lizanle
|
bb9ab0755c
|
忽略tmp文件
|
10 years ago |
|
lizanle
|
3047b523b0
|
add expire_helper and change the code way of set cache expire!
|
11 years ago |
|
lizanle
|
7d351e9794
|
change cache files sites
|
11 years ago |
|
guange
|
5eba06ddf9
|
加入api在线文档
|
11 years ago |
|
guange
|
4be329db11
|
osx忽略.DS_Store
|
11 years ago |
|
hhuai
|
b34e74bd1c
|
issue 1012, table中td撑坏的问题
|
11 years ago |
|
sw
|
ec41054008
|
将configuration.yml从版本库删除
|
11 years ago |
 nwb
|
d1b438953a
|
wiki_format更新
|
11 years ago |
 wanglinchun
|
4188c046c7
|
Merge branch 'develop'
|
11 years ago |
 yanxd
|
2b5cdf161c
|
不能删除帖子问题
|
11 years ago |
yan
|
a191b634c5
|
forum memocount error, footer margin
|
11 years ago |
xianbo
|
cd278cb795
|
erge branch 'develop'
Conflicts:
.gitignore
|
11 years ago |
|
xianbo
|
ca032b659b
|
fix
|
11 years ago |
|
xianbo
|
4de9f959ac
|
clean repository
|
11 years ago |
|
xianbo
|
1aae4291a5
|
fix gitignore
|
11 years ago |
yanxd
|
7efaa8aba3
|
gitignore idea
|
11 years ago |
|
yanxd
|
02a03f7c54
|
导航栏防止意外http参数不全的错误
|
11 years ago |
|
xianbo
|
95ed1880b5
|
fix setting about migrate path
|
12 years ago |
|
xianbo
|
0af3d4488f
|
fix
|
12 years ago |
|
yanxd
|
733524b413
|
ref gitignore
|
12 years ago |
|
yanxd
|
763f217f5e
|
.
|
12 years ago |
|
yanxd
|
759a0ad1f5
|
change gitignore
|
12 years ago |
|
xianbo
|
806fae7b19
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
Conflicts:
app/controllers/account_controller.rb
app/controllers/my_controller.rb
app/controllers/projects_controller.rb
app/controllers/users_controller.rb
app/helpers/projects_helper.rb
app/helpers/users_helper.rb
app/models/project.rb
app/models/user.rb
app/models/user_extensions.rb
app/views/account/register.html.erb
app/views/bids/_bid_show.html.erb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
app/views/files/index.html.erb
app/views/layouts/base_bids.html.erb
app/views/layouts/base_users.html.erb
app/views/my/account.html.erb
app/views/users/watch_bids.html.erb
config/locales/en.yml
config/locales/zh.yml
config/routes.rb
db/schema.rb
lib/redmine.rb
public/stylesheets/application.css
|
12 years ago |
 fanqiang
|
1781d3ba8d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/layouts/base_bids.html.erb
|
12 years ago |
 huangjingquan
|
bf1f9b8e19
|
remove .bundle from ignored file list
|
12 years ago |
|
huangjingquan
|
eb2fce200d
|
add test/* and tmp/* to ignore files list
|
12 years ago |
|
huangjingquan
|
36686d6cf3
|
modify the .gitignote file
|
12 years ago |
|
huangjingquan
|
70b211e355
|
first commit
|
12 years ago |
