547523c8f7
Merge branch 'crookedneighbor-blade-refactor-clone-challenges' into release-june-30th-2015
2015-06-29 17:56:42 -05:00
bc837fd4db
Moved menu stuff to own controller
2015-06-29 12:39:05 -05:00
567ed1f28b
Correct seenMessage use in menu
...
Closes #5519
2015-06-29 08:58:51 -05:00
b72b14fe6c
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-28 21:07:32 -05:00
4abd7f85f8
Adjustments to PR#5494
...
* Update filter name to be more accurate
* Add additional tests
* Simplify checklist checking logic
* Prevent errors from multiple matches in checklist
2015-06-27 22:21:50 -05:00
8ba621795a
Task filter now searches checklists
2015-06-25 22:33:08 -05:00
2d78f6c838
Remove only from karma test
2015-06-24 08:15:33 -05:00
8c343c1845
*ahem* You saw nothing.
2015-06-24 03:45:25 -04:00
c8b5480157
Repair tests to respect setTimeout
2015-06-24 03:41:49 -04:00
fcd278c2f6
fix(analytics): Pass tests
...
Restores the "UUID" property so that tests no longer fail. Corrects various typos in analytics service test. Moves landing page tracking to the Jade file to avoid duplicate tracking.
2015-06-23 10:11:03 -05:00
0e4e7a032a
Added explanatory comment
2015-06-22 21:36:06 -04:00
f0ddbae775
Added quest completion modal test for when RSVPNeeded is true; modified quest invite test to use 'to.not.be.calledWith'
2015-06-22 21:33:38 -04:00
c942c10c17
Added a line break
2015-06-22 21:21:38 -04:00
b249e103de
Removed duplicated test
2015-06-22 21:04:28 -04:00
f75bbb6e5f
Modified 'RSVPNeeded is not true' test to not set user.party.quest.completed because it is not needed for the test
2015-06-22 20:55:50 -04:00
8026e99219
Added quest completion modal watch tests
2015-06-22 20:48:11 -04:00
c5292e7ff8
Changed 'invite modal does not open' tests to focus on completion modal opening, but being the only modal to open. Also modified the named of two tests to be more intuitive and accurate
2015-06-22 20:33:49 -04:00
78689e6e7c
Made analytics mock, adjusted sandbox
2015-06-22 12:52:24 -05:00
8579bb86df
Merge branch 'develop' into sabrecat/analytics-service
2015-06-22 12:37:17 -05:00
10c709a9f2
Merge branch 'develop' into TheHollidayInn-challenges-clone
2015-06-21 20:05:20 -05:00
b4c4b891a1
Moved sandbox.js to mocks directory
2015-06-21 20:02:48 -05:00
38e24571da
Merge branch 'develop' into TheHollidayInn-challenges-clone
...
Take specHelper off of global scope
2015-06-21 18:59:11 -05:00
7ee1899807
Refactore analytics service and tests
2015-06-21 16:39:32 -05:00
11fcb54c03
Corrected watch check
...
https://github.com/hairlessbear/habitrpg/commit/4fc04fea24889d3550cfb01f508466ff56c5ad40#commitcomment-11784493
2015-06-21 10:44:59 -05:00
4fc04fea24
Adjustments to PR #5298
...
* Put watch on $scope
* Check for quest.completed !== true or false
* Add test for quest invite modal watch
2015-06-20 21:10:18 -05:00
19f8ca7980
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-20 17:36:32 -05:00
d96b362531
Add additional tests for updateUser
2015-06-20 16:37:30 -05:00
9008a31c4a
Add user to analytics service, rewrite updateUser to match test
2015-06-20 16:04:34 -05:00
71fad8ca97
Provide user for anaylitcs service test
2015-06-20 15:50:06 -05:00
ab53391fee
Convert analytics service to use sinon.sandbox
2015-06-20 15:00:30 -05:00
c7615e1cbd
Merge branch 'develop' into gisikw-sabrecat/analytics-service
2015-06-20 14:52:28 -05:00
944cef4d44
Switch over to using sinon.sandbox in karma specs
2015-06-20 14:48:38 -05:00
266122567d
Repaired specs (stubbing issues)
2015-06-20 14:25:34 -04:00
86f18e9a5a
Refactor clone challenges PR
2015-06-19 20:49:24 -05:00
86d711bb5e
WIP(analytics): Remove Mixpanel
2015-06-18 20:33:54 -05:00
3c5ae80e0b
WIP(analytics): Move client tracking to service
2015-06-18 15:43:57 -05:00
e9269d332c
Removed dateCreated from being cloned in tasks
2015-06-17 21:08:33 -05:00
b81024bdd6
Fixed task clone functionality and updated code organization/semantics
2015-06-17 21:08:33 -05:00
c3307dd684
Added clone challenge test
2015-06-17 21:08:33 -05:00
4da3018ad9
Simplify editTask
2015-06-17 07:51:07 -05:00
e422ea065f
Reword tests
2015-06-16 23:16:11 -05:00
3ab27f32d2
Refactored editTask into TaskService
2015-06-16 23:11:04 -05:00
14fe29dd4a
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-14 16:33:38 -05:00
3457068351
Cleaned up location of test files
2015-06-13 21:11:43 -05:00
6513527d8b
Refactor challenges filter
2015-06-13 19:41:41 -05:00
ddb28c0305
Merge branch 'develop' into TheHollidayInn-challenges-owner-filter
2015-06-13 18:23:51 -05:00
8faf96f5b9
Refactored filters
2015-06-13 12:39:11 -05:00
719907189f
Organized spec folder
2015-06-13 09:58:08 -05:00
2f1111522c
Adjust PR #5389
...
* Convert $watch to ng-change and re-wrote test
* Removed unnecessary styles
* Use .form-control instead of class='form-control'
2015-06-12 09:05:06 -05:00
2c52829256
Implement filter tasks by text & notes
...
In order to be able to filter tasks by it's text or notes - we need an
extra filter to be implemented, because angular does not support OR
condition for it's default filter directive.
2015-06-11 20:39:29 +02:00
Blade Barringer