Commit Graph

14324 Commits

Author SHA1 Message Date
Matteo Pagliazzi 60f7a1dbd9 add small timeout before asking for notification permission 2016-09-09 21:26:40 +02:00
Matteo Pagliazzi f6c765b7b5 better notifications icon 2016-09-09 21:03:47 +02:00
Matteo Pagliazzi e2b03ec9cf Merge branch 'develop' into paglias/realtime-chat-v1 2016-09-09 20:13:21 +02:00
Matteo Pagliazzi 98df0f26e7 add notifications, fix too many seen requests and misc fixes 2016-09-09 20:12:17 +02:00
Matteo Pagliazzi a748e57cd7 do not sync automatically on chat seen requests 2016-09-09 19:11:21 +02:00
Oziris Moreira 7d7bb3ecb8 Prevent Challenge page from scrolling to top (#7975)
* Test pageTitle challenge

* Test state name challenge detail

* Change != to !==

* IGNORE_SCROLL_PAGES

* add challenge to ignore_scroll
2016-09-09 08:51:08 -05:00
Kaitlin Hipkin a3f83b9076 Improvement #6912: New achievement modal service and more achievement tests (#6943)
* add tests for beastMaster, mountMaster, and triadBingo achievements

* add tests for challengeWon, streak, ultimateGear, rebirth, and contributor achievements

* add achievement service that has openModal function

* achievement test pass again

* fix indentation, rename openModal to more descriptive displayAchievement

* add unit tests for achievements service

* initialize user.preferences.suppressModals in specHelper.newUser

* update achievement tests to account for new notification service

* add new achievementServices file to manifest.json

* fix tests

* award wonChallenge achiev like other achievs

* differentiate between small and normal achiev modals

* refactor achievementService.displayAchievement() to take options param
2016-09-09 07:58:44 -05:00
Alys 31a1a14bae 3.40.0 v3.40.0 3.40.0 2016-09-09 17:14:01 +10:00
Alys f16f9684ca fix spelling mistake and remove outdated material 2016-09-09 16:36:09 +10:00
Connor McArthur 598f0a7a1b chore: Add cron semi-safe mode tests
fixes #7464
closes #7733
2016-09-08 21:46:02 -05:00
Blade Barringer 909ee94b20 Merge pull request #7750 from thompsnm/develop
Add tests for timezoneOffsetToUtc filter
2016-09-08 21:39:04 -05:00
Blade Barringer 1250d69d17 chore: Add android FAQs
fixes #7719
closes #7726
2016-09-08 21:28:04 -05:00
Blade Barringer d9b8ee840d chore: Update press kit
Implimented from #7262

fixes #7174
closes #7262
2016-09-08 21:18:02 -05:00
Blade Barringer a4557e87a9 Merge pull request #7986 from JSchneidler/slack_fix
Use npm package instead of github for @slack/client.
2016-09-08 20:33:18 -05:00
Blade Barringer f275265c2b chore: Provide additional tests for local login defaults 2016-09-08 20:32:20 -05:00
Rick Kasten 97417c626a Fixes #7933 - Change Default tags to match types, not times of day (#7954)
* Fixes #7933

Changes

Default tags changed to
- "Work"
- "Exercise"
- "Health + Wellness"
- "School"
- "Teams"
- "Chores"
- "Creativity"

Changes made only to the en and en_GB locales

UUID: 30983c37-52c3-415d-977c-38af6c7db91c

* Reverting changes to en_GB locale

* Reverting format change
2016-09-08 20:26:34 -05:00
Blade Barringer 454ccffb03 fix: save tour state
Implimentation of #6545 by @tylerxo

fixes #5854
fixes #5852

closes #6545
2016-09-08 20:23:49 -05:00
Jordan Schneidler 405798d958 Changed slack client to use npm package instead of github. 2016-09-08 17:38:27 -05:00
Matteo Pagliazzi 94e2691bae Merge branch 'develop' into paglias/realtime-chat-v1 2016-09-08 19:16:37 +02:00
Matteo Pagliazzi d1903578f9 pusher: remove more duplicate code ( sorry :( ) 2016-09-08 19:13:52 +02:00
Matteo Pagliazzi 6ba721998a Merge branch 'develop' into paglias/realtime-chat-v1 2016-09-08 19:12:05 +02:00
Blade Barringer 0c0f50f647 Merge pull request #7979 from crookedneighbor/fix_infinite_build_output
Fix infinite build error
2016-09-08 12:07:05 -05:00
Matteo Pagliazzi 459a41a5ac pusher: remove duplicate code 2016-09-08 19:05:22 +02:00
Matteo Pagliazzi 136b4ada45 renable limit on number of tabs connected 2016-09-08 19:05:03 +02:00
Matteo Pagliazzi d4dc455926 re-enable limit of 1 tab per user connected to pusher 2016-09-08 18:51:24 +02:00
Matteo Pagliazzi cac764e5d1 add online indicator for party members 2016-09-08 18:48:07 +02:00
AccioBooks ef73c61e0e API Warning message (#7978)
* Warning message

* Change warning text and style

* Update settings.json
2016-09-08 16:46:21 +10:00
Blade Barringer 0862c3b077 fix: Correct quest damange calculation
fixes #7980
2016-09-07 21:09:12 -05:00
Blade Barringer 543a9d06c1 3.39.1 v3.39.1 2016-09-07 21:00:46 -05:00
Blade Barringer aff9af7db2 Revert "Disable checkbox"
This reverts commit 82448b2a93.
2016-09-07 20:45:40 -05:00
Blade Barringer 730fe8898e Fix infnite build error fix 2016-09-07 20:17:29 -05:00
Sabe Jones 0de3efe942 3.39.0 v3.39.0 2016-09-07 20:39:51 +00:00
Sabe Jones e474dc199b chore(sprites): compile 2016-09-07 20:39:30 +00:00
Sabe Jones 4844aa5e47 chore(news): misc Bailey 2016-09-07 20:19:43 +00:00
Blade Barringer ee409174f1 Format files to adhere to editorconfig (#7977) 2016-09-07 12:58:26 -05:00
Blade Barringer da8f0373ba fix: correct api tag tests to not rely on default tags 2016-09-07 12:55:07 -05:00
Blade Barringer 67716ef309 Clean up quest progress logic 2016-09-07 12:48:06 -05:00
Thomas Gamble db19dbf49c shows quest progress in menu #7928
fixes #7928
closes #7960
2016-09-07 12:47:50 -05:00
Matteo Pagliazzi 748e9f7580 Merge branch 'develop' into paglias/realtime-chat-v1 2016-09-07 17:21:43 +02:00
Matteo Pagliazzi 7ea9debe3f trigger pusher on system messages too 2016-09-07 17:18:48 +02:00
Matteo Pagliazzi ea2be45414 add notifications for real time messages 2016-09-07 17:16:32 +02:00
Matteo Pagliazzi 41079a65c6 correctly reconnect to pusher after inactivity 2016-09-07 17:00:43 +02:00
Matteo Pagliazzi 15ceab4bf4 Merge branch 'develop' into paglias/realtime-chat-v1 2016-09-07 16:59:50 +02:00
Matteo Pagliazzi 85c4332a40 pusher: remove commented code that is unused 2016-09-07 16:51:22 +02:00
Matteo Pagliazzi dafae31366 disable limit of 1 tab per browser connected to pusher 2016-09-07 16:50:22 +02:00
Matteo Pagliazzi 40c9c05514 fix first connection to pusher 2016-09-07 16:46:32 +02:00
Matteo Pagliazzi 0baff2dfd9 remove limit of 1 connected tab per browser 2016-09-07 16:44:20 +02:00
Matteo Pagliazzi a4ecdbeb3e fully sync party on system messages 2016-09-07 16:39:53 +02:00
Matteo Pagliazzi fd00543a8d change button text for syncing party 2016-09-07 16:01:21 +02:00
AccioBooks 861eaf36d3 Create .editorconfig
fixes #4376
closes #7957
2016-09-07 08:44:57 -05:00