Matchu d3b449a8f9 Merge branch 'globalized_search' into i18n ... Conflicts: Gemfile app/controllers/application_controller.rb app/controllers/items_controller.rb app/controllers/outfits_controller.rb app/helpers/application_helper.rb app/views/items/show.html.haml config/locales/en-MEEP.yml config/locales/en.yml public/stylesheets/compiled/screen.css		2013-01-25 11:09:07 -06:00
..
environments	i18n for outfits#new (and layouts#application), including caching	2013-01-24 18:23:18 -06:00
initializers	user:owns, user:wants queries	2013-01-25 10:35:35 -06:00
locales	Merge branch 'globalized_search' into i18n	2013-01-25 11:09:07 -06:00
.gitignore	moving toward s3 image storage	2011-05-20 19:19:14 -04:00
application.rb	enable fallbacks	2013-01-24 18:24:34 -06:00
assets.yml	i18n for pet_query.js	2013-01-24 18:23:21 -06:00
aws_s3.sample.yml	moving toward s3 image storage	2011-05-20 19:19:14 -04:00
basic_type_hashes.yml	support pea chia cape in infinite closet	2012-09-29 12:40:55 -05:00
boot.rb	rails 3	2010-05-14 18:12:31 -04:00
colors.txt	add color Dimensional	2012-09-24 18:31:27 -05:00
colors_with_unique_bodies.txt	support special colors in the infinite closet	2011-05-02 18:07:56 -04:00
compass.rb	very basic styling to match impress	2010-05-15 19:34:13 -04:00
environment.rb	rails 3	2010-05-14 18:12:31 -04:00
flex.yml	globalized search first draft	2013-01-24 18:24:35 -06:00
item_zone_sets.yml	refactoring search, removing database from set, fixing show.js to work with new swf	2010-06-22 12:42:25 -04:00
locale_meta.yml	locale metadata, including hidden locales for item loading and selection	2013-01-24 18:24:34 -06:00
newrelic.yml	new relic	2012-04-08 16:37:32 -05:00
nonstandard_colors.txt	asset spider, yaaay	2010-11-27 18:41:06 -05:00
routes.rb	simple locale dropdown in layouts#application	2013-01-24 18:24:33 -06:00
schedule.rb	fix cron job scheduler	2012-07-24 12:05:34 -04:00
species.txt	basic specs for items, including search	2010-05-15 11:38:45 -04:00
zones.yml	zones are now a static resource, like species and color. database table remains for compatibility with main PHP app	2010-06-09 23:15:51 -04:00