Commit Graph

1845 Commits

Author SHA1 Message Date
Alys 514962a9c7 improve loading tip: replace "Pirate Cove" and "tile"; fix capitals
Replaces the Pirate Cove with the Guild Leaders & Challenge Creators Guild.
Describes backgrounds as connecting instead of tiling.
Makes capitalisation of various words consistent.
2016-06-13 21:35:36 +10:00
Husman 7ee81bb5f6 Fixing mispelling
I accidentally had a mispelling in the last pull request. Fixing.
2016-06-12 07:57:44 -07:00
Husman 9b12d46741 feat: Add group by button to equipment page
Closes #7636
Closes #7651

This commit creates a new button on the equipment page that allows the user to group their equipment type (body location) instead of simply by class.
2016-06-12 09:40:25 -05:00
MathWhiz a58bf4ee2b Turn automaticAllocation to false when resetting or rebirthing
closes #7627
fixes #7620
2016-06-12 08:34:41 -05:00
Blade Barringer 485139dbe8 chore(i18n): update locales 2016-06-11 18:12:15 -05:00
Blade Barringer f763d7ec15 chore: Add loading screen tips locales 2016-06-11 17:04:18 -05:00
Blade Barringer db40c96b14 chore(i18n): update locales 2016-06-11 17:00:55 -05:00
Blade Barringer 4f2ece691d chore(i18n): update locales 2016-06-11 16:02:59 -05:00
Blade Barringer 97f527c5d5 chore: compile sprites 2016-06-11 15:59:23 -05:00
Husman 688bb9a6c7 Minor Icon Fixes #7635 2016-06-11 07:19:58 -07:00
Matteo Pagliazzi efeb2c1c8e implement tips for loading screen (#7632)
* implement tips for loading screen

* fix typo in tip 22
2016-06-10 12:25:09 +02:00
Sabe Jones e3c0d7d214 chore(news): blog announcements 2016-06-10 00:59:50 +00:00
Blade Barringer 90d4468e9e chore(i18n): update locales 2016-06-09 09:02:28 -05:00
Blade Barringer b97d7cc9f9 feat: Disable spells on client when they cannot be cast
Closes #7110
Closes #6867
2016-06-09 08:58:57 -05:00
Alys a941ee8b84 allow "Your password" to be translated in account deletion confirmation (#7624)
* allow "Your password" to be translated in account deletion confirmation

* rename string for deleting local account confirmation step
2016-06-09 07:28:41 -05:00
Alys dc87aefefc change group and challenge "not found" message to "not found or you don't have access" 2016-06-08 23:17:45 +10:00
Blade Barringer 0ccac49cd9 chore(i18n): update locales 2016-06-07 21:49:36 -05:00
Blade Barringer 17b6999c81 Merge pull request #7621 from crookedneighbor/party_page
Fetch Party when going to party page
2016-06-07 21:43:38 -05:00
Sabe Jones a0008e93c0 chore(sprites): compile 2016-06-08 02:40:00 +00:00
MrEikono 09bb3e9216 Fix frog pet images (#7619) 2016-06-07 21:35:32 -05:00
Matteo Pagliazzi f7be7205e7 Remove localstorage and add notifications (#7588)
* move remaining files frm /common/script/public to website/public

* remove localstorage

* add back noscript template and put all javascript in the footer

* fixes client side tests

* remove double quotes where possible

* simplify jade code and add tests for buildManifest

* loading page with logo and spinner

* better loading screen in landscape mode

* icon on top of text logo

* wip: user.notifications

* notifications: simpler and working code

* finish implementing notifications

* correct loading screen css and re-inline images

* add tests for user notifications

* split User model in multiple files

* remove old comment about missing .catch()

* correctly setup hooks and methods for User model. Cleanup localstorage

* include UserNotificationsService in static page js and split loading-screen css in its own file

* add cron notification and misc fixes

* remove console.log

* fix tests

* fix multiple notifications
2016-06-07 16:14:19 +02:00
Blade Barringer 006b074ac2 Merge branch 'develop' into party_page 2016-06-07 07:59:59 -05:00
Alys 0a10b2bd28 change user quest.progress.collect to quest.progress.collectedItems (#7612) 2016-06-05 20:47:45 -05:00
MathWhiz 0e5f748c9a Change attribute names and popups
Closes #2044
Closes #7606
2016-06-05 07:23:26 -05:00
Blade Barringer 1915f8665c Merge pull request #7570 from crookedneighbor/WIP_7567_dont_rely_on_quest_key_on_user
Use party's quest key in cron
2016-06-05 06:18:08 -05:00
Alys 5ee28eabb5 fix user.party.quest.progress.up mistakes in skills/spells; make an unrelated typo in apidoc comment 2016-06-05 20:03:14 +10:00
Blade Barringer 58cd634255 fix: Change quest collection to calculate items on the server only 2016-06-04 22:11:51 -05:00
Blade Barringer 713dd16dfe chore(i18n): update locales 2016-06-04 08:17:27 -05:00
Blade Barringer b6eec73277 chore: Compile sprites 2016-06-04 07:45:42 -05:00
Maslor c70b3b8d99 changed the current glasses to transparent ones, resolves #7601 2016-06-04 13:10:17 +01:00
Blade Barringer 75146417c4 Merge pull request #7590 from crookedneighbor/enable_randomdrop_tests
tests: Use dependency injection to re-enable randomdrop tests
2016-06-03 08:50:08 -05:00
Sabe Jones 21f3814368 feat(content): June Armoire and BGs (#7592) 2016-06-02 16:51:05 -05:00
Blade Barringer c9d8c3ee40 tests: Use dependency injection to re-enable randomdrop tests 2016-06-02 12:57:59 -05:00
Sabe Jones 4ea52728ee fix(links): Report a Bug Guild 2016-06-01 22:12:02 +00:00
Sabe Jones 271f4b760d chore(event): end Floral Potion availability 2016-06-01 15:08:35 +00:00
Sabe Jones fcc14520c5 Don't $watch drops (#7547)
* WIP(drops): get drops out of _tmp

* fix(notifications): no watch for drops/mystery

* fix(ops): only two response values

* fix(test): update op expectation
Also update API docs for modified route.

* fix(lint): remove trailing space

* fix(test): update integration check
2016-05-31 14:56:33 -05:00
Blade Barringer c387c6e0a5 Merge pull request #7400 from Atomk/patch-4
Update tasks.json
2016-05-30 15:23:56 -05:00
MathWhiz 7a9e50dbba Fix #7388 - Invert tag collapse when adding tasks 2016-05-30 15:09:08 -05:00
Blade Barringer bbafe3d52d fix: Prevent user from inivting self to group
fixes #7491
2016-05-29 10:09:02 -05:00
Blade Barringer 4b65deac0b chore(i18n): update locales 2016-05-26 07:52:51 -05:00
Blade Barringer 2c89102576 fix(locales): Correct mystery armor date 2016-05-26 07:41:42 -05:00
Sabe Jones 328a183738 Mystery Items May 2016 (#7501)
* feat(mystery): May 2016 subscriber set

* chore(news): Bailey
2016-05-25 21:34:49 -05:00
Sabe Jones 193c46db38 fix(achievement): broaden helpedHabit definition 2016-05-25 11:21:43 -05:00
Keith Holliday 7297a6fa76 Updated logic to not assign armoire incorrectly (#7476)
* Updated logic to not assign armoire incorrectly

* Updated test and added new test to ensure armorie is not enabled prematurely.

* Fixed linting issue

* Removed toObject from being called when called on the server
2016-05-25 14:52:17 +02:00
Blade Barringer 02d075e342 lint: Ignore === for == null check in sort task 2016-05-23 22:41:37 -05:00
Blade Barringer 8faf73084a fix: correct sort task when task is at the top
closes #7457

!0 === true, so we need to check for == null which matches undefined and
null
2016-05-23 22:33:18 -05:00
Blade Barringer b1519eed14 fix: Display beastmaster count even if member route returned no items
Because of this line:
https://github.com/HabitRPG/habitrpg/blob/f1286762a813186cb4f1093dc33a52b117ab2827/website/server/controllers/api-v3/members.js#L53

We minimize any empty objects, which causes the statCalc methods to fail
2016-05-23 21:47:42 -05:00
Matteo Pagliazzi 20f4a49c0b fix missing 4th parameter to setWith 2016-05-23 20:02:57 +02:00
Matteo Pagliazzi f1f593bcfd fix unlocking items with numbers in paths 2016-05-23 19:59:14 +02:00
Blade Barringer 763429402b chore(i18n): update locales 2016-05-23 09:51:47 -05:00