Commit Graph

13271 Commits

Author SHA1 Message Date
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 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
Matteo Pagliazzi 11b5c1b405 v3: several fixes to class system, move /logout outside of api 2016-04-14 20:05:30 +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
Matteo Pagliazzi 28d8c370c3 v3 adapt v2: remove references to sanitizeCreate and fix tests 2016-04-12 23:53:55 +02:00
Matteo Pagliazzi 793ce38f6b v3: review some more files, add logging for unhandled promises 2016-04-12 20:14:36 +02:00
Matteo Pagliazzi 6458796a36 v3: first review of common code and task models 2016-04-12 19:30:39 +02:00
Matteo Pagliazzi 004b032084 adapt reset to v2 and remove deleted files from gulpfile 2016-04-12 18:50:02 +02:00
Matteo Pagliazzi c64ba3e8d7 Merge pull request #7043 from TheHollidayInn/api-v3-ops-reset
Ported reset. Added unit tests. Added reset route. Added integration tests
2016-04-12 18:46:53 +02:00
Matteo Pagliazzi 7de93cdd12 apidoc: change url to testing heroku app 2016-04-12 18:43:20 +02:00
Keith Holliday 3970064fe5 Ported reset. Added unit tests. Added reset route. Added integration tests 2016-04-12 11:19:36 -05:00
Angel Piscola 59749acf50 Fixed reward sound playing after gold subtracted
(cherry picked from commit 2508b5ac18)

closes #7058
fixes #6963
2016-04-12 07:36:44 -05:00
Matteo Pagliazzi 40c9366a47 v3 adapt v2: misc fixes 2016-04-12 12:59:30 +02:00
Matteo Pagliazzi fa32dabc92 Merge pull request #7064 from piousbox/shared-code-crit
shared-code-crit
2016-04-12 09:58:46 +02:00
Victor Pudeyev 2f1329254e shared-code-tags-gold-silver (#7056) 2016-04-12 09:57:57 +02:00
Matteo Pagliazzi a29dd1a1c7 fix(build) temporarily use habitrpg-shared from habitica.com in v3 client 2016-04-12 09:46:01 +02:00
Matteo Pagliazzi 1b699ea6d3 Merge pull request #7068 from crookedneighbor/api_doc_build
feat: build api doc after prod build
2016-04-12 00:46:33 +02:00
Blade Barringer 83850d7a0c feat: build api doc after prod build 2016-04-11 17:34:44 -05:00
Victor Piousbox 2d69285080 shared-code-crit 2016-04-11 20:21:33 +00:00
Matteo Pagliazzi 26b718ba1f fix(build) require babel-polyfill in production too 2016-04-11 20:03:44 +02:00
Matteo Pagliazzi 463ba81468 fix(build) only require/import the main common file 2016-04-11 19:46:48 +02:00
Matteo Pagliazzi 27a2b9002d fix(gulp) make apidoc available in production 2016-04-11 19:05:15 +02:00
Matteo Pagliazzi 36594b668a fix(apidoc): apidoc now builds correctly 2016-04-11 18:05:54 +02:00
Matteo Pagliazzi 020b7c5464 v3 adapt v2: fix tasks creation 2016-04-11 17:54:37 +02:00
Blade Barringer ecb9e09ad8 fix: Add missing sprite class for skills icon in rewards column
closes #4276
closes #6950
2016-04-11 08:00:42 -05:00
Blade Barringer b4eb386047 chore: Change spells file name to skills 2016-04-11 08:00:10 -05:00