Commit Graph

14099 Commits

Author SHA1 Message Date
Sabe Jones c608ac9ecc fix(news): Erratum 2016-04-15 11:53:58 -05:00
Victor Piousbox 4a45fc1c37 working on amazon payment promisification 2016-04-15 16:46:50 +00:00
Victor Piousbox 2bb36b5e04 things are broken with nconf 2016-04-15 16:46:50 +00:00
Victor Piousbox d27bbbe994 some locales work 2016-04-15 16:46:50 +00:00
Victor Piousbox 261a5a66b1 working on promisifying amazonPayments 2016-04-15 16:46:50 +00:00
Matteo Pagliazzi 1d5d6e9146 move payments to /top-level 2016-04-15 16:45:03 +00:00
Ubuntu c850ccf463 refactor(payments): Stripe linting pass 2016-04-15 16:45:03 +00:00
Ubuntu d49115eff6 refactor(payments): IAP linting pass 2016-04-15 16:45:03 +00:00
Ubuntu a06f9954dd refactor(payments): index.js lint pass 2016-04-15 16:45:03 +00:00
Ubuntu 8870cef0e2 WIP(payments): lint Amazon Payments file 2016-04-15 16:45:03 +00:00
Blade Barringer 887aa478ec chore: merge in develop 2016-04-15 10:11:54 -05:00
Blade Barringer 227797a393 Merge pull request #7079 from crookedneighbor/eslint-config
chore: Switch to custom eslint-config
2016-04-15 09:15:39 -05:00
Blade Barringer 10936d9a4d chore: Switch to custom eslint-config 2016-04-15 09:03:59 -05:00
Blade Barringer e27bdfef6a Merge pull request #7085 from crookedneighbor/lint_for_new_config
chore(lint): lint files in preparation for eslint v2
2016-04-15 09:00:44 -05:00
Blade Barringer 33c0cdd569 chore(lint): lint files in preparation for eslint v2 2016-04-15 08:37:05 -05:00
Blade Barringer 1a64886f7d Merge branch 'develop' into api-v3 2016-04-15 08:04:46 -05:00
Sabe Jones ffb3ed0aa4 chore(news): annouce Android update 2016-04-14 23:48:45 +00:00
Sabe Jones cb08003007 Merge pull request #7080 from piousbox/v3-payments-2
V3 payments - promisifying amazon
2016-04-14 17:57:26 -05:00
Victor Piousbox 74fc45524b working on promisifying amazonPayments 2016-04-14 22:49:24 +00:00
Matteo Pagliazzi 11b5c1b405 v3: several fixes to class system, move /logout outside of api 2016-04-14 20:05:30 +02:00
Victor Piousbox 948d667a67 Merge branch 'sabrecat/v3-payments' of https://github.com/HabitRPG/habitrpg into v3-payments 2016-04-14 17:38:31 +00:00
Victor Piousbox 14d3abdd90 moved payments/ to controllers/top-level/ 2016-04-14 16:20:15 +00:00
Ubuntu 7f89f8b936 refactor(payments): Stripe linting pass 2016-04-14 16:20:15 +00:00
Ubuntu f4be29952b refactor(payments): IAP linting pass 2016-04-14 16:20:15 +00:00
Ubuntu fc46bdf184 refactor(payments): index.js lint pass 2016-04-14 16:20:15 +00:00
Ubuntu a13f25e07c WIP(payments): lint Amazon Payments file 2016-04-14 16:20:15 +00:00
Matteo Pagliazzi c9e3e0e68c move payments to /top-level 2016-04-14 18:18:57 +02:00
Ubuntu da84f631e9 refactor(payments): Stripe linting pass 2016-04-14 18:17:51 +02:00
Ubuntu 71e0792da8 refactor(payments): IAP linting pass 2016-04-14 18:17:51 +02:00
Ubuntu c5549787b4 refactor(payments): index.js lint pass 2016-04-14 18:17:51 +02:00
Ubuntu 626d8d6e73 WIP(payments): lint Amazon Payments file 2016-04-14 18:17:51 +02:00
Matteo Pagliazzi 7562a589c5 apidoc: update urls and add notice about private api 2016-04-14 16:02:28 +02:00
Matteo Pagliazzi 4c4a7ce3ce do not run cron when user is not available 2016-04-14 13:51:01 +02:00
Matteo Pagliazzi 6ba41f3099 remove console statement 2016-04-14 13:31:35 +02:00
Matteo Pagliazzi bc9f2b81e7 refactor getUserLanguage, automatically apply getUserLanguage and cron middlewares where needed 2016-04-14 13:30:58 +02:00
Matteo Pagliazzi a590a66c47 support top level controllers 2016-04-14 11:54:47 +02:00
Blade Barringer e70add1ac4 chore: lint files 2016-04-13 20:11:07 -05:00
Ubuntu 13edca4588 chore(news): add skill icon announcement 2016-04-13 21:25:31 +00:00
Matteo Pagliazzi 925881b2a0 misc fixes and enable dev endpoints for easier live testing 2016-04-13 22:55:39 +02:00
Matteo Pagliazzi 54aac99a6a v2: make tests working with new tavern id 2016-04-13 22:28:29 +02:00
Matteo Pagliazzi 57497f246f make tests working with new tavern id 2016-04-13 22:27:32 +02:00
Matteo Pagliazzi cc024533aa FIXME -> TODO to make searching easier 2016-04-13 21:55:31 +02:00
Matteo Pagliazzi 99e201fc07 v3: move tavern to valid UUID and set Leslie as the leader 2016-04-13 21:52:53 +02:00
Matteo Pagliazzi 2458f92e1b fix linting and correctly save collect quests progress 2016-04-13 20:03:26 +02:00
Sabe Jones 7bb6f968b4 feat(content): Pet Quest 2016-04 (#7071)
Also renames the Be-Wilder special pet/mount rewards to "Magical Bee" from "Bumblebee".
2016-04-13 12:15:38 -05:00
Matteo Pagliazzi 471657c013 fix tests that relied on different logger 2016-04-13 18:43:15 +02:00
Matteo Pagliazzi 8817f795b1 v3: expose public interface for logger and add tests 2016-04-13 18:18:00 +02:00
Nick Bunn 55f0398928 moved broadcast to task page. changed up key press binding 2016-04-13 01:16:50 -05:00
Husman 11de1015ea Fixes: cursor as pointer on hero-box class in level up dialog that is not clickable by the user.
Updates the style of the herobox to use the default cursor on this page instead of the pointer cursor that is defaulted by the hero-box class.
This is in relation to: https://github.com/HabitRPG/habitrpg/issues/7066
2016-04-12 16:41:00 -07:00
Matteo Pagliazzi 28d8c370c3 v3 adapt v2: remove references to sanitizeCreate and fix tests 2016-04-12 23:53:55 +02:00