Commit graph

244 commits

Author SHA1 Message Date
a66311140f Merge branch 'rails_3_2_12' 2013-03-05 21:10:01 -06:00
5e55423dca now that we're on rails 3.2, mount resque at /resque - just for
meeeeee :)

`User#admin?` is now defined as `name == 'matchu'`. I feel kinda
bad about hardcoding that, but I also don't care enough right
now :P
2013-03-05 21:09:08 -06:00
cf5191d33c phew. rails 3.2.12, including some asset pipeline. still buggy. 2013-03-05 20:08:57 -06:00
3cd06c9f64 resque will reconnect to database after each job to avoid Gone Away errors 2013-03-05 15:14:29 -06:00
250f425509 rails 3.1 upgrade - still buggy 2013-03-05 15:10:25 -06:00
f547a75c40 ruby 2.0.0 compatibility... hopefully. 2013-02-25 01:14:45 -05:00
4921ed964a es 2013 02 19: default human names for color/species, fix item pronoun in contributions 2013-02-19 11:16:41 -06:00
4090bb3c86 pt 2013 02 19: default human names for color/species 2013-02-19 11:09:27 -06:00
b3f048b922 es goes public! 2013-02-16 21:39:04 -06:00
475a4a6709 pt 2013 02 16 2013-02-16 21:37:14 -06:00
01eb34132a es 2013 02 16 2013-02-16 21:36:22 -06:00
1c0b5c743e better handle new colors and species 2013-02-15 23:57:06 -06:00
989363f743 better i18n for contributed description 2013-02-12 11:45:54 -06:00
423e105ec1 es first draft 2013-02-11 23:25:22 -06:00
21095edc98 pt 2013 02 09 2013-02-09 18:56:31 -06:00
5e37063674 Merge branch 'i18n' 2013-02-04 19:12:01 -06:00
bc02ae8386 pt is ready for primetime ^_^ 2013-02-04 19:11:54 -06:00
dad57ebea2 small pt yaml syntax update 2013-02-04 19:09:05 -06:00
7f2ce2839b appearance dropdown - wow, that was easy 2013-01-31 19:46:34 -06:00
5985e234da pet states know their localized description 2013-01-31 19:11:15 -06:00
9efd2fe83a have new relic trace flex methods 2013-01-31 18:39:51 -06:00
36b216a6e8 update pt 2013-01-30 21:00:52 -06:00
9a9eea86ec fully disable closet hangers in production 2013-01-30 20:21:27 -06:00
9c6797699e enable hangers in development, disable in production 2013-01-29 23:06:37 -06:00
71d9dc44cd substring-ish item name indexing using ngrams+keyword 2013-01-29 23:00:45 -06:00
9fc643152e production elasticsearch search config 2013-01-28 18:29:28 -06:00
a9cdabda49 apparently this fixes resque for spawning child processes. okay. 2013-01-28 03:55:36 -06:00
6c3ff09f5d make en-MEEP translatable - because sorting by translations doesnt work well with fallbacks 2013-01-27 20:43:08 -06:00
58bb3aa8f6 pt update - thanks again lucca! 2013-01-27 19:58:29 -06:00
8d72bf6353 temporarily disable user-filters in item search 2013-01-27 01:45:18 -06:00
1ef39f854c localize outfits#_outfit 2013-01-26 12:42:38 -06:00
52fee4f0c9 localize outfits#edit wear/unwear/closet/uncloset 2013-01-26 11:58:16 -06:00
8c348d4535 localize outfits#edit search helpers 2013-01-26 11:11:42 -06:00
964a64e0c8 fix translation error 2013-01-26 09:53:30 -06:00
c1c7162451 pt style: remove spaces before question marks 2013-01-25 15:25:54 -06:00
a477bdc447 first draft of portuguese :) 2013-01-25 15:14:55 -06:00
85d52c23c3 more helpful ownership-not-found error message 2013-01-25 11:16:47 -06:00
c5fbf74a7d update query examples: zone -> occupies, add restricts 2013-01-25 11:14:31 -06:00
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
7f18fe12c1 user:owns, user:wants queries 2013-01-25 10:35:35 -06:00
6e09b8bc10 globalized search first draft
Confirmed features:
    * Output (retrieval, sorting, etc.)
    * Name (positive and negative, but new behavior)
    * Flags (positive and negative)

Planned features:
    * users:owns, user:wants

Known issues:
    * Sets are broken
        * Don't render properly
        * Shouldn't actually be done as joined sets, anyway, since
          we actually want (set1_zone1 OR set1_zone2) AND
          (set2_zone1 OR set2_zone2), which will require breaking
          it into multiple terms queries.
    * Name has regressed: ignores phrases, doesn't require *all*
      words. While we're breaking sets into multiple queries,
      maybe we'll do something similar for name. In fact, we
      really kinda have to if we're gonna keep sorting by name,
      since "straw hat" returns all hats. Eww.
2013-01-24 18:24:35 -06:00
c9ae7155b1 locale metadata, including hidden locales for item loading and selection 2013-01-24 18:24:34 -06:00
29ed401238 load pet by locale, prepare needed translations 2013-01-24 18:24:34 -06:00
93cdb40dc5 enable fallbacks 2013-01-24 18:24:34 -06:00
0f49d3ed02 simple locale dropdown in layouts#application 2013-01-24 18:24:33 -06:00
d96c54f3cc infer locale from params, then cookies, then Accept-Language header 2013-01-24 18:23:21 -06:00
3b1ffe71a9 i18n for will_paginate, including dynamically in outfits#edit 2013-01-24 18:23:21 -06:00
34e99bba72 i18n for outfits/new.js 2013-01-24 18:23:21 -06:00
8b15d31639 i18n for pet_query.js 2013-01-24 18:23:21 -06:00
3b3c57f31a fix dumb transpositional errors in closet_hangers.create.success.owned.unlisted 2013-01-24 18:23:21 -06:00