 Blade Barringer
|
fefcbd1d2f
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-22 21:42:05 -05:00 |
|
|
Blade Barringer
|
8b75de56b6
|
Correct tabbing on server side specs reporting
|
2015-08-22 21:41:13 -05:00 |
|
|
Blade Barringer
|
a07d0cde85
|
Fixed karma reporting
|
2015-08-22 21:41:13 -05:00 |
|
|
Blade Barringer
|
37859e51b7
|
Move gulp task
|
2015-08-22 21:41:13 -05:00 |
|
|
Blade Barringer
|
f4bc208226
|
Reorganize karma.conf
|
2015-08-22 21:41:13 -05:00 |
|
|
Blade Barringer
|
9fde84f3d0
|
Remove directive
|
2015-08-22 21:41:12 -05:00 |
|
|
Blade Barringer
|
7a43e7f90a
|
Remove mocks
|
2015-08-22 21:41:12 -05:00 |
|
|
Blade Barringer
|
7a9cbe2cc5
|
Glob files in karma.conf
|
2015-08-22 21:41:12 -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
|
699ce83ee9
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-22 19:18:44 -05:00 |
|
|
Blade Barringer
|
8e80b4d8e7
|
Remove directive
|
2015-08-22 19:18:34 -05:00 |
|
|
Blade Barringer
|
99d2b7f749
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-22 19:18:08 -05:00 |
|
|
Blade Barringer
|
85243c7512
|
Remove mocks
|
2015-08-22 19:16:32 -05:00 |
|
|
Blade Barringer
|
75a77faa92
|
Glob files in karma.conf
|
2015-08-22 19:15:45 -05:00 |
|
|
Blade Barringer
|
a4627be3ea
|
Merge branch '3onyc-fix-hash-leak' into develop
|
2015-08-22 17:54:42 -05:00 |
|
|
Blade Barringer
|
b2c4d5c012
|
Add test for items that are deleted when getting the user
|
2015-08-22 17:53:49 -05:00 |
|
|
Blade Barringer
|
8fc69102aa
|
Merge branch 'develop' into 3onyc-fix-hash-leak
|
2015-08-22 17:45:47 -05:00 |
|
|
Blade Barringer
|
87c04e885d
|
Merge pull request #5818 from lacrimae/patch-6
Wording: Proper English it was not
|
2015-08-22 17:44:35 -05:00 |
|
|
Blade Barringer
|
9ddf5353d1
|
Clean up directive tests
|
2015-08-22 17:21:30 -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 |
|
|
TheHollidayInn
|
5e510aade0
|
Added tests for new menu directives
|
2015-08-22 15:25:51 -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
|
8c66714e5f
|
Convert methods to use sandbox
|
2015-08-22 11:54:03 -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 |
|
|
lacrimae
|
b8bd87eeb8
|
Wording: Proper English it was not
|
2015-08-20 16:55:05 +02: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 |
|
|
Blade Barringer
|
0f5f80f910
|
Unpend preening test
|
2015-08-19 19:23:23 -05:00 |
|