Commit Graph

10535 Commits

Author SHA1 Message Date
Blade Barringer 3153fbac3c Fix bug where mutliple user ids could not be saved 2015-08-21 08:19:39 -05:00
Blade Barringer 7fcfe6734b Correct spacing 2015-08-21 08:19:06 -05:00
Blade Barringer e8b658b0de Add controllers to manifest and sort them 2015-08-20 08:17:47 -05:00
Blade Barringer 65888d3f8a Merge branch 'develop' into sabrecat/party-page 2015-08-20 07:39:25 -05:00
Blade Barringer 0f5f80f910 Unpend preening test 2015-08-19 19:23:23 -05:00
Sabe Jones f306ee6d1d fix(test): Skip preen test 2015-08-19 20:08:39 -04:00
Sabe Jones 99c8f941e6 chore(news): August pet Bailey 2015-08-19 17:39:11 -04:00
Sabe Jones 190fdd5bb9 feat(pets): August cheetah quest 2015-08-19 16:55:14 -04:00
Sabe Jones 3e848ce67e chore(pets): Compile sprites 2015-08-19 14:59:26 -05:00
Sabe Jones 2a09eb8911 feat(pets): August sprites 2015-08-19 14:50:09 -05:00
Blade Barringer 322785dd44 Merge branch 'develop' into sabrecat/party-page 2015-08-19 08:56:36 -05:00
Blade Barringer 59068c17a2 Add watch task for karma test 2015-08-19 08:56:20 -05:00
Blade Barringer 635c1ecd5a Make openInviteModal function more readable 2015-08-19 08:53:43 -05:00
Blade Barringer 0eb61a5bec Split out group controllers into separate files 2015-08-19 08:20:13 -05:00
Blade Barringer b902ff63a2 Merge branch 'develop' into sabrecat/party-page 2015-08-19 08:07:34 -05:00
Blade Barringer 45b7e9a7d2 Remove .DS_Store files 2015-08-19 08:07:06 -05:00
Blade Barringer 5b02c2776e Fix habitica in privacy policy 2015-08-19 08:06:02 -05:00
Blade Barringer fa7f957ccc Update habitrpg.com to habitica.com where applicable 2015-08-19 08:00:34 -05:00
Blade Barringer 1fecc7dc89 Change wiki links to habitica 2015-08-19 07:46:25 -05:00
Blade Barringer 00ec16877b Merge pull request #5799 from Alys/challenges-editable-by-admins-2015-08-16
allow Challenges to be edited, closed, and deleted by staff and moderators
2015-08-18 17:20:19 -05:00
Blade Barringer 7f834429ac Add test for clickStartQuest 2015-08-18 08:19:04 -05:00
Blade Barringer 861a90a562 Use rootScope as variable 2015-08-18 08:18:53 -05:00
Blade Barringer b2e90ffb16 Merge branch 'develop' into sabrecat/party-page 2015-08-18 08:10:57 -05:00
Blade Barringer be87f69cd4 Actually save copy message modal spec 2015-08-18 08:10:38 -05:00
Blade Barringer b5a7b31fa8 Merge branch 'develop' into sabrecat/party-page 2015-08-18 08:09:33 -05:00
Blade Barringer fe22f76e30 Move copy message modal controller spec to own file 2015-08-18 08:06:46 -05:00
Blade Barringer 3f48364a4a Move autocomplete controller to own file 2015-08-18 08:05:56 -05:00
Blade Barringer a032c80aaf Move chat controller to own spec file 2015-08-18 08:05:35 -05:00
Blade Barringer a749e2d9f7 Move party controller to own spec 2015-08-18 08:04:17 -05:00
Blade Barringer ee6fe4f756 Use _.find for clickStart Quest 2015-08-18 08:02:23 -05:00
Blade Barringer 2e289777d5 Clean up groups page 2015-08-18 07:46:01 -05:00
Blade Barringer a57e19bdba Convert to private methods 2015-08-18 07:34:49 -05:00
Blade Barringer ab7a23ad00 Add quest abort function back in 2015-08-17 22:15:51 -05:00
Blade Barringer 690100b9f8 Correct common count test 2015-08-17 22:09:11 -05:00
Blade Barringer 14ae3b1046 Add one time binding 2015-08-17 22:07:09 -05:00
Blade Barringer ba2988ac98 Use new content for mixin 2015-08-17 21:51:08 -05:00
Blade Barringer f792155b45 Order quests with array 2015-08-17 21:48:58 -05:00
Blade Barringer 8ed13f1c12 Update wiki url 2015-08-17 21:34:20 -05:00
Blade Barringer 58888c8118 Add test for questOfCategory counting function 2015-08-17 19:18:21 -05:00
Blade Barringer 344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -05:00
Alys aea8c3e5f6 Merge pull request #5806 from Gbear605/develop
Update information about max levels for buffs.
2015-08-18 09:02:03 +10:00
Garrison Taylor 94a31985b7 Update information about max levels for buffs. 2015-08-17 11:34:30 -05:00
Alys 0fec63a2a7 Merge pull request #4 from crookedneighbor/add_test_to_admin_editable_pr
Add tests to PR that lets admins edit challenges
2015-08-17 07:29:20 +10:00
Blade Barringer 9b73c5eab8 Add tests for non-owner permissions 2015-08-16 09:45:01 -05:00
Blade Barringer ab9aab9262 Rework challenge integration test to be more autonomous 2015-08-16 09:44:38 -05:00
Blade Barringer f9e337ed40 Merge pull request #5796 from GitHubSphinx/Sphinx-i18n-db1
Change 2 locale strings to exclude html character codes not shown on the front page
2015-08-16 07:31:09 -05:00
GihHubSphinx a1f8035515 Change 2 strings to exclude html character codes
exclude mldr and rsquo character codes not shown correctly on the front
page
2015-08-16 14:17:26 +05:00
GihHubSphinx 0a0d41510e Revert "Enable html rendering for 2 locale strings"
This reverts commit a2108bbb51.
2015-08-16 14:08:58 +05:00
Alys 71a9f7caf4 make challenge permission error messages translatable 2015-08-16 17:30:51 +10:00
Alys 53f861f3c0 allow challenges to be edited, deleted, closed by admin users (moderators and staff) through the web UI (not by API calls) 2015-08-16 16:51:53 +10:00