Victor Pudeyev
a567476bb7
V3 payments 7 stripe ( #7124 )
...
* payments api: cancelSubscription
* some more tests for amazon payments
* promisifying amazon payments
* somehow payment stub is not working
* cleaning up tests
* renaming tests in api/v3/integration/payments
* improvements
* cleanup, lint
* fixes as per comments
* moment.zone() is back in.
* basic controller for stripe payments
* authWithUrl is in
* stripe cleanup
* making tests pass
* stripe bug fixes
* 400 error is right
* cleanup of sinon spy for fakeSend
* paypal payments
* lint of paypal
* require -> import
2016-04-30 16:42:10 +02:00
Victor Pudeyev
fa21577c46
V3 payments 6 ( #7104 )
...
* payments api: cancelSubscription
* some more tests for amazon payments
* promisifying amazon payments
* somehow payment stub is not working
* cleaning up tests
* renaming tests in api/v3/integration/payments
* improvements
* cleanup, lint
* fixes as per comments
* moment.zone() is back in.
2016-04-27 21:26:32 +02:00
Sabe Jones
73e4c719b2
Merge pull request #7096 from piousbox/v3-payments-5
...
V3 payments 5
2016-04-21 14:45:41 -05:00
Sabe Jones
578e28b6b6
Merge pull request #7095 from piousbox/v3-payments-4
...
V3 payments 4
2016-04-21 14:42:58 -05:00
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
Matteo Pagliazzi
2dd633a471
better organize common/index
2016-04-19 12:11:10 +02:00
Matteo Pagliazzi
ad77922cf0
Merge branch 'piousbox-shared-code-random-drop2' into api-v3
2016-04-19 12:07:31 +02:00
Matteo Pagliazzi
7aa6587f2f
Merge branch 'shared-code-random-drop' of https://github.com/piousbox/habitrpg into piousbox-shared-code-random-drop2
2016-04-19 12:07:18 +02:00
lucubro
ea9900d27f
Fix installation of test dependencies in vagrant provisioning ( #7069 )
...
* Fix #7054 installation test dependencies in vagrant provisioning
* Fix small typo in output during vagrant provisioning
2016-04-19 17:28:17 +10:00
Alys
5d040ac442
change habitrpg.com to habitica.com in new profile edit message
2016-04-19 10:39:04 +10: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
Sabe Jones
62f44771af
fix(stable): rename Bumblebees throughout code
2016-04-18 21:02:24 +00: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
Victor Pudeyev
715bb5e047
shared-code-statsComputed ( #7067 )
...
* shared-code-statsComputed
* \$w is in common/script/index.js
2016-04-16 19:24:13 +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
36740e7dc8
Merge pull request #7087 from piousbox/v3-payments-3
...
bringing v3-payments up to date with api-v3 branch
2016-04-15 12:10:42 -05:00
Victor Piousbox
ab156c0e4d
resolving conflicts
2016-04-15 16:55:37 +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
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
