 lizanle
|
3637d1906d
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
config/routes.rb
|
2015-01-28 12:38:32 +08:00 |
|
lizanle
|
87b230623b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-28 12:32:16 +08:00 |
|
lizanle
|
a3aea4434b
|
忽略newrelic.yml
|
2015-01-27 14:24:30 +08:00 |
 z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
2015-01-23 16:51:40 +08:00 |
|
lizanle
|
b26f2029ef
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
|
2015-01-23 13:49:13 +08:00 |
|
lizanle
|
e96302d219
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
2015-01-23 13:47:38 +08:00 |
 alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 11:46:55 +08:00 |
|
lizanle
|
bb9ab0755c
|
忽略tmp文件
|
2015-01-23 09:54:18 +08:00 |
|
lizanle
|
3047b523b0
|
add expire_helper and change the code way of set cache expire!
|
2015-01-09 15:28:43 +08:00 |
|
lizanle
|
7d351e9794
|
change cache files sites
|
2015-01-07 09:53:52 +08:00 |
 guange
|
5eba06ddf9
|
加入api在线文档
|
2014-12-10 15:11:10 +08:00 |
|
guange
|
4be329db11
|
osx忽略.DS_Store
|
2014-12-04 17:15:17 +08:00 |
|
hhuai
|
b34e74bd1c
|
issue 1012, table中td撑坏的问题
|
2014-08-18 17:00:52 +08:00 |
 sw
|
ec41054008
|
将configuration.yml从版本库删除
|
2014-07-24 16:26:19 +08:00 |
 nwb
|
d1b438953a
|
wiki_format更新
|
2014-06-24 16:26:29 +08:00 |
 wanglinchun
|
4188c046c7
|
Merge branch 'develop'
|
2014-05-05 10:05:10 +08:00 |
 yanxd
|
2b5cdf161c
|
不能删除帖子问题
|
2014-05-04 18:49:56 +08:00 |
yan
|
a191b634c5
|
forum memocount error, footer margin
|
2014-04-28 20:37:12 +08:00 |
xianbo
|
cd278cb795
|
erge branch 'develop'
Conflicts:
.gitignore
|
2014-04-21 20:24:27 +08:00 |
|
xianbo
|
ca032b659b
|
fix
|
2014-04-21 20:21:36 +08:00 |
|
xianbo
|
4de9f959ac
|
clean repository
|
2014-04-21 20:14:58 +08:00 |
|
xianbo
|
1aae4291a5
|
fix gitignore
|
2014-04-21 14:15:57 +08:00 |
yanxd
|
7efaa8aba3
|
gitignore idea
|
2014-04-19 09:13:08 +08:00 |
|
yanxd
|
02a03f7c54
|
导航栏防止意外http参数不全的错误
|
2014-02-17 15:37:04 +08:00 |
|
xianbo
|
95ed1880b5
|
fix setting about migrate path
|
2014-01-02 09:11:38 +08:00 |
|
xianbo
|
0af3d4488f
|
fix
|
2013-12-16 19:41:07 +08:00 |
|
yanxd
|
733524b413
|
ref gitignore
|
2013-12-15 15:25:50 +08:00 |
|
yanxd
|
763f217f5e
|
.
|
2013-12-15 15:13:18 +08:00 |
|
yanxd
|
759a0ad1f5
|
change gitignore
|
2013-10-29 20:58:10 +08:00 |
|
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
|
2013-09-23 20:18:03 +08:00 |
 fanqiang
|
1781d3ba8d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/layouts/base_bids.html.erb
|
2013-08-01 20:59:29 +08:00 |
 huangjingquan
|
bf1f9b8e19
|
remove .bundle from ignored file list
|
2013-08-01 11:08:59 +08:00 |
|
huangjingquan
|
eb2fce200d
|
add test/* and tmp/* to ignore files list
|
2013-08-01 10:51:53 +08:00 |
|
huangjingquan
|
36686d6cf3
|
modify the .gitignote file
|
2013-08-01 10:47:41 +08:00 |
|
huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |