 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
|
346440d32c
|
Disable cds button if cds == user's preference
|
2015-09-06 10:14:44 -05:00 |
|
|
Blade Barringer
|
ee50fec2c1
|
Tweak wording of custom day start warning
|
2015-09-06 10:11:28 -05:00 |
|
|
Blade Barringer
|
f1224bc6be
|
Use select instead of an input for cds
|
2015-09-06 09:36:29 -05:00 |
|
|
Blade Barringer
|
085a785e4d
|
Convert input to select box
|
2015-09-06 09:22:40 -05:00 |
|
|
Blade Barringer
|
9ce6144fa4
|
Adjustments to custom day start
|
2015-09-05 15:32:49 -05:00 |
|
|
Blade Barringer
|
310bb3dfd9
|
Format settings page
|
2015-09-05 09:39:30 -05:00 |
|
|
Blade Barringer
|
9bcaea6fa2
|
Merge branch 'develop' into carolstone-chron-run-early-issue-4488
|
2015-09-05 09:32:24 -05:00 |
|
|
Blade Barringer
|
6fc8e0b5a5
|
Merge branch 'develop' into sabrecat/party-page
|
2015-09-05 09:20:06 -05:00 |
|
|
Alys
|
e0b57fa2c5
|
remove Show Classes Tour button from Settings page, and associated code
|
2015-09-05 17:29:27 +10:00 |
|
|
Sabe Jones
|
2c0d59989a
|
feat(groups): Hide sync button when irrelevant
Also extends the "your party chat is empty" message to have a counterpart in Guilds.
|
2015-09-01 15:14:38 -04: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
|
f4ca8bb78d
|
Rename task-focus focus-element
|
2015-08-31 20:31:03 -05:00 |
|
|
Blade Barringer
|
3e44c3a8ce
|
Change focus-me to use task-focus
|
2015-08-31 20:16:14 -05:00 |
|
|
Blade Barringer
|
ee0bcb5309
|
Correct class name
|
2015-08-30 17:52:16 -05:00 |
|
|
Blade Barringer
|
8cb11aa85d
|
Remove merge conflict marking
|
2015-08-29 07:18:17 -05:00 |
|
|
Blade Barringer
|
a0040d736f
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-28 23:06:00 -05:00 |
|
|
Blade Barringer
|
4af1a4d6ac
|
Rename image rendering class
|
2015-08-28 21:48:42 -05:00 |
|
|
Blade Barringer
|
df3c498fcc
|
Add rasterize class
|
2015-08-28 21:41:53 -05:00 |
|
|
Blade Barringer
|
ce7d0039f8
|
Q-ify save functions
|
2015-08-24 17:36:06 -05:00 |
|
|
Blade Barringer
|
66d16fefc3
|
Send back 204 from questLeave route
|
2015-08-24 12:38:43 -05:00 |
|
|
Blade Barringer
|
bc24fa8130
|
Add front end button to leave quest
|
2015-08-23 22:38:55 -05:00 |
|
|
Blade Barringer
|
6955add15d
|
Use locale string
|
2015-08-23 15:05:49 -05:00 |
|
|
Blade Barringer
|
427fbb959b
|
Add join existing party button
|
2015-08-23 14:59:06 -05:00 |
|
|
Blade Barringer
|
63315ce281
|
Remove extra ng-if
|
2015-08-23 10:23:41 -05:00 |
|
|
Blade Barringer
|
12137428e9
|
Show loading new party message when creating a solo party
|
2015-08-23 10:17:48 -05:00 |
|
|
Blade Barringer
|
1144defbca
|
Restructure party page
|
2015-08-23 10:15:00 -05:00 |
|
|
Blade Barringer
|
74bef58537
|
Simplify text-centering
|
2015-08-23 09:32:59 -05:00 |
|
|
Blade Barringer
|
08edcb6743
|
Move loading new party to own partial
|
2015-08-23 09:31:46 -05:00 |
|
|
Blade Barringer
|
963b136a91
|
Reorg party views
|
2015-08-23 09:28:45 -05:00 |
|
|
Blade Barringer
|
a36c08930e
|
Separate out party sections
|
2015-08-23 09:24:55 -05:00 |
|
|
Blade Barringer
|
3f874e25a4
|
Fix bug where booting a member makes them appear in the other members list
|
2015-08-23 09:07:18 -05:00 |
|
|
Blade Barringer
|
ccff3998bd
|
Hide quest button if quest is pending or active
|
2015-08-23 08:42:15 -05:00 |
|
|
Blade Barringer
|
e6fb8f34bb
|
Add user id to solo party page
|
2015-08-23 08:34:33 -05:00 |
|
|
Blade Barringer
|
fd35f58ccd
|
Display invite party to quest only if party has more than one member
|
2015-08-23 08:29:45 -05:00 |
|
|
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 |
|
|
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
|
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
|
65888d3f8a
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-20 07:39:25 -05:00 |
|
|
Sabe Jones
|
190fdd5bb9
|
feat(pets): August cheetah quest
|
2015-08-19 16:55:14 -04:00 |
|
|
Blade Barringer
|
b902ff63a2
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-19 08:07:34 -05:00 |
|
|
Blade Barringer
|
fa7f957ccc
|
Update habitrpg.com to habitica.com where applicable
|
2015-08-19 08:00:34 -05:00 |
|
|
Blade Barringer
|
2e289777d5
|
Clean up groups page
|
2015-08-18 07:46:01 -05:00 |
|
|
Blade Barringer
|
344eded949
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-17 19:04:25 -05:00 |
|