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
0e581444b7
Merge pull request #4887 from TheHollidayInn/focus-textarea-on-pm
...
Added focus directive to focus textarea for a private message model box
2015-04-04 01:45:30 +10:00
79606736a1
Ensure Bailey always displays the most recent message.
...
* Added a Grunt task to precompile website/views/shared/new-stuff.jade to a
static html file.
* Updated the new-stuff.jade modal template to use a $rootScope property.
* Added a special case to openModal for the newStuff template, by which it
fetches the flat file, marks it as trusted HTML, and sets it to the
$rootScope property before rendering the modal.
2015-03-31 20:38:15 -04:00
cea97e4da8
Documenting the (Bootstrap recommended!) wrapper workaround for tooltips
...
on disabled elements. Added code to prevent user from posting blank
messages by using meta-enter as a workaround.
2015-03-28 01:21:39 -04:00
ca87a46b04
Adjusted Key to the Kennel logic so only *release both* is free with Triad Bingo achievement
2015-03-26 18:30:56 -04:00
334393d33b
Make Key to the Kennels free for Triad Bingoers.
...
* Updated logic in `common/script/index.coffee` to accept Triad Bingo
achievement in lieu of gems.
* Removed Gem cost on inventory page if user has achievement.
* Updated Key to the Kennels modal to hide "Buy Gems" button if user has
achievement.
* Removed Gem costs from buttons if user has achievement.
* Added new copy for Key to the Kennels modal that omits gem prices if the user
has the achievement.
2015-03-26 18:30:56 -04:00
d537a7fee4
Tweaked copy on "enter a message" text for private message button popup.
...
Added placeholder text for empty private message box.
2015-03-24 00:10:44 -04:00
d3b92a0a6c
Added a tooltip to make it clear to the user to type something in!
2015-03-22 12:37:32 -04:00
5f726eadbf
Adding an extra check to disable "send" for private messages when textbox
...
is empty.
2015-03-21 22:54:28 -04:00
ceb2639f81
Added focus directive to focus textarea for a private message model box
2015-03-19 11:49:46 -05:00
9e540e86af
add email with optional message when kicking user from group
2015-03-18 19:12:53 +01:00
0722a17897
start working on kick from group email & message
2015-03-18 17:31:07 +01:00
c8db070b12
fix(quests): Reference string correctly
2015-03-17 21:51:28 -05:00
4c5f4377ff
fix(quests): Alternate unlock strings
2015-03-17 21:48:22 -05:00
efdf591eae
fix(quest): Different string format
2015-03-17 21:38:22 -05:00
7422fe3865
fix(quest): Correct unlock string
2015-03-17 21:33:13 -05:00
4cb6783544
feat(quest): Bunny quest
2015-03-17 21:24:46 -05:00
044930b7d3
add +2 Missed Days to debug menu in footer, adjust addMissedDay function and all calls to it
2015-03-07 18:39:43 +10:00
477d3d6085
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
2015-02-12 13:32:23 -06:00
Matteo Pagliazzi
