Commit graph

10454 commits

Author SHA1 Message Date
Blade Barringer
f0e3360c35 chore(i18n): update locales 2015-08-14 17:52:37 -05:00
Blade Barringer
28dda9ae9e Fix string interpolation 2015-08-14 17:49:51 -05:00
Blade Barringer
80a6b2dcf9 Merge branch 'develop' into card_tweaks 2015-08-14 17:29:17 -05:00
Matteo Pagliazzi
a58c3d1e8b Merge pull request #5789 from HabitRPG/paglias/loading-times
Stringify into window.env only what is used on the client
2015-08-14 22:14:54 +02:00
Matteo Pagliazzi
b31966b1ee use assign in place of merge, make sure references to tavern and mods are not lost 2015-08-14 22:02:19 +02:00
Matteo Pagliazzi
2e1b046701 add TODO comments, send mods to client as they are used there 2015-08-14 21:05:04 +02:00
Matteo Pagliazzi
f896fdf16f use only client vars on index.jade 2015-08-14 20:58:57 +02:00
Matteo Pagliazzi
3cda8b0b56 remove newrelic javascript from client 2015-08-14 20:40:51 +02:00
Matteo Pagliazzi
1840c3907b fix avatar export page 2015-08-14 15:37:04 +02:00
Matteo Pagliazzi
dc4c6fa6e7 add TODO commit about logging errors catched when party invite code is invalid 2015-08-14 15:21:17 +02:00
Blade Barringer
59d4d9706a Remove quotes from card strings 2015-08-14 08:13:25 -05:00
Blade Barringer
80ba33bf7c Fix issue where card strings required quotes 2015-08-14 08:13:05 -05:00
Matteo Pagliazzi
289d288f38 fix typo 2015-08-14 15:02:46 +02:00
Matteo Pagliazzi
d3c78bb890 revert dataexport controller changes 2015-08-14 15:02:16 +02:00
Matteo Pagliazzi
e1620bad2b stringify into window.env only what we really need, save a lot of KBs 2015-08-14 14:53:17 +02:00
Blade Barringer
998e336818 Remove extraneous white space 2015-08-14 07:40:07 -05:00
Blade Barringer
6be339fc77 Fix bug where armoire notes would not display correctly 2015-08-14 06:59:23 -05:00
Blade Barringer
576688c15b Clean up content file 2015-08-14 06:41:10 -05:00
Matteo Pagliazzi
34dd4494ec in locals middleware require tavern and mods only once 2015-08-14 13:10:53 +02:00
Matteo Pagliazzi
fbeeb18923 Merge pull request #5788 from HabitRPG/paglias/loading-times
Refactor middlewares
2015-08-14 12:53:02 +02:00
Matteo Pagliazzi
ca457df36a fix typo catatories -> categories 2015-08-14 12:23:10 +02:00
Matteo Pagliazzi
491652d712 fix several typypos and a missing dep 2015-08-14 12:00:09 +02:00
Matteo Pagliazzi
47f6f2febe refactor middlewares in their own folder, move buildFiles to libs/buildFiles 2015-08-14 11:50:09 +02:00
Matteo Pagliazzi
078ea4768a upgrade jade version 2015-08-14 10:58:19 +02:00
Sabe Jones
ab91a6fba9 Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards
Greeting and Thank-You Cards
2015-08-13 22:35:25 -05:00
Blade Barringer
610ce048cb Refactor card achievements 2015-08-13 22:27:14 -05:00
Sabe Jones
534cb48dce Merge pull request #5782 from crookedneighbor/card_tweaks
Tweaks to card PR
2015-08-13 22:21:56 -05:00
Blade Barringer
c7282dc10a Remove blank space 2015-08-13 20:33:19 -05:00
Blade Barringer
4adc19caf0 Fix test 2015-08-13 19:55:13 -05:00
Blade Barringer
b1b4522b4b Fix test 2015-08-13 19:40:25 -05:00
Sabe Jones
00a212660a feat(greeting-cards): Thank-You & Greets 2015-08-13 16:58:31 -05:00
Sabe Jones
f57e3e69a1 WIP(greeting-cards): Working send + modals 2015-08-13 15:43:51 -05:00
Sabe Jones
b2100c2c54 WIP(greeting-cards): Abandon spell refactor 2015-08-13 14:31:34 -05:00
Matteo Pagliazzi
f750c53ccc remove quote from filename 2015-08-13 17:52:38 +02:00
Matteo Pagliazzi
61cd8f58af start using cloudfront for frontpage assets 2015-08-13 17:16:24 +02:00
Matteo Pagliazzi
4993d67f2f export avatars to separate folder in s3 bucket 2015-08-13 14:12:32 +02:00
Alys
619b33795a remove mention of ads from locale strings, delete ads strings that are no longer used - fixes https://github.com/HabitRPG/habitrpg/issues/5765 2015-08-13 16:46:02 +10:00
Blade Barringer
3f941c3534 chore(i18n): update locales 2015-08-12 22:37:52 -05:00
Blade Barringer
bf4d690a7c Merge pull request #5775 from HabitRPG/item_store_fix
Split out potion and armoire out of the itemStore object
2015-08-12 22:35:54 -05:00
Blade Barringer
a5efc2af2b Merge pull request #5762 from crookedneighbor/transifex_test
Transifex test
2015-08-12 22:35:38 -05:00
Blade Barringer
7c6641482a Merge pull request #5776 from crookedneighbor/qhUQxV7Q_add_number_of_user_tasks_to_analytics
Analytics improvements
2015-08-12 22:31:44 -05:00
Blade Barringer
ceec310e5f Use human readable name 2015-08-12 22:16:30 -05:00
Blade Barringer
9a27b2e8cb Add task numbers to analytics 2015-08-12 21:47:04 -05:00
Blade Barringer
39ead02d6c Remove comment 2015-08-12 19:09:11 -05:00
Blade Barringer
bcf7c9712e Split out potion and armoire out of the itemStore object
Fixes #5743
2015-08-12 18:53:49 -05:00
Sabe Jones
3c8424a83e Merge branch 'crookedneighbor/refactor_cards' into sabrecat/greeting-cards 2015-08-12 11:53:28 -05:00
Blade Barringer
c7edbfb9b2 Remove empty object in close 2015-08-12 08:42:01 -05:00
Blade Barringer
203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Alys
f4c89f9379 initialise buyThis message variable at point of declaration - fixes https://github.com/HabitRPG/habitrpg/issues/5770 2015-08-12 21:26:51 +10:00
Alys
dbbd03e6cb remove one-time binding from "You're resting in the inn" banner above Dailies column - fixes https://github.com/HabitRPG/habitrpg/issues/5693 2015-08-12 16:53:51 +10:00