Commit Graph

13808 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
Blade Barringer
8cf4f9f414 fix: Validate challenge shortname on server 2016-05-22 20:58:03 -05:00
Blade Barringer
7d45223296 fix: Correct missing parameter
Closes #7433
2016-05-22 20:50:08 -05:00
Matteo Pagliazzi
4c8ad80911 fix avatar sharing and caching (30 minutes) 2016-05-22 16:35:57 +02:00
Matteo Pagliazzi
1e83ddaf69 s3: convert moment to date instance 2016-05-22 14:22:30 +02:00
Matteo Pagliazzi
deca281233 fix production logging 2016-05-22 13:59:37 +02:00
Matteo Pagliazzi
ab3371213e second attempt at fixing exporting avatar 2016-05-22 13:51:57 +02:00
Matteo Pagliazzi
ecfacd6c9a fix exporting avatar 2016-05-22 13:07:41 +02:00
Matteo Pagliazzi
f76e387d05 Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-05-22 13:07:21 +02:00
Sabe Jones
57754adee7 feat(maintenance): post-downtime news & awards (#7406) 2016-05-21 23:40:36 -05:00
Matteo Pagliazzi
a90e607e70 Merge branch 'master' of https://git.heroku.com/habitrpg into api-v3 2016-05-22 05:13:05 +02:00
Matteo Pagliazzi
0a396c461d empty commit 2016-05-22 05:11:38 +02:00
Sabe Jones
4d7444e46f feat(commit): push 2016-05-22 02:53:24 +00:00
Matteo Pagliazzi
942ee522a1 fix production logging 2016-05-22 03:58:40 +02:00
Keith Holliday
1a19c9d2a6 Added password confirmation when deleteing account (#7402) 2016-05-22 03:55:52 +02: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
Blade Barringer
81a30d1f20 Docs changes (#7401)
* chore: Clarify transfer-gems documentation

* chore: Clarify api status route documentation

* chore: Mark webhooks as BETA
2016-05-22 03:55:03 +02:00
Keith Holliday
c9eebf0b84 Updated shortname validation to support multiple browsers 2016-05-22 02:20:25 +01:00
Matteo Pagliazzi
7ef529988a update links for v3 2016-05-22 00:00:05 +02:00
Matteo Pagliazzi
308e70432f migration: fix items 2016-05-21 23:22:17 +02:00
Matteo Pagliazzi
ee691c252b use babel polyfill 2016-05-21 22:57:19 +02:00
Matteo Pagliazzi
4e12cd293c use bluebird 2016-05-21 22:54:27 +02:00
Matteo Pagliazzi
0c20cf30d7 v3: $w -> splitWhitespace 2016-05-21 20:27:11 +02:00
Keith Holliday
25511a8e64 Chained party promises together (#7396) 2016-05-21 19:46:38 +02:00
Matteo Pagliazzi
58485841da v3: correctly return user subset 2016-05-21 19:25:31 +02:00
Matteo Pagliazzi
559c7bed94 v3: do not saved populated user 2016-05-21 19:23:51 +02:00
Keith Holliday
d6e7eb8c75 Removed unnecessary fields when updating groups and challenges (#7395) 2016-05-21 18:45:08 +02:00
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