Commit Graph

1233 Commits

Author SHA1 Message Date
Blade Barringer fefcbd1d2f Merge branch 'develop' into sabrecat/party-page 2015-08-22 21:42:05 -05:00
Alys 5b8c161932 changed habitrpg.wikia.com to habitica.wikia.com 2015-08-23 12:31:10 +10:00
Alys fd446fc5e5 convert habitica.com to BASE_URL 2015-08-23 12:23:35 +10:00
Blade Barringer 99d2b7f749 Merge branch 'develop' into sabrecat/party-page 2015-08-22 19:18:08 -05:00
Blade Barringer 8fc69102aa Merge branch 'develop' into 3onyc-fix-hash-leak 2015-08-22 17:45:47 -05:00
Blade Barringer b41b629e93 Remove test variable 2015-08-22 17:08:28 -05:00
Blade Barringer 01d122ad67 Remove unneded declaration 2015-08-22 17:04:46 -05:00
Blade Barringer 9643b6e650 Merge branch 'develop' into TheHollidayInn-menu-hide-when-navigate-away 2015-08-22 17:03:26 -05:00
Blade Barringer 6b7ca3e823 Use $scope instead of scope in directives 2015-08-22 17:02:32 -05:00
Blade Barringer e4eae7a23b Move ian inside quest scrolls div 2015-08-22 15:43:35 -05:00
Blade Barringer a6c5fab8a7 Correct quest display bug 2015-08-22 15:36:29 -05:00
Blade Barringer bbb878d983 Remove uncessary divs 2015-08-22 14:26:17 -05:00
Blade Barringer e04bc21018 Move ng-if up 2015-08-22 14:26:07 -05:00
Blade Barringer 950fab237d Correct invite users to guild 2015-08-22 12:52:21 -05:00
Blade Barringer 63b492ab51 Merge branch 'develop' into sabrecat/party-page 2015-08-22 12:44:07 -05:00
Blade Barringer 67e60e7d06 Add loading screen between leaving old party and joining new one 2015-08-22 12:42:52 -05:00
Blade Barringer 93f02363e5 Add feature to join new party if user is in a party of one 2015-08-22 12:19:37 -05:00
Blade Barringer 1ff597e944 Provide group name if not provided and save 2015-08-22 08:40:16 -05:00
Blade Barringer 1f86babad3 Assign group a type of party 2015-08-22 08:18:58 -05:00
Blade Barringer 60a36ca6fc Correct view 2015-08-22 08:18:39 -05:00
Blade Barringer cac5770649 Remove console log 2015-08-22 08:17:02 -05:00
Blade Barringer 53531ae296 Add btn-block class 2015-08-22 07:42:15 -05:00
Blade Barringer d55da12c01 Hide + button on invite by uuid tab 2015-08-22 07:41:54 -05:00
Blade Barringer 07b9b35234 Filter out blank emails 2015-08-21 21:39:04 -05:00
Blade Barringer 59dc0cdb4f Add method to remove blank uuids 2015-08-21 21:28:52 -05:00
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
Alys f9a0e494a7 changed "The Dreadful Cheetah" to "Such a Cheetah" 2015-08-21 20:49:58 +10: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
Alys 28e360d7f4 change Janet Janet Mongilio to janetmango 2015-08-20 11:23:29 +10: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
TheHollidayInn e762a51e4c Moved menu expand directive and created menu close directive 2015-08-19 08:53:51 -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 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 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 344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -05:00
3onyc 1c13c48bee Fix removing user salt+hash from API response 2015-08-16 17:04:24 +02:00