Commit graph

393 commits

Author SHA1 Message Date
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
062f485598 i18n for pets#load flashes 2013-01-24 18:23:21 -06:00
e833179155 refactor outfits.new for hierarchy 2013-01-24 18:23:21 -06:00
e54e4c606c oops, re-refactor closet_hangers.index.autocomplete, since markdown wraps it in a paragraph 2013-01-24 18:23:21 -06:00
82479315f0 refactor neopets_pages.new for twl 2013-01-24 18:23:21 -06:00
70ff4974a3 refactor items.show for hierarchy and twl 2013-01-24 18:23:21 -06:00
0cbdc30a15 refactor items.index for hierarchy and twl 2013-01-24 18:23:21 -06:00
4bf73b4285 refactor closet_lists.form hierarchy 2013-01-24 18:23:20 -06:00
1f1bfb3140 refactor closet_hangers.petpage.instructions to use twl 2013-01-24 18:23:20 -06:00
5935ed055d refactor tmd helper, move closet_hangers#index autocomplete to markdown 2013-01-24 18:23:20 -06:00
7f2070e78e refactor userbar contributions to use twl 2013-01-24 18:23:20 -06:00
3d8266951f i18n for outfits/edit.js item partials: no-data-yet and icons 2013-01-24 18:23:20 -06:00
629e5c68a9 i18n for outfits/edit.js userbar message and outfit save errors 2013-01-24 18:23:20 -06:00
2b1cb2fe7f i18n for outfits#edit base template - dynamic content in outfits/edit.js still needs examined 2013-01-24 18:23:20 -06:00
b346bcc6d9 i18n for outfits#index - plus the translate_with_links helper, which can be used for refactoring other stuff 2013-01-24 18:23:20 -06:00
029373addd i18n for outfits#destroy flashes 2013-01-24 18:23:20 -06:00
8c9dda37d5 i18n for closet_hangers#index search bar autocomplete 2013-01-24 18:23:20 -06:00
467fb24c42 i18n for closet_hangers#create, closet_hangers#destroy, closet_hangers#update, closet_hangers#update_quantities (flashes, largely intertwined) 2013-01-24 18:23:20 -06:00
e55d407d63 i18n for neopets_pages#create (flashes - holy snap, that was nasty) 2013-01-24 18:23:19 -06:00
0f52ba5b4e i18n for neopets_users#create flashes 2013-01-24 18:23:19 -06:00
7bc255e9c8 i18n for users#index, users#update flashes 2013-01-24 18:23:19 -06:00
3c9e37f614 i18n for broken_image_reports#create flashes 2013-01-24 18:23:19 -06:00
99e3bba72f i18n for closet icons 2013-01-24 18:23:19 -06:00
30cdbface5 i18n for closet_hangers#petpage and items#_item (NC icon) 2013-01-24 18:23:19 -06:00
b213f6d0ba i18n for closet_hangers#index, closet_lists#edit, closet_lists#new, and maybe some more closet-related things - this was a biggie 2013-01-24 18:23:19 -06:00
c32425bc14 i18n for neopets_pages#new 2013-01-24 18:23:19 -06:00
5498a739f2 i18n for pets#bulk 2013-01-24 18:23:19 -06:00
9488a27916 i18n for neopets_users#new 2013-01-24 18:23:19 -06:00
ac0490dc1d i18n for items#show (including javascripts/items/show.js) 2013-01-24 18:23:19 -06:00
b69793c008 i18n for contributions#index 2013-01-24 18:23:18 -06:00
5e89e2b947 i18n for items#index (and layouts#items) 2013-01-24 18:23:18 -06:00
34d919179a i18n for broken_image_reports#new 2013-01-24 18:23:18 -06:00
1356fdaa0c i18n for users#top_contributors 2013-01-24 18:23:18 -06:00
fea0b42a17 i18n for outfits#show 2013-01-24 18:23:18 -06:00
132a49d30b i18n for outfits#new (and layouts#application), including caching 2013-01-24 18:23:18 -06:00
0db1bb8d74 enable fallbacks 2013-01-11 15:26:07 -06:00
aafec97bbf simple locale dropdown in layouts#application 2013-01-11 11:46:14 -06:00
420c52d296 infer locale from params, then cookies, then Accept-Language header 2013-01-11 11:07:11 -06:00
f63e4ecc43 i18n for will_paginate, including dynamically in outfits#edit 2013-01-10 18:58:56 -06:00
5dddb6dbdc i18n for outfits/new.js 2013-01-10 18:24:12 -06:00
f82d3683f5 i18n for pet_query.js 2013-01-10 16:47:46 -06:00
6695faccba fix dumb transpositional errors in closet_hangers.create.success.owned.unlisted 2013-01-09 22:08:17 -06:00
9e8d39e097 i18n for pets#load flashes 2013-01-09 22:05:07 -06:00
7aa49f70be refactor outfits.new for hierarchy 2013-01-09 18:40:35 -06:00
0ae6762bf5 oops, re-refactor closet_hangers.index.autocomplete, since markdown wraps it in a paragraph 2013-01-09 18:28:20 -06:00
942fa63907 refactor neopets_pages.new for twl 2013-01-09 18:21:44 -06:00
abd327f08e refactor items.show for hierarchy and twl 2013-01-09 18:05:06 -06:00
04679bfd00 refactor items.index for hierarchy and twl 2013-01-09 17:48:01 -06:00
7dce6ca89c refactor closet_lists.form hierarchy 2013-01-09 17:38:03 -06:00
a370000b3d refactor closet_hangers.petpage.instructions to use twl 2013-01-09 17:32:56 -06:00
87920b4b94 refactor tmd helper, move closet_hangers#index autocomplete to markdown 2013-01-09 17:30:40 -06:00
b00b9ae45e refactor userbar contributions to use twl 2013-01-09 17:24:52 -06:00
59a5c60f3b i18n for outfits/edit.js item partials: no-data-yet and icons 2013-01-09 17:15:25 -06:00
c3ebfee2e4 i18n for outfits/edit.js userbar message and outfit save errors 2013-01-09 17:15:25 -06:00
addc41ddc9 i18n for outfits#edit base template - dynamic content in outfits/edit.js still needs examined 2013-01-09 17:15:25 -06:00
cd323cbf53 i18n for outfits#index - plus the translate_with_links helper, which can be used for refactoring other stuff 2013-01-09 17:15:25 -06:00
5eb7842e36 i18n for outfits#destroy flashes 2013-01-09 17:15:25 -06:00
397c556c50 i18n for closet_hangers#index search bar autocomplete 2013-01-09 17:15:25 -06:00
75031c142b i18n for closet_hangers#create, closet_hangers#destroy, closet_hangers#update, closet_hangers#update_quantities (flashes, largely intertwined) 2013-01-09 17:15:24 -06:00
c5e92ec53c i18n for neopets_pages#create (flashes - holy snap, that was nasty) 2013-01-09 17:15:24 -06:00
4c6b43028b i18n for neopets_users#create flashes 2013-01-09 17:15:24 -06:00
42320162f0 i18n for users#index, users#update flashes 2013-01-09 17:15:24 -06:00
9c7ddd55a4 i18n for broken_image_reports#create flashes 2013-01-09 17:15:24 -06:00
52225c0f3d i18n for closet icons 2013-01-09 17:15:24 -06:00
1ca59c5288 i18n for closet_hangers#petpage and items#_item (NC icon) 2013-01-09 17:15:24 -06:00
0731c7093c i18n for closet_hangers#index, closet_lists#edit, closet_lists#new, and maybe some more closet-related things - this was a biggie 2013-01-09 17:15:24 -06:00
50c9ad26e2 i18n for neopets_pages#new 2013-01-09 17:15:24 -06:00
b32a3725bb i18n for pets#bulk 2013-01-09 17:15:24 -06:00
68fdc37823 i18n for neopets_users#new 2013-01-09 17:15:24 -06:00
19a877d38e i18n for items#show (including javascripts/items/show.js) 2013-01-09 17:15:23 -06:00
dd4c650a43 i18n for contributions#index 2013-01-09 17:15:23 -06:00
70c626ae10 i18n for items#index (and layouts#items) 2013-01-09 17:15:23 -06:00
fc595c3447 i18n for broken_image_reports#new 2013-01-09 17:15:23 -06:00
a433cbf436 i18n for users#top_contributors 2013-01-09 17:15:23 -06:00
abca8eb29a i18n for outfits#show 2013-01-09 17:15:23 -06:00
744c10495d i18n for outfits#new (and layouts#application), including caching 2013-01-09 17:15:23 -06:00
9701221035 wardrobe now considers item.species_support_ids when deciding compatibility
For example, the Meerca Maid Tray is a foreground item, so the SWF is marked
as compatible with all body types, but the item itself is clearly marked as
Meercas-only. items#show reflected this properly, but the swf_assets#index
call that the wardrobe uses ignored item.species_support_ids.

So, /bodies/:body_id/swf_assets.json?item_ids[]=... was deprecated in favor
of /pet_types/:pet_type_id/items/swf_assets.json?item_ids=[]..., which is
much like the former route but, before loading assets, also loads the pet
type and items, then filters the items by compatibility, then only loads
assets for the compatible items.
2013-01-02 23:15:32 -05:00
f56b544963 brought-to-you-by on items#show lists contributors 2012-10-24 22:09:05 -05:00
ddec043209 support pea chia cape in infinite closet 2012-09-29 12:40:55 -05:00
eb0ad25c93 add color Dimensional 2012-09-24 18:31:27 -05:00
99669b8e4e cache homepage latest contribution 2012-08-09 22:59:35 -04:00
1e3938eea9 improve closet performance by caching item link 2012-08-09 19:34:56 -04:00
4a69772cd2 remove N+1 queries on current user outfits page 2012-08-09 18:32:33 -04:00
50de2ed36f add color Stealthy 2012-08-07 19:43:09 -04:00
72237f225c modeling hub 2012-08-06 21:15:31 -04:00
38a9e620c4 Merge branch 'outfit_thumbnails' 2012-07-31 11:21:28 -04:00
0633f6012a fix cron job scheduler 2012-07-24 12:05:34 -04:00
cf2546d832 basic image thumbnails 2012-07-16 16:47:28 -04:00
7c015e2d88 carrierwave for asset swfs 2012-07-16 16:45:26 -04:00
220aca9311 outfit thumbnails initial commit 2012-07-16 16:45:26 -04:00
71da64b47f create /start/:species_name/:color_name route 2012-06-05 12:44:11 -04:00
f712021594 add elderlyboy, elderlygirl colors 2012-05-07 20:10:37 -05:00
64054d412e new relic 2012-04-08 16:37:32 -05:00
7d0edbf23c closet_hangers#destroy now tied to hanger ID, not item 2012-03-23 16:25:10 -05:00
44156c5b21 can now have the same item in more than one list 2012-03-23 16:25:10 -05:00
767103fb70 remove logout bug from bulk pet page 2012-01-26 13:30:53 -06:00
bdb2dfd97a add Eventide color
sigh, really need to get the colors and species into the database soon...
2012-01-04 22:44:06 -05:00
8ac12231f4 wraith color 2011-10-25 21:10:08 -05:00
c489f2802d add water to color list 2011-08-30 16:59:12 -05:00
7358aae680 report broken images 2011-08-07 18:23:44 -04:00
4c510f91db search by username 2011-08-05 11:28:11 -04:00
2398f34071 import items from pets 2011-08-03 11:35:06 -04:00
513711bf60 import sdb as well as closet 2011-08-02 22:42:56 -04:00
374e85f9d0 drop in redirect image url for urls blocked on petpages 2011-08-02 20:01:48 -04:00
dacfc99ce7 allow your_items_path to be cached on home 2011-07-31 22:17:59 -04:00
037cb1e95a your items link on home 2011-07-31 18:45:53 -04:00
30096f6b0a items petpage export 2011-07-31 02:52:19 -04:00
358840076c closet lists, round one 2011-07-29 10:52:04 -04:00
b86ce67c02 first pass at closet lists, including form 2011-07-26 20:27:23 -04:00
c5103b6557 neomail link on closets 2011-07-20 15:16:22 -04:00
77818471c5 closet hangers page has nice remove button 2011-07-15 23:14:26 -04:00
47e3b72937 restructure backend of closet hanger quantity updates 2011-07-15 16:16:40 -04:00
fab612950a basic hanger interface from item 2011-07-14 13:56:44 -04:00
6ebacc99dd closet page saving backend 2011-07-14 13:56:20 -04:00
d5641dddbb user closet display 2011-07-14 13:56:20 -04:00
dafc922fa5 add support for the Swamp Gas color 2011-07-12 17:47:57 -04:00
ba7f6b8768 keep two caches of wardrobe, for those who have image mode and those who don't 2011-07-02 18:02:37 -04:00
c6a7bfffa1 image mode welcome page 2011-07-02 17:09:42 -04:00
a6b6bbaeca rewrite donors copy a bit 2011-07-02 13:23:38 -04:00
5ecd5f3ce4 donate page noninteractive 2011-06-28 13:24:40 -04:00
43f373fc36 use resque-retry to reschedule failed jobs 2011-06-21 11:22:45 -04:00
b57043e0d2 Merge branch 'images' 2011-05-22 16:34:31 -04:00
6c9ddac8dd totally pro wardrobe image adapter, via konami 2011-05-22 16:30:02 -04:00
49c3859a00 dynamic robots.txt to refer to sitemap.xml 2011-05-20 20:59:35 -04:00
740693018b sitemap.xml 2011-05-20 20:49:48 -04:00
b13fd7ae99 moving toward s3 image storage 2011-05-20 19:19:14 -04:00
38907bc2d6 remove deprecated hoptoad js_notifier option 2011-05-13 08:27:57 -04:00
648649f5cc support special colors in the infinite closet 2011-05-02 18:07:56 -04:00
1207e84804 nice page to view current user's outfits 2011-03-23 18:23:01 -04:00
88fbc72a46 derp. 8bit color needs to go at end of list. 2011-03-21 22:00:57 -04:00
0b35ec0163 add 8-bit color support (heh) 2011-03-21 21:53:13 -04:00
fd5663c9e8 playing with new outfit save interface 2011-02-09 18:58:02 -05:00
ef62e24044 also, disable threadsafe 2011-02-09 17:57:44 -05:00
09b9471f6c stop using fiber pool by default in production. we'll enable again when sweepers are threadsafe 2011-02-09 17:56:59 -05:00
ca95cfb722 disabling the hoptoad js notifier may have fixed the leak... maybe 2011-02-05 11:48:54 -05:00
bb1f10c60b Merge branch 'fixleak' 2011-02-05 10:33:39 -05:00
4b66a560e7 roulette system :) 2011-01-27 16:35:46 -05:00
8c8776ff63 devise implemented, but not remembering 2011-01-26 13:40:15 -05:00
ca155314fa home page caching, reset top contributors only when necessary 2010-12-11 09:37:39 -05:00
ca9e1fb0ca cache item show pages as a first try :) 2010-12-08 20:15:46 -05:00
b7fb5a952b Revert "implement head.js"
This reverts commit 12ffa33f4f.
2010-12-06 18:50:13 -05:00
12ffa33f4f implement head.js 2010-12-05 21:18:52 -05:00
c67f8c916a add parens for spider mall assets in cron. sigh. 2010-12-02 16:25:38 -05:00
165177d992 move rvm to correct ruby on cron, escape \! 2010-12-02 15:13:55 -05:00
666edc117c remove reference to script/rails in cron schedule, since it pulls up the wrong ruby version 2010-12-01 21:05:15 -05:00
ea4a4e6ee0 thread safety breaks class autoloading in rake; move mall spider cron jobs to runner 2010-12-01 19:28:16 -05:00
0b6e22b8a6 cron via whenever for mall spider 2010-11-27 18:59:35 -05:00
3d29f7784f asset spider, yaaay 2010-11-27 18:41:06 -05:00
3e1d6aefea add maractice color 2010-11-24 21:11:44 -05:00
f2c98c7697 remove old routes to not throw off will_paginate 2010-11-17 00:19:02 -05:00
60ab4db8c1 rails 3.0.3, negating arel condition is not(c) instead of c.not now 2010-11-16 17:26:06 -05:00
9fc24a2eab handle contribution for now-unused swf 2010-11-15 16:44:57 -05:00