41c38c6e63
Merge branch 'TheHollidayInn-directives-test-task-focus' into develop
2015-08-31 20:36:07 -05:00
f4ca8bb78d
Rename task-focus focus-element
2015-08-31 20:31:03 -05:00
3e44c3a8ce
Change focus-me to use task-focus
2015-08-31 20:16:14 -05:00
ee0bcb5309
Correct class name
2015-08-30 17:52:16 -05:00
4af1a4d6ac
Rename image rendering class
2015-08-28 21:48:42 -05:00
dd1e69b9d5
Merge branch 'RossBrunton-develop' into develop
2015-08-28 21:42:16 -05:00
df3c498fcc
Add rasterize class
2015-08-28 21:41:53 -05:00
8d713a53c4
feat(tutorial): Splash screen overhaul complete
2015-08-28 13:58:30 -04:00
c4012ad762
WIP(tutorial): New intro splash
2015-08-27 16:04:59 -04:00
fa7f957ccc
Update habitrpg.com to habitica.com where applicable
2015-08-19 08:00:34 -05:00
80ba33bf7c
Fix issue where card strings required quotes
2015-08-14 08:13:05 -05:00
00a212660a
feat(greeting-cards): Thank-You & Greets
2015-08-13 16:58:31 -05:00
c7edbfb9b2
Remove empty object in close
2015-08-12 08:42:01 -05:00
203a26b6df
Refactor how cards are recieved
2015-08-12 08:36:57 -05:00
869b27d786
Correct markdown
2015-08-11 20:01:45 -05:00
0dc10b5f8e
Convert valentines to markdown
2015-08-11 18:47:12 -05:00
4f333c4f8a
fix(amazon-payments): swap colors between paypal and amazon
2015-08-03 18:41:34 +02:00
e72543641c
Puts keys of the kennel modal on the inventory ctrl so pet counting variables can be accesssed
...
Closes #5668
2015-07-25 23:22:35 -05:00
d022a0eb67
Merge branch 'develop' into sabrecat/death-modal
...
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-07-24 16:11:51 -05:00
7d622792a8
Merge pull request #5635 from HabitRPG/sabrecat/quests-page
...
Improve quest drop notification
2015-07-22 10:28:16 -07:00
0313170921
feat(quests): Invite party button
2015-07-21 15:25:34 -05:00
5789f22320
WIP(death): Draft with decal
2015-07-21 14:39:08 -05:00
0039a17366
WIP(death): More display tweaks
2015-07-21 13:57:13 -05:00
c286d08bc8
WIP(death): New death modal
2015-07-20 16:24:05 -05:00
86eaff7cb0
fix(i18n): string for amazon payments
2015-07-17 15:28:55 +02:00
3f8a4a0957
fix(quests): Remove controller instantiation
2015-07-16 16:35:21 -05:00
ffc441ab82
feat(quests): Improve drop notif
2015-07-16 16:22:49 -05:00
695c793f6e
Merge pull request #5632 from HabitRPG/paglias/amazon-payments
...
Amazon Payments: implement one time purchases
2015-07-16 13:24:42 +02:00
4a54363966
fix(quests): Show info modal for Gold quests
2015-07-15 14:02:49 -05:00
e0bfd60eb1
amazon payments: switch to green button
2015-07-15 20:07:17 +02:00
ecc98411c7
refactor amazon payments and add one time purchases once again
2015-07-15 20:07:17 +02:00
de32461787
feat(amazon-payments): WIP add donations
2015-07-15 20:07:17 +02:00
ef496525a1
change white "Report" button to red "Report Violation" button in chat message flag modal
2015-07-11 21:23:39 +10:00
00f7af7807
Introducing a class for buttons allowing wrapping
...
New .btn-wrap class for buttons with long text allowing wrapping
2015-07-10 02:33:09 +05:00
65f4aac23c
feat(amazon-payments): working subscriptions, put donations and gifts on hold
2015-06-30 17:59:30 +02:00
271245f1e6
feat(amazon-payments): finalize one time purchases
2015-06-30 17:59:30 +02:00
78cca423f0
feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP
2015-06-30 17:59:30 +02:00
a377501f64
feat(amazon-payments): wip on donations
2015-06-30 17:59:30 +02:00
6faef6f737
wip amazon payments
2015-06-30 17:59:30 +02:00
b0643e7177
WIP: start working on amazon payments
2015-06-30 17:59:30 +02:00
19f8ca7980
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-20 17:36:32 -05:00
3ff310294b
Hide row if not part of reward; add one-time bindings
2015-06-17 18:57:15 -05:00
14fe29dd4a
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-14 16:33:38 -05:00
31e7b052a1
Removed 'freeRebirth' modal and its associated strings
2015-06-13 14:18:03 -04:00
097e1ff70b
Put popover in containing span
2015-06-10 08:18:08 -05:00
78bf96b104
Remove extraneous div
2015-06-09 17:52:17 -05:00
885820c753
Merge branch 'develop' into GitHubSphinx-Sphinx-entry1
2015-06-09 17:49:50 -05:00
20859b83ef
feat(Armoire): Improved counter
...
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
2015-06-04 15:45:55 -05:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
f9aa2c7301
Misplaced popover walkaround
...
Popover for small sized button (btn-sm) is misplaced while no such bug
is present for normal sized button.
2015-05-31 18:18:12 +05:00
Blade Barringer