Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,716 Commits 64 Branches 1,256 Tags
f75bbb6e5f59da87fef30433a57db9b9b0d1582a
Commit Graph

9716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hairlessbear 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
hairlessbear 8026e99219 Added quest completion modal watch tests 2015-06-22 20:48:11 -04:00
hairlessbear 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
hairlessbear 78b5ac4fdc Changed completion modal watch to be on instead of 2015-06-22 20:06:37 -04:00
hairlessbear a1a46933eb Merge branch 'crookedneighbor-quest-invite-modal-on-sync' into quest_invite_modal_on_user_sync 2015-06-22 18:08:09 -04:00
Blade Barringer 11fcb54c03 Corrected watch check 
https://github.com/hairlessbear/habitrpg/commit/4fc04fea24889d3550cfb01f508466ff56c5ad40#commitcomment-11784493
 2015-06-21 10:44:59 -05:00
Blade Barringer 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
Blade Barringer 19f8ca7980 Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-20 17:36:32 -05:00
Blade Barringer 95f1c01b01 Removed more variable assignments that were never getting set 2015-06-20 16:54:33 -05:00
Blade Barringer 68f764bca6 Removed var assignment that is never reached 2015-06-20 16:50:48 -05:00
Blade Barringer 944cef4d44 Switch over to using sinon.sandbox in karma specs 2015-06-20 14:48:38 -05:00
Blade Barringer 970b8d4061 Merge branch 'update-node-version' into develop 2015-06-20 10:51:39 -05:00
Blade Barringer 837c26415d Update node version 2015-06-20 10:02:46 -05:00
Blade Barringer f4ae2b98ff Merge pull request #5432 from hairlessbear/remove_armorSet 
Removed unused 'armorSet' attribute in user model
 2015-06-20 08:38:31 -05:00
Alys 6eac1174a2 sort eligibleEquipment before choosing random item from Enchaned Armoire - possible partial fix for https://github.com/HabitRPG/habitrpg/issues/5376#issuecomment-111799217 2015-06-20 20:22:27 +10:00
hairlessbear 02acad9dfc Removed unused 'armorSet' attribute in user model 2015-06-20 01:38:47 -04:00
Blade Barringer a44d760b8f Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-06-19 23:52:20 -05:00
Blade Barringer 2acf7eb71e Move score tests to separate file 2015-06-19 23:51:37 -05:00
Blade Barringer ddc8508816 Merge branch 'develop' into TheHollidayInn-tasks-api-up-checkoff-todo 2015-06-19 23:00:18 -05:00
Alys 83089720c8 Update migration script that sets Ultimate Gear object in user accounts to ensure true OR false values for all classes. Ref https://github.com/HabitRPG/habitrpg/issues/5427 2015-06-20 09:17:32 +10:00
TheHollidayInn 925cc81425 Removed complete param from creating todos with up and down url and added test for overriding complete parameter 2015-06-18 23:10:50 -05:00
Alys 07b41d16b6 Revert "Revert "new GSalvadi audio theme, created by NomindTR"" 
This reverts commit 30a091e14e.
 2015-06-18 22:19:35 +10:00
Blade Barringer bcc99791dd Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop 2015-06-17 19:13:13 -05:00
Blade Barringer c1b429c8bf Adjust spacing; remove comment 2015-06-17 19:12:49 -05:00
Blade Barringer 4042c1ce7a Merge branch 'GitHubSphinx-Sphinx-entry1' into develop 2015-06-17 19:06:56 -05:00
Blade Barringer 03c1476840 Change location of sellFor strings 2015-06-17 19:06:28 -05:00
Blade Barringer 3ff310294b Hide row if not part of reward; add one-time bindings 2015-06-17 18:57:15 -05:00
Blade Barringer e150a4d4f6 Merge branch 'develop' into hairlessbear-add_quest_rewards_to_pending_quest 2015-06-17 18:51:30 -05:00
Blade Barringer 685c09aa0d Merge branch 'task_service_refactoring_v2' into develop 2015-06-17 18:46:13 -05:00
Sabe Jones ad7e5a6dc9 feat(pets): Cuttlefishies v1.1.0 2015-06-17 17:26:36 -05:00
Alys c404e5ca5e Merge pull request #5420 from HabitRPG/revert-5407-GSalvadi-audio-NOMINDTR-2015-06-15 
Temporarily revert "new GSalvadi audio theme, created by NomindTR"
 2015-06-18 08:04:35 +10:00
Alys 30a091e14e Revert "new GSalvadi audio theme, created by NomindTR" 2015-06-18 07:39:38 +10:00
hairlessbear 3046bbb0d7 Added quest rewards to pending quest display 2015-06-17 13:21:17 -04:00
Blade Barringer 4da3018ad9 Simplify editTask 2015-06-17 07:51:07 -05:00
Alys 910fc2f213 Merge pull request #5407 from Alys/GSalvadi-audio-NOMINDTR-2015-06-15 
new GSalvadi audio theme, created by NomindTR
 2015-06-17 21:39:39 +10:00
Blade Barringer e422ea065f Reword tests 2015-06-16 23:16:11 -05:00
Blade Barringer 3ab27f32d2 Refactored editTask into TaskService 2015-06-16 23:11:04 -05:00
TheHollidayInn 3dc3891ec6 Fixed habit tests to create habits and check scoring 2015-06-16 20:19:02 -05:00
Blade Barringer 63e1bdf5fd Merge pull request #5415 from hairlessbear/update_locales_link 
Update README.md link in _README_FIRST.md files and add missing _README_FIRST.md files
 2015-06-16 19:27:26 -05:00
Blade Barringer 1801ad0bce Add authors to bailey and correct refresh text v1.0.3 2015-06-16 17:59:59 -05:00
hairlessbear 205f700c7e Fix links 2015-06-16 18:04:12 -04:00
Sabe Jones 7152bea4fe chore(news): 6/16 misc Bailey 2015-06-16 16:59:27 -05:00
hairlessbear 73f87213e9 Added _README_FIRST.md files to directories that were missing them 2015-06-16 17:51:54 -04:00
hairlessbear 0b40237b91 Updated README.md link in all _README_FIRST.md files 2015-06-16 17:46:21 -04:00
Matteo Pagliazzi b12ee725f4 incrementally enable weekly recap emails v1.0.2 2015-06-16 20:26:58 +02:00
Matteo Pagliazzi 95b481b31d use discriminator field to distinguish users with weekly recap emails enabled 2015-06-16 17:51:24 +02:00
GihHubSphinx 0cd1ffb794 Fixing button caption for selling Eggs and Potions in the Market 2015-06-16 19:06:53 +05:00
Matteo Pagliazzi a82270fbaa feat(weekly-recap): enable for new users who sign in 2015-06-16 11:15:03 +02:00
hairlessbear 18fe4b6166 Fix task advanced settings display setting (fixes #5408) 2015-06-16 00:52:48 -04:00
Alys 14983cb996 replace minus Habit and To-Do sounds, rename NomindTR's theme, rename keys for theme since they aren't live yet 2015-06-16 13:10:49 +10:00