Vladimir Sharshov 3cedef5f07 Merge branch 'master' into 344-fix_products_monitoring ... Conflicts: db/schema.rb		2012-03-30 20:30:06 +04:00
..
deploy	* Fix for non en_US.UTF-8 user locale deploy	2012-03-26 23:18:33 +04:00
environments	Merge pull request #342 from warpc/128-account-activation	2012-03-29 09:09:03 -07:00
initializers	Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263	2012-03-29 23:34:22 +03:00
locales	Merge branch 'master' into 344-fix_products_monitoring	2012-03-30 20:30:06 +04:00
application.rb	Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263	2012-03-03 02:28:27 +02:00
boot.rb	Add magic encodings. Refs #95	2012-01-30 22:39:34 +02:00
database.yml.sample	Fix "PGError: ERROR: new encoding (UTF8) is incompatible with the encoding of the template database (SQL_ASCII)"	2011-10-28 02:06:09 +04:00
deploy.rb	Refactor search controllers and scopes. Add search query whitespace strip. Refs #263	2012-03-28 02:58:03 +03:00
environment.rb	Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190	2012-03-21 21:55:14 +02:00
google.yml	Initial commit	2011-03-09 16:13:36 +03:00
production.pill	[Refs #196] Fix bluepill and DJ option for deploy and restarting	2012-02-28 13:41:02 +04:00
routes.rb	Merge branch 'master' into 344-fix_products_monitoring	2012-03-30 20:30:06 +04:00
schedule.rb	Change nginx log rotate period to 1 day	2012-02-24 19:27:55 +04:00
unicorn.rb	Fix errors in unicorn config	2012-03-20 23:11:59 +04:00