Matteo Pagliazzi
54e82a14a2
fix(invite-friends): text should be valid for both parties and guilds
2015-04-23 20:48:44 +02:00
Alys
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
Alys
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
Alys
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
Kevin Gisi
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
Daniel Hammond
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
Kevin Gisi
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
Kevin Gisi
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
Daniel Hammond
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
Daniel Hammond
d3b92a0a6c
Added a tooltip to make it clear to the user to type something in!
2015-03-22 12:37:32 -04:00
Daniel Hammond
5f726eadbf
Adding an extra check to disable "send" for private messages when textbox
...
is empty.
2015-03-21 22:54:28 -04:00
kholliday
ceb2639f81
Added focus directive to focus textarea for a private message model box
2015-03-19 11:49:46 -05:00
Matteo Pagliazzi
9e540e86af
add email with optional message when kicking user from group
2015-03-18 19:12:53 +01:00
Matteo Pagliazzi
0722a17897
start working on kick from group email & message
2015-03-18 17:31:07 +01:00
Sabe Jones
c8db070b12
fix(quests): Reference string correctly
2015-03-17 21:51:28 -05:00
Sabe Jones
4c5f4377ff
fix(quests): Alternate unlock strings
2015-03-17 21:48:22 -05:00
Sabe Jones
efdf591eae
fix(quest): Different string format
2015-03-17 21:38:22 -05:00
Sabe Jones
7422fe3865
fix(quest): Correct unlock string
2015-03-17 21:33:13 -05:00
Sabe Jones
4cb6783544
feat(quest): Bunny quest
2015-03-17 21:24:46 -05:00
Alice Harris
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
Blade Barringer
477d3d6085
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
2015-02-12 13:32:23 -06:00
Blade Barringer
8ac9dc3ced
Merge branch 'develop' into common-convert
2015-02-10 16:27:46 -06:00
Blade Barringer
cc767efa20
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
...
Conflicts:
src/controllers/auth.js
src/controllers/challenges.js
src/controllers/groups.js
src/controllers/members.js
src/controllers/payments/index.js
src/controllers/user.js
src/middleware.js
src/models/user.js
2015-02-03 21:13:55 -06:00
Blade Barringer
8a8ce8d80d
Moved folders to website directory
2015-02-03 14:10:55 -06:00
