Matteo Pagliazzi
c44c2a35ba
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-21 18:43:59 +02:00
Matteo Pagliazzi
b49826129a
v3: implement automatic syncing if user is not up to date
2016-05-21 18:43:35 +02:00
Keith Holliday
b378e41f2c
Tavern party challenges invites fix ( #7394 )
...
* Added challenges and invitations to party
* Loaded tavern challenges
* Updated group and quest services tests
2016-05-21 17:26:34 +02:00
Matteo Pagliazzi
a210542e0a
Merge branch 'develop' into api-v3
2016-05-21 16:46:22 +02:00
Blade Barringer
ef3a2fc286
chore(i18n): update locales
2016-05-21 09:14:25 -05:00
Sabe Jones
237bc062ea
[API v3] Maintenance Mode ( #7367 )
...
* WIP(maintenance): maintenance
* WIP(maintenance): working locale features
* fix(maintenance): don't translate info page target
* WIP(maintenance): start adding info page
* fix(maintenance): linting
* feat: Add container to maintenance info page
* fix(maintenance): add config.json edits
Also DRY variables for main vs info pages
* fix(maintenance): linting
* refactor(maintenance): further slim down variables
* refactor: Remove unnecessary variables
* fix: Correct string interpolation in maintenace view
* feat: Dynamically add time to maintenance pages
* maintenance mode: do not connect to mongodb
* fix(maintenance): clean up timezones etc.
* fix(maintenance): remove unneeded sprite
2016-05-21 12:24:13 +02:00
Keith Holliday
f4ca97ffc3
Fixed quest drop modal ( #7377 )
...
* Fixed quest drop modal
* Fixed broken party test
2016-05-21 12:21:39 +02:00
Alys
d36c514c06
add plumilla to artists for Tangle Tree in Bailey message
2016-05-20 22:07:03 -04:00
Alys
5c885c77a0
add dateCreated to all tasks; add empty challenge object to tasks that don't have one ( #7386 )
2016-05-21 09:20:11 +10:00
Alys
bce5b44cb6
add plumilla to artists for the Tangle Tree quest - fixes https://github.com/HabitRPG/habitrpg/issues/7385
2016-05-21 06:52:23 +10:00
Blade Barringer
f5d65a1e4d
fix: remove unused vars
...
closes #7383
2016-05-20 14:27:22 -05:00
Sabe Jones
18822854f7
fix(static-page): remove timezone handling
2016-05-20 16:53:40 +00:00
Blade Barringer
d3ecdae25c
Merge pull request #7365 from crookedneighbor/skill_fixes
...
Skill fixes
2016-05-20 09:32:58 -05:00
Blade Barringer
5bd436f3c8
fix: Change all instances of spookDust -> spookySparkles
2016-05-20 09:17:44 -05:00
Blade Barringer
42bc4bdd3d
fix: Correct spelling of healAll skill
...
fix: Correct sprite name of healAll skill
2016-05-20 09:17:16 -05:00
Blade Barringer
f3537351bf
Merge branch 'TheHollidayInn-api-v3-user-set-last-cron-fix' into api-v3
2016-05-20 08:03:47 -05:00
Blade Barringer
1fb77c0e92
feat: complete custom day start route
...
Closes #7363
2016-05-20 08:03:14 -05:00
Keith Holliday
5e30aeb24c
Updated ui when user rejects a guild invite ( #7368 )
2016-05-20 14:17:54 +02:00
Blade Barringer
25c69afb5f
chore: Update i18n locales
2016-05-20 06:55:50 -05:00
Alys
207ed39f36
fix for maintenance window dates properly
2016-05-20 03:42:51 -04:00
Alys
6b31f2845f
replace time code with fixed time text
2016-05-20 17:33:21 +10:00
Sabe Jones
908e80d2ca
fix(announcement): upcoming features wording
2016-05-19 22:30:31 -05:00
Sabe Jones
d221bcc84c
Maintenance announcement ( #7372 )
...
* chore(news): announce downtime
* fix(news): tweaks and corrections
* fix: Update maintenance page to use dynamic date
2016-05-19 22:28:13 -05:00
Blade Barringer
283c2a0823
Merge pull request #7370 from Alys/v3-7246-unchecking-daily-mana
...
remove XP, GP when unticking a Daily with a completed checklist
2016-05-19 22:17:27 -05:00
Alys
b9d55e3562
use natural language for error message about skills on challenge tasks ( #7336 ), fix other gramatical error
2016-05-19 23:54:22 +00:00
Alys
af37b30363
remove XP, GP when unticking a Daily with a completed checklist - fixes https://github.com/HabitRPG/habitrpg/issues/7246
2016-05-19 17:08:15 -04:00
Matteo Pagliazzi
bf776e38c7
v3: correctly use v3 routes in client
2016-05-19 22:59:17 +02:00
Matteo Pagliazzi
5ba33bc5a1
v3: iap accessible under /api/v3, fixes to spells and groups invitations
2016-05-19 22:43:11 +02:00
Keith Holliday
5b7a56d28d
Changed route to user set custom day start
2016-05-19 21:14:35 +01:00
Matteo Pagliazzi
c6da283b54
v3: fix build and ios IAP
2016-05-19 21:18:43 +02:00
Matteo Pagliazzi
c8f55302ca
v3: fix iap url
2016-05-19 20:44:44 +02:00
Keith Holliday
e8b53d6b22
Added new route for setting last cron and updated front end
2016-05-18 23:24:32 +01:00
Matteo Pagliazzi
0a14d29ebb
fix(tests): never connect to NODE_DB_URI for tests
2016-05-18 23:50:24 +02:00
Matteo Pagliazzi
e98930cd4a
v3: limit fields of challenge tasks that can be updated
2016-05-18 23:27:49 +02:00
Matteo Pagliazzi
65c739f7de
v3: misc fixes for payments
2016-05-18 22:35:03 +02:00
Matteo Pagliazzi
9efe75e9b8
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-18 22:12:02 +02:00
Matteo Pagliazzi
d6f52f0604
v3: fetch whole user when booting from group tto avoid issues with pre save hook expecting all data
2016-05-18 22:11:42 +02:00
Keith Holliday
9a32a01a3e
Added force cache update when fetching new messages ( #7360 )
2016-05-18 21:49:58 +02:00
Matteo Pagliazzi
f0f67e1e88
v3: fallbackto authWithHeaders if wuthWithSession or authWithUrl fails
2016-05-18 18:29:38 +02:00
Matteo Pagliazzi
ef9dc9a15a
v3: fix tests for challenge export
2016-05-18 17:49:17 +02:00
Keith Holliday
425172daae
Removed v2 calls from views ( #7351 )
2016-05-18 17:48:32 +02:00
Matteo Pagliazzi
58b9a08539
v3 client: correctly redirect after inviting
2016-05-18 17:41:42 +02:00
Blade Barringer
18a3024aea
fix: Correct hourglass test
2016-05-18 10:33:05 -05:00
Matteo Pagliazzi
163b5b4ac3
v3: remove unused code
2016-05-18 17:28:33 +02:00
Blade Barringer
7c96d45e86
feat: Add v3 strings to develop for translating ( #7354 )
2016-05-18 17:25:35 +02:00
Matteo Pagliazzi
ae26713dd9
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-18 17:16:53 +02:00
Matteo Pagliazzi
95542cd42e
v3 client: fix sticky header
2016-05-18 17:16:40 +02:00
Alys
dad60909f7
move locales strings from api-v3.json to other locales files ( #7347 )
...
* move locales strings from api-v3.json: authentication strings -> front.json
* move locales strings from api-v3.json: authentication strings -> tasks.json
* move locales strings from api-v3.json: authentication strings -> groups.json
* move locales strings from api-v3.json: authentication strings -> challenge.json
* move locales strings from api-v3.json: authentication strings -> groups.json (again)
* move locales strings from api-v3.json: authentication strings -> quests.json
* move locales strings from api-v3.json: authentication strings -> subscriber.json
* move locales strings from api-v3.json: authentication strings -> spells.json
* move locales strings from api-v3.json: authentication strings -> character.json
* move locales strings from api-v3.json: authentication strings -> groups.json (PMs)
* move locales strings from api-v3.json: authentication strings -> npc.json
* move locales strings from api-v3.json: authentication strings -> pets.json
* move locales strings from api-v3.json: authentication strings -> miscellaneous
* move locales strings from api-v3.json: authentication strings -> contrib.json and settings.json
* move locales strings from api-v3.json: delete unused string (invalidTasksOwner), delete api-v3.json, whitespace cleanup
2016-05-18 16:56:05 +02:00
Blade Barringer
93d50e4f60
fix: Correct get tasks route to properly get todos ( #7349 )
2016-05-18 16:54:02 +02:00
Matteo Pagliazzi
73dd9f5920
v3 client: fix chat flagging
2016-05-18 16:50:50 +02:00
