Commit graph

1793 commits

Author SHA1 Message Date
Alys
fa009a19f4 adjust text strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631 and also Short Name -> Tag Name 2016-05-23 06:27:52 -04:00
Blade Barringer
c5215e80de Merge branch 'TheHollidayInn-api-v3-challenge-shortname-validation' into api-v3 2016-05-22 20:58:23 -05:00
Sabe Jones
57754adee7 feat(maintenance): post-downtime news & awards (#7406) 2016-05-21 23:40:36 -05:00
Keith Holliday
e3c79fbdfa Added tags update route. Added sort to user service (#7381)
* Added tags update route. Added sort to user service

* Change update tasks route to reorder tasks

* Fixed linting issue

* Changed params for reorder tags route

* Fixed not found tag and added test
2016-05-22 03:55:45 +02:00
Keith Holliday
c9eebf0b84 Updated shortname validation to support multiple browsers 2016-05-22 02:20:25 +01:00
Matteo Pagliazzi
b49826129a v3: implement automatic syncing if user is not up to date 2016-05-21 18:43:35 +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
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
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
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
65c739f7de v3: misc fixes for payments 2016-05-18 22:35:03 +02:00
Blade Barringer
7c96d45e86 feat: Add v3 strings to develop for translating (#7354) 2016-05-18 17:25:35 +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
Matteo Pagliazzi
d1f9e9e7ca v3: update footer with links to developer resources 2016-05-18 16:06:05 +02:00
Matteo Pagliazzi
034e464bf2 Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-05-18 15:30:46 +02:00
Matteo Pagliazzi
7ea581bb38 v3 client: fix predicatbale random 2016-05-18 15:30:23 +02:00
Matteo Pagliazzi
210ac57165 v3: misc fixes 2016-05-18 12:16:31 +02:00
Blade Barringer
4f1d738272 fix: Provide default history [] for habit in score route 2016-05-17 15:51:31 -05:00
Blade Barringer
7ac67315e6 Merge branch 'develop' into api-v3 2016-05-17 15:50:31 -05:00
Matteo Pagliazzi
a0f8b715aa v3: move TAVERN_ID to common code 2016-05-17 22:49:31 +02:00
Matteo Pagliazzi
2064db364f v3 client: more user friendly errors 2016-05-17 19:22:35 +02:00
Matteo Pagliazzi
a757df9f5b v3: fix notifications 2016-05-17 19:12:39 +02:00
Matteo Pagliazzi
d293b2d6ee v3 client: fix ability to send cards 2016-05-17 17:35:49 +02:00
Alys
1cf2c89171 adjust locales text, key names, and files for Rebirth, Reset, and Fortify / ReRoll for consistency with existing strings (#7321) 2016-05-17 15:48:58 +02:00
Sabe Jones
beb4a0d8bb feat(content): May 2016 pet quest (#7310) 2016-05-16 15:18:51 -05:00
Alys
daa0955ac1 rename buyPotion and buy-potion to buyHealthPotion and buy-health-potion; fix apidoc param error 2016-05-16 23:15:01 +10:00
Matteo Pagliazzi
ad03cc8f9a Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-05-16 12:55:14 +02:00
Matteo Pagliazzi
4d08fde068 v3: fix auto allocation 2016-05-16 12:17:26 +02:00
Matteo Pagliazzi
793ca3b172 v3: fix tasks saving and selection for rebirth reroll and reset (server-only) 2016-05-16 12:04:09 +02:00
Matteo Pagliazzi
ba1628427e v3: fix stealth casting 2016-05-16 11:38:22 +02:00
Blade Barringer
21203c3f2e feat: Add modify inventory debug menu 2016-05-15 16:07:30 -05:00
Matteo Pagliazzi
52bedc3563 v3 client: fix casting spells 2016-05-15 21:17:17 +02:00
Matteo Pagliazzi
0be5d1da9c v3: misc fixes 2016-05-15 15:10:41 +02:00
Matteo Pagliazzi
cb0939a38c v3 client: fix filtering by tag and correctly show tag tooltip 2016-05-15 12:31:27 +02:00
Sabe Jones
6ceea9346f chore(news): misc announcements 2016-05-14 20:56:22 +00:00
Blade Barringer
c534f31593 Merge pull request #7226 from Alys/api-v3-pubChalsMinPrize-rename
[API v3] rename and reword pubChalsMinPrize to reflect that it's only for the Tavern
2016-05-14 10:19:43 -05:00
Blade Barringer
e654b47537 Merge branch 'Alys-api-v3-cron-comments-etc' into api-v3 2016-05-14 09:21:55 -05:00
Blade Barringer
3e57620666 fix: Set gems sent notification as translatable string 2016-05-14 06:54:44 -05:00
Alys
2e078f4776 allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227 2016-05-14 05:58:40 -04:00
Alys
fd13c7aa60 rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges 2016-05-14 16:40:40 +10:00