Commit Graph

2653 Commits

Author SHA1 Message Date
Victor Piousbox cbf1a4c8d3 breaking changes promisifying amazon payments 2016-04-21 04:37:25 +00:00
Victor Piousbox 54a94db2de working on amazon payments 2016-04-21 03:52:29 +00:00
Victor Piousbox 612e3b725f little changes to lint 2016-04-21 00:25:43 +00:00
Victor Piousbox f9915c3f77 recovering last weeks work on promisifying amazon payments 2016-04-21 00:07:58 +00:00
Victor Piousbox 62b059d4d8 little changes, no console.log 2016-04-20 22:27:37 +00:00
Victor Piousbox 3cba6d934b resolving conflicts 2016-04-20 22:04:31 +00:00
Keith Holliday 9e3d8ba4ac Separated out buy functions into buyGear, buyArmoire, and buyPotion (#7065) 2016-04-19 16:50:04 +02:00
Matteo Pagliazzi f44dbbbd71 Merge branch 'develop' into api-v3 2016-04-19 12:16:22 +02:00
MathWhiz ed49a377e1 add community guidelines info to profile editing (#7086)
* add community guidelines info to profile editing

* Update profile.jade
2016-04-19 10:15:21 +10:00
MathWhiz f1788080da Add list of Featured third-party Apps (#7046)
* add list of featured third-party apps

* Add comma

* add descriptions

* add description to other

* add table

* add description to other

Conflicts:
	common/locales/en/settings.json
	website/views/options/settings.jade

* Update settings.json

* Sort extensions by name
2016-04-19 08:21:07 +10:00
Matteo Pagliazzi 277248b8b7 switch to standard response format in v3 2016-04-18 21:56:58 +02:00
Matteo Pagliazzi 318abfeefa v2: fix debug menu in production 2016-04-17 12:54:27 +02:00
Matteo Pagliazzi 2c87a0bf34 v2: fix casting 2016-04-17 12:50:48 +02:00
Matteo Pagliazzi 2eca9fce32 v3: fix linting 2016-04-17 01:24:46 +02:00
Matteo Pagliazzi b271520c53 v3: general cleanup 2016-04-17 01:17:22 +02:00
Matteo Pagliazzi c2b8cad886 v3: fix v3 proxied ops in v2, logout 2016-04-16 19:56:33 +02:00
Sabe Jones ee6092d7d2 refactor(payments): PayPal setup linting pass 2016-04-15 21:31:40 +00:00
Sabe Jones 881cf0292d chore(news): mobile and Beguilement Bailey 2016-04-15 18:46:02 +00:00
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 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 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
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 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