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
