 Blade Barringer
|
4177202cee
|
Merge pull request #5855 from HabitRPG/sabrecat/party-page
Party Page Revamp
|
2015-09-06 13:28:14 -05:00 |
|
|
Blade Barringer
|
f1224bc6be
|
Use select instead of an input for cds
|
2015-09-06 09:36:29 -05:00 |
|
|
Blade Barringer
|
9ce6144fa4
|
Adjustments to custom day start
|
2015-09-05 15:32:49 -05:00 |
|
|
Blade Barringer
|
c141ee6d1c
|
Fix test
|
2015-09-05 08:14:55 -05:00 |
|
|
Sabe Jones
|
6f85fcfde2
|
Merge branch 'develop' into sabrecat/party-page
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
|
2015-09-01 13:40:20 -05:00 |
|
|
Blade Barringer
|
41c38c6e63
|
Merge branch 'TheHollidayInn-directives-test-task-focus' into develop
|
2015-08-31 20:36:07 -05:00 |
|
|
Blade Barringer
|
1d8b10dc99
|
Adjust formatting
|
2015-08-31 20:35:23 -05:00 |
|
|
Blade Barringer
|
f4ca8bb78d
|
Rename task-focus focus-element
|
2015-08-31 20:31:03 -05:00 |
|
|
Blade Barringer
|
d5bd5f281c
|
Rename file names
|
2015-08-31 20:21:01 -05:00 |
|
|
Blade Barringer
|
c65ab56641
|
Remove focus-me directive
|
2015-08-31 20:17:30 -05:00 |
|
|
Blade Barringer
|
dc5c35bb17
|
Merge branch 'develop' into TheHollidayInn-menu-fix-notification-menu-closing
|
2015-08-31 19:01:11 -05:00 |
|
|
Blade Barringer
|
0bed76d336
|
Restructure test
|
2015-08-31 17:42:33 -05:00 |
|
|
TheHollidayInn
|
42066be2cf
|
Fixed broken test by change element to a focusable element
|
2015-08-31 16:49:34 -05:00 |
|
|
Blade Barringer
|
a0040d736f
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-28 23:06:00 -05:00 |
|
|
Sabe Jones
|
8d713a53c4
|
feat(tutorial): Splash screen overhaul complete
|
2015-08-28 13:58:30 -04:00 |
|
|
TheHollidayInn
|
6fb29d8766
|
Added ability to close menu when a child element has closeMenu directive
|
2015-08-26 15:32:59 -05:00 |
|
|
TheHollidayInn
|
06f59bed7c
|
Added test for task-focus directive
|
2015-08-25 16:11:18 -05:00 |
|
|
Blade Barringer
|
5b583f43d6
|
Fix api and karma test
|
2015-08-24 18:07:21 -05:00 |
|
|
Blade Barringer
|
af20986fbc
|
Simplify qroup service quest functions
|
2015-08-24 08:06:34 -05:00 |
|
|
Blade Barringer
|
fbd4490dbc
|
Fix sinon assertions
|
2015-08-24 07:46:37 -05:00 |
|
|
Blade Barringer
|
bc24fa8130
|
Add front end button to leave quest
|
2015-08-23 22:38:55 -05:00 |
|
|
Blade Barringer
|
fefcbd1d2f
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-22 21:42:05 -05:00 |
|
|
Blade Barringer
|
f4bc208226
|
Reorganize karma.conf
|
2015-08-22 21:41:13 -05:00 |
|
|
Blade Barringer
|
99d2b7f749
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-22 19:18:08 -05:00 |
|
|
Blade Barringer
|
9ddf5353d1
|
Clean up directive tests
|
2015-08-22 17:21:30 -05:00 |
|
|
TheHollidayInn
|
5e510aade0
|
Added tests for new menu directives
|
2015-08-22 15:25:51 -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
|
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
|
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
|
be87f69cd4
|
Actually save copy message modal spec
|
2015-08-18 08:10:38 -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
|
25d52bccc5
|
Use new newUser specHelper syntax
|
2015-08-15 00:08:41 -05:00 |
|
|
Blade Barringer
|
53133c6439
|
Adjust newUser spec helper
|
2015-08-14 23:55:36 -05:00 |
|
|
Blade Barringer
|
c10a0ad31a
|
Add habits
|
2015-08-14 23:43:32 -05:00 |
|
|
Alys
|
7f0889f405
|
remove commented-out default task code and unused default task locale strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-130619901 (comment by GitHubSphinx)
|
2015-08-15 13:23:42 +10:00 |
|
|
Sabe Jones
|
ab91a6fba9
|
Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards
Greeting and Thank-You Cards
|
2015-08-13 22:35:25 -05:00 |
|
|
Blade Barringer
|
b1b4522b4b
|
Fix test
|
2015-08-13 19:40:25 -05:00 |
|
|
Blade Barringer
|
bf4d690a7c
|
Merge pull request #5775 from HabitRPG/item_store_fix
Split out potion and armoire out of the itemStore object
|
2015-08-12 22:35:54 -05:00 |
|
|
Blade Barringer
|
ceec310e5f
|
Use human readable name
|
2015-08-12 22:16:30 -05:00 |
|
|
Blade Barringer
|
9a27b2e8cb
|
Add task numbers to analytics
|
2015-08-12 21:47:04 -05:00 |
|
|
Blade Barringer
|
bcf7c9712e
|
Split out potion and armoire out of the itemStore object
Fixes #5743
|
2015-08-12 18:53:49 -05:00 |
|
|
Blade Barringer
|
203a26b6df
|
Refactor how cards are recieved
|
2015-08-12 08:36:57 -05:00 |
|