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
Matteo Pagliazzi
e0bfd60eb1
amazon payments: switch to green button
2015-07-15 20:07:17 +02:00
Matteo Pagliazzi
ecc98411c7
refactor amazon payments and add one time purchases once again
2015-07-15 20:07:17 +02:00
Alys
ef496525a1
change white "Report" button to red "Report Violation" button in chat message flag modal
2015-07-11 21:23:39 +10:00
Matteo Pagliazzi
65f4aac23c
feat(amazon-payments): working subscriptions, put donations and gifts on hold
2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
271245f1e6
feat(amazon-payments): finalize one time purchases
2015-06-30 17:59:30 +02:00
Blade Barringer
fce9d39f19
Added in one-time-bindings
2015-05-26 09:02:25 -05:00
GihHubSphinx
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
Blade Barringer
5d93f364c1
Merge branch 'blade-hairlessbear_markdown_help_table' into develop
2015-05-24 22:47:02 -05:00
Blade Barringer
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
hairlessbear
337a727390
Added hidable markdown help menu and adding to private messages
2015-05-23 22:51:40 -04:00
GihHubSphinx
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
Blade Barringer
3c35b52d27
Hide contributor level if contribText func is not available; put math on scope
2015-05-15 23:08:26 -05: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
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
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
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
