Commit graph

13931 commits

Author SHA1 Message Date
Alys
a03b1fc6cb prevents damage to quest participants with false or null values - partial fix for #7653 (#7665) 2016-06-16 09:36:58 +10:00
Sabe Jones
23c854f068 3.12.0 2016-06-15 17:37:53 +00:00
Sabe Jones
28e45aea4d June Pet: Axolotl (#7663)
* feat(quests): Axolotl pet

* feat(pets): finish axolotl build
2016-06-15 12:14:25 -05:00
Alys
337cb22a9d replace inaccurate Gems tip with Grand Gala tip; fix unrelated typo 2016-06-14 19:35:37 +10:00
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
Blade Barringer
345a736c27 Merge pull request #7656 from Hus274/develop
Fixing mispelling
2016-06-12 14:06:31 -05: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
c77f165b3e 3.11.0 2016-06-11 18:26:03 -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
Blade Barringer
bd1bd5bfd3 Merge branch 'Hus274-develop' into develop 2016-06-11 15:56:13 -05:00
Shervin Sarain
539547b39e prevent sync from clearing selected tags (#7631)
* prevent sync from clearing selected tags

* improved tag selection bugfix
2016-06-11 19:57:20 +02:00
Husman
688bb9a6c7 Minor Icon Fixes #7635 2016-06-11 07:19:58 -07:00
Alys
0bf7858d53 Fix apidocs error for /api/v3/challenges/group/:groupId. Change various descriptions to imperative mood
e.g., change "Sets lastCron" to "Set lastCron"
2016-06-11 08:15:07 +10:00
Blade Barringer
441fba2ad0 Merge pull request #7639 from eshapard/patch-1
Closes #7637
2016-06-10 07:51:46 -05:00
MathWhiz
57bb4d8c10 Fix webhooks (#7622)
* fix userServices.js

* comply with eslint

* Remove conversion to string
2016-06-10 12:42:48 +02: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
eshapard
ee581a1ab2 Update tasks.js
Typo in code: url for getting a single task is  * @api {get} /api/v3/tasks/:taskId Get a task; not /api/v3/task/:taskId
2016-06-09 21:16:05 -07:00
Sabe Jones
a90d0f9233 3.10.0 2016-06-10 01:18:00 +00: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
Shervin Sarain
8490b481f6 send email when admin unflags post (#7580)
* send email when admin unflags post

* Improved email acquisition code, minor changes to sent email

* Refactor getGoupUrl into its own method

* added unit test for getGroupUrl

* improved test and getGroupUrl
2016-06-07 22:22:33 -05:00
Sabe Jones
00491670e0 3.9.0 2016-06-08 03:06:49 +00: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
Sabe Jones
eb63e481fa 3.8.1 2016-06-08 02:31:37 +00:00
Sabe Jones
9df3e88842 fix(coupons): POST apply, not GET 2016-06-08 01:52:21 +00:00
Matteo Pagliazzi
5e01b3d129 fix sticky header not working 2016-06-07 21:12:31 +02:00
Blade Barringer
5beb6106c9 fix: Go to loaded party page when inviting friends to party 2016-06-07 12:36:07 -05:00
Matteo Pagliazzi
e1b8d52a27 3.8.0 2016-06-07 16:16:06 +02: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
48957369f3 fix: Prevent group not found message when reloading party page 2016-06-07 08:52:28 -05:00
Blade Barringer
3f8ab017ce fix: Prevent tavern from syncing every time a user goes to the tavern page 2016-06-07 08:52:01 -05:00
Blade Barringer
006b074ac2 Merge branch 'develop' into party_page 2016-06-07 07:59:59 -05:00
Blade Barringer
e0aff79ee4 3.7.3 2016-06-05 22:08:17 -05:00
Blade Barringer
453540e85d fix: Display flower when not buffed
closes #7613
2016-06-05 22:06:09 -05:00
Blade Barringer
ced1e97475 3.7.2 2016-06-05 20:48:11 -05:00
Alys
0a10b2bd28 change user quest.progress.collect to quest.progress.collectedItems (#7612) 2016-06-05 20:47:45 -05:00
Blade Barringer
4341934d17 chore: Add migration file for bad quest data (#7611) 2016-06-06 10:28:51 +10:00
Blade Barringer
ac24fb31fb chore: Remove temporary code 2016-06-05 08:56:57 -05:00