Blade Barringer
813aa2cf38
chore(client): Remove unused clearCompleted user.ops function
2016-06-18 12:23:40 -05:00
Blade Barringer
ea5a148add
fix(lint): Add missing semicolons
2016-06-18 12:07:30 -05:00
Blade Barringer
7c08563937
Merge branch 'velezsarain-attribute' into develop
2016-06-18 11:59:30 -05:00
Blade Barringer
7cf28f6f2a
refactor(tests): Rewrite stat autoallocation tests
2016-06-18 11:58:02 -05:00
Matteo Pagliazzi
a424892dd3
Fix auth if localStorage is missing or corrupted ( #7674 )
...
* fix(auth): correctly redirect to logout page if localstorage is corrupted
* fix(auth): do not break site if localStorage has invalid JSON
* fix(karma): use $window instead of windo
* disable failing karma tests
* fix(tests): Provide mockwindow for tests
* fix(tests): Call habitrpgShared without $window
2016-06-17 12:14:41 +02:00
Blade Barringer
b7b61e6251
Shortname ( #7655 )
...
* feat: Add alias property to task model
2016-06-16 12:28:45 -05:00
Travis
1de2c839c8
Adding ticks back into gifted gems receive message #7540 ( #7671 )
...
* Adding ticks back into gifted gems receive message #7540
* Removing raw string concatenation and fixing tests
2016-06-15 22:29:04 -05:00
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
MathWhiz
a58bf4ee2b
Turn automaticAllocation to false when resetting or rebirthing
...
closes #7627
fixes #7620
2016-06-12 08:34:41 -05: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
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
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
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
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
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
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
7108b02f4d
fix(profiles): public chairs
...
(cherry picked from commit 83366fa3a6 )
2016-06-03 08:18:12 -05:00
Blade Barringer
c9d8c3ee40
tests: Use dependency injection to re-enable randomdrop tests
2016-06-02 12:57:59 -05:00
Sabe Jones
6084ea2017
Fix mystery set award to new subscribers ( #7586 )
...
* fix(mystery): flip da sign
* test(subscription): check mystery box
2016-06-01 15:34:57 -05:00
Blade Barringer
e8b1c937e4
Merge pull request #7568 from HabitRPG/fix_contributor_levels_watch
...
fix: Remove unnecessary flags.contributor property from user
2016-05-31 21:31:12 -05:00
Matteo Pagliazzi
e07ade5a4a
cron: set lastCron at the beginning and misc fixes
2016-05-31 21:30:07 -05:00
Blade Barringer
52f0057c3d
fix: Remove unnecessary flags.contributor property from user
...
Closes #7550
2016-05-31 21:10:58 -05:00
Blade Barringer
c0d9c54c44
test: Pend erronously failing test
2016-05-31 20:58:04 -05:00
Shervin Sarain
de21487038
Fix challenge sorting
...
Closes #7543
Closes #7507
2016-05-31 20:41:38 -05: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
Sabe Jones
9b56c6f2ba
Don't persist properties of tag filters ( #7564 )
...
* fix(filters): don't persist tag props
Partial fix for #7412
* fix(test): correct expectation
2016-05-31 14:55:59 -05:00
Matteo Pagliazzi
ee836c76a4
log req.method
2016-05-31 16:37:34 +02:00
Matteo Pagliazzi
bcbf00d42c
fix api v2 tests, do not allow task.value to be updated
2016-05-31 11:32:33 +02:00
Blade Barringer
212395cef4
lint: Add missing semicolons
2016-05-30 15:16:46 -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
c08df9978f
Merge pull request #7511 from HabitRPG/paglias/better-logging
...
Improve logging
2016-05-26 22:42:14 -05:00
Blade Barringer
74087d23c9
Merge branch 'HabitRPG-paglias/fix-double-cron' into develop
2016-05-26 22:40:32 -05:00
Blade Barringer
b40d8ce09d
Merge branch 'double_cron_fix' into develop
2016-05-26 22:25:36 -05:00
Blade Barringer
91aba965b0
tests: Add tests for recoverCron
2016-05-26 22:08:31 -05:00
Sabe Jones
31d2c5d604
fix(test): import Bluebird
2016-05-27 00:59:00 +00:00
Matteo Pagliazzi
cb4676980d
fix tests for error handler middleware
2016-05-26 23:35:57 +02:00
Sabe Jones
792aafd737
fix(test): delay for task creation
2016-05-26 20:51:55 +00:00
Matteo Pagliazzi
3c338ddcd7
simplify tests and add console.log for debugging
2016-05-26 21:54:26 +02:00
Matteo Pagliazzi
8292903444
fix user anonymized tests
2016-05-25 23:33:29 +02:00
Matteo Pagliazzi
275d29e3f4
run cron when getting group
2016-05-25 23:14:34 +02:00
Matteo Pagliazzi
f9762f4f81
fix cron tests
2016-05-25 21:01:12 +02: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
Matteo Pagliazzi
f713bf53c1
fix task.challenge tests and add checks when scoring challenge tasks
2016-05-25 14:49:08 +02:00