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
2cd3ef7bdb
Addressing https://github.com/HabitRPG/habitrpg/issues/5244
...
Changes:
1. optOutText made more accurate
2. Modal heading in single translatable line with no link to wiki -
which looks nicer
3. Links to wiki articles about classes made translatable
4. New "Learn more" link to wiki article on classes system in the modal
footer
2015-05-31 15:58:27 +05:00
6af7342693
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
42b482cb7e
Make user sync after accepting or rejecting a quest
2015-05-28 08:18:08 -05:00
dc8647d6ae
Changed all party.quest.key instances in quest invite modal to user.party.quest.key and changed invite modal check
2015-05-27 18:49:35 -04:00
cc3d63b858
Fixed rewards on quest invite modal
2015-05-27 10:05:03 -04:00
fce9d39f19
Added in one-time-bindings
2015-05-26 09:02:25 -05:00
a788d51aa5
Made gift dialog translatable
...
Addressing a bit beyond _#10 in the opening post of
https://github.com/HabitRPG/habitrpg/issues/4522
Screenshot of before-after-proof: http://oi57.tinypic.com/11c9ldi.jpg
2015-05-26 17:18:18 +05:00
5d93f364c1
Merge branch 'blade-hairlessbear_markdown_help_table' into develop
2015-05-24 22:47:02 -05:00
681668f131
Tweak @hairlessbear's pr
...
* Simplify chat button stylings
* Add formatting help to send gift modal
* Clean up formatting of table
* Add example for unordered lists
* Remove ! from `env.t` that do not have html characters
* Use https instead of http in link
* Format markdown blurb
* Use ng-if instead of ng-show
* Collapse show help link into single element
2015-05-24 09:20:12 -05:00
337a727390
Added hidable markdown help menu and adding to private messages
2015-05-23 22:51:40 -04:00
fe2e0618b8
Make Invite-friends-to-group dialog translatable
...
UI strings of the dialog of invitation to the group made translatable
2015-05-23 02:44:32 +05:00
2440b312a2
Made two lines translatable
...
Addressing #10 and #11 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522
* "Send gift" (in the form that pops up when you click on username
label)
* "Invite Friends" button (in "Members" section in guilds and party)
2015-05-21 17:12:16 +05:00
3c35b52d27
Hide contributor level if contribText func is not available; put math on scope
2015-05-15 23:08:26 -05:00
54e82a14a2
fix(invite-friends): text should be valid for both parties and guilds
2015-04-23 20:48:44 +02:00
7d579ea08a
Merge branch 'CancelSendOnBlankPM' of https://github.com/rdhammond/habitrpg into rdhammond-CancelSendOnBlankPM
...
Conflicts:
website/views/shared/modals/members.jade
2015-04-05 23:24:46 +10:00
8033b129ff
Merge pull request #4915 from gisikw/free_100_key_to_the_kennels
...
Make Key to the Kennels free for Triad Bingoers.
2015-04-04 10:48:15 +10:00
Matteo Pagliazzi
