Commit Graph

13232 Commits

Author SHA1 Message Date
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
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
Matteo Pagliazzi
2f4f62f342 return filters only for api v2 2016-04-10 19:51:05 +02:00
Matteo Pagliazzi
01a2afc12f v3 adapt v2: fix updating and deleting tags 2016-04-10 19:26:32 +02:00
Matteo Pagliazzi
ad3c8f0ad2 fix(lint): missing semicolon 2016-04-10 19:18:46 +02:00
Matteo Pagliazzi
8ea05c3c46 v3 adapt v2: fix a few bugs with batchUpdate and tasks 2016-04-10 19:09:53 +02:00
Matteo Pagliazzi
c6879aa5df fix(v3): cleanup of shared code 2016-04-10 18:42:59 +02:00
Matteo Pagliazzi
9027a9a907 Merge pull request #7052 from TheHollidayInn/api-v3-ops-addPushDevice
Ported addPushDevice. Added unit tests. Added addPushDevice route.
2016-04-10 18:07:30 +02:00
Keith Holliday
42ef779b46 Ported addPushDevice. Added unit tests. Added addPushDevice route. Added integration tests 2016-04-10 09:47:14 -05:00
Matteo Pagliazzi
7a24bceac9 Merge pull request #7051 from piousbox/shared-code-percent
shared-code-percent
2016-04-10 12:29:43 +02:00
Matteo Pagliazzi
9b7186a839 Merge pull request #7040 from piousbox/shared-code-private-messages
shared-code-private-messages
2016-04-10 12:27:00 +02:00
Victor Piousbox
3c784e869a shared-code-percent 2016-04-09 21:13:16 +00:00
Victor Piousbox
1f4a0680ea shared-code-private-messages 2016-04-09 16:56:03 +00:00
Matteo Pagliazzi
f4d2184f34 Merge pull request #7010 from HabitRPG/api-v3-adapt-v2
[API v3] Adapt v2
2016-04-09 17:42:44 +02:00
Matteo Pagliazzi
6f1dde4beb v3 adapt v2: port challenge.update 2016-04-09 17:25:41 +02:00
Matteo Pagliazzi
aa8fb81b26 v3 adapt v2: port res.respond, challenge.getMember and challenge.csv 2016-04-09 17:16:00 +02:00
Matteo Pagliazzi
6b2d1a1416 v3 adapt v2: adapt common ops 2016-04-09 16:45:43 +02:00
Blade Barringer
231cfc176a Merge branch 'develop' into api-v3 2016-04-09 09:12:53 -05:00
Matteo Pagliazzi
910ea836ba Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-09 15:31:09 +02:00
Matteo Pagliazzi
06db7e6353 v3 adapt v2: port leave, join and unlink for challenges 2016-04-09 15:29:37 +02:00
Matteo Pagliazzi
81fa689a11 Merge pull request #7042 from TheHollidayInn/api-v3-ops-reroll
Ported reroll. Added unit tests. Added reroll route. Added integration tests
2016-04-09 15:14:04 +02:00
Blade Barringer
db62d1add0 fix: correct coupon generation code 2016-04-09 08:03:32 -05:00
Blade Barringer
fd1f42af24 Merge pull request #7047 from HabitRPG/merge_in_develop
[v3] Merge in develop
2016-04-08 22:19:53 -05:00
Blade Barringer
1ab78f1c9a refactor: Port v2 flag report change to v3 2016-04-08 21:49:16 -05:00
Blade Barringer
60f99a29ed Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-04-08 21:31:53 -05:00
Blade Barringer
8a42a3a51e Merge branch 'develop' into api-v3 2016-04-08 21:31:41 -05:00
Blade Barringer
1bc1968f3a chore: Upgrade winston dependency and remove unused modules 2016-04-08 17:35:03 -05:00
Blade Barringer
3a63896e40 chore: Upgrade dependencies to v3 versions 2016-04-08 17:35:03 -05:00
Blade Barringer
3250d9d064 chore: Remove unused qs dependency 2016-04-08 17:35:03 -05:00
Blade Barringer
46681d9a1a chore: Update nodemailer to v1 2016-04-08 17:35:03 -05:00
Blade Barringer
e6b5a6820f Merge pull request #7044 from HabitRPG/flag_email_refactor
refactor: Simplify flag_report_email load
2016-04-08 17:31:13 -05:00
Blade Barringer
2bbae8c5f5 refactor: Simplify flag_report_email load 2016-04-08 17:14:14 -05:00
Sabe Jones
b7d801a603 fix(news): typo 2016-04-08 16:17:51 -05:00
Keith Holliday
1685b7285f Ported reroll. Added unit tests. Added reroll route. Added integration tests 2016-04-08 15:56:11 -05:00
Ubuntu
7118e68cf0 chore(news): Beguilement Strike Bailey 2016-04-08 19:06:09 +00:00
Matteo Pagliazzi
83fa30fd0a v3 adapt v2: port challenges closing and fix create 2016-04-08 18:45:50 +02:00
Matteo Pagliazzi
70fd869934 Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-08 12:03:50 +02:00