Commit graph

13907 commits

Author SHA1 Message Date
Nathan Thompson
a87647995d Separate call to upgrade npm so that it occurs before any other installs 2016-06-17 00:53:08 -06: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
Blade Barringer
e7c9fc70d4 3.7.1 2016-06-05 07:42:36 -05:00
Blade Barringer
39aa0b489f refactor: Reduce duplication of stat setting 2016-06-05 07:23:54 -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
MathWhiz
a973db29f4 Show flower when using visual buffs
Fixes #7133
Closes #7604
2016-06-05 06:10:59 -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
840a90bbdf refactor: Make quest methods private instance methods 2016-06-04 22:11:54 -05:00
Blade Barringer
25cc01e7cd fix: Supply random value as seed so quest collection is random 2016-06-04 22:11:52 -05:00
Blade Barringer
b3b437e593 chore: Add quest collection migration and temporary code to catch data inconsistencies 2016-06-04 22:11:52 -05: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
c04bac44e7 feat: Use party's quest key in cron 2016-06-04 22:11:50 -05:00
Blade Barringer
3113e1a1e8 fix: Correct text color in not due tasks
Closes #7605
2016-06-04 17:59:57 -05:00
Blade Barringer
cc0d556c10 3.7.0 2016-06-04 08:36:52 -05:00
Blade Barringer
713dd16dfe chore(i18n): update locales 2016-06-04 08:17:27 -05:00
Blade Barringer
f53c2706d1 Merge branch 'Hus274-develop7019' into develop 2016-06-04 07:54:59 -05:00
Blade Barringer
95340da5e2 fix(css): Correct css where due tasks could not be editted 2016-06-04 07:52:35 -05:00
Blade Barringer
b498733ce8 Merge branch 'Maslor-develop' into develop 2016-06-04 07:45:56 -05:00
Blade Barringer
b6eec73277 chore: Compile sprites 2016-06-04 07:45:42 -05:00
Blade Barringer
7e7fe3dfd6 3.6.1 2016-06-04 07:14:41 -05:00
Maslor
c70b3b8d99 changed the current glasses to transparent ones, resolves #7601 2016-06-04 13:10:17 +01:00
Sabe Jones
7f722269bd fix(subscription): correctly award 3mo bennies (#7596) 2016-06-03 22:40:04 -05:00
Blade Barringer
96e9b83ca3 Merge pull request #7583 from crookedneighbor/fix_quest_modal_not_being_cleaned_up
fix: Cleanup quest progress for non-members when quest starts
2016-06-03 21:52:14 -05:00
Blade Barringer
434cac944c fix: Cleanup quest progress for non-members when quest starts 2016-06-03 21:51:18 -05:00
Blade Barringer
30d09c2e7f Merge branch 'slow_chat' into develop 2016-06-03 21:43:32 -05:00