Blade Barringer
ffa8072800
Made name field HabitRPG so sms will be correct. Uncomented description
...
and put the old name field
2014-12-29 20:31:59 -06:00
Blade Barringer
ae8542eaf1
Removed extraneous console logs left while testing
2014-12-29 15:50:44 -06:00
Blade Barringer
efba545147
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2014-12-29 15:44:06 -06:00
Blade Barringer
b3025c36b1
Fixed checklist not advancing to next input. Closes #4430
2014-12-29 15:43:20 -06:00
Matteo Pagliazzi
756fa83418
fix(date): typo
2014-12-29 22:26:12 +01:00
Matteo Pagliazzi
cb13b5ac26
fix(date): add YYYY/MM/DD format
2014-12-29 22:16:58 +01:00
Matteo Pagliazzi
3105b61cb5
Merge branch 'Verabird-dateformat' into develop
2014-12-29 21:24:44 +01:00
Matteo Pagliazzi
4a37bec652
fix(pr): indentation and simplify
2014-12-29 21:21:54 +01:00
Blade Barringer
4e1b298a42
Corrected spelling error in comment
2014-12-29 14:16:25 -06:00
Matteo Pagliazzi
752161b284
Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat
2014-12-29 21:09:04 +01:00
Negue
a082e88b5d
Filter Array only once and one time binding - closes #4429
2014-12-27 23:26:30 +01:00
Blade Barringer
2bb1e5cf7f
Merge branch 'confirm-delete' into develop
2014-12-26 21:04:48 -06:00
Blade Barringer
695c463b40
Added confirmation dialog before deleting message
2014-12-26 21:04:22 -06:00
Alice Harris
af7e68259d
Merge pull request #4404 from sbreiler/develop
...
Fix #4296 (Subscription "Update Card" message is cut off)
2014-12-27 12:29:04 +10:00
Verabird
8852ad61b2
Add dateFormat preference field to user model and make settingsCtrl change the field when form is changed
2014-12-26 15:52:42 -05:00
Verabird
7297429888
Make it possible to choose between MM/dd and dd/MM date format
2014-12-26 15:52:42 -05:00
Sabe Jones
0e28f04c90
feat(event): Implement Seasonal Shop
2014-12-25 14:33:11 -06:00
benmanley
118ba88d3d
fix(tasks): improve UI consistency and layout
...
* Match UI elements with rest of site
* Tidy up layout
2014-12-24 09:53:41 +00:00
benmanley
8cf3cd66cc
fix(avatar): prevent avatar from obscuring name
...
Increase z-index of avatar-name so that avatar image doesn’t obscure it
when riding a mount
2014-12-24 09:53:40 +00:00
breiste
e1eaefa943
Fix #4296 (Subscription "Update Card" message is cut off)
2014-12-24 00:14:08 +01:00
Blade Barringer
9406b3cf70
Removed unnecessary console.log
2014-12-18 22:36:52 -06:00
Blade Barringer
7f10049b37
Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
...
Conflicts:
views/options/social/chat-message.jade
2014-12-18 21:55:50 -06:00
Blade Barringer
7db273c0be
Merge pull request #3773 from benlind/buttonless_habits_full_space
...
Fixes #3260 : Buttonless habits full width
2014-12-18 13:52:01 -06:00
Sabe Jones
eadedd5897
Merge pull request #4383 from SabreCat/seasonal
...
Seasonal Shop Basics
2014-12-16 21:51:02 -06:00
Blade Barringer
9cdbca8c2b
Reverted routing for groups back
2014-12-14 20:05:01 -06:00
Blade Barringer
d1b1a866ac
Fixed when routing. Closes #4371
2014-12-14 19:01:52 -06:00
Sabe Jones
7988dfcf82
fix(seasonal): Corrections for Shop
...
Fix Jade indenting, add state control, add menu option
2014-12-14 14:01:25 -06:00
Blade Barringer
dde3f5ffef
Adjusted tooltip wrapping so it would only affect long titles
2014-12-14 12:18:59 -06:00
Blade Barringer
a961d6b342
Added wrapping rule for user tooltip in chat messages closes #4367
2014-12-14 12:05:36 -06:00
Blade Barringer
d0df9e46d6
Added helper classes for floats at various screen sizes
2014-12-14 08:31:40 -06:00
Blade Barringer
41e1f4c75f
Conditionally allow completed quest image to be centered if no
...
completion text is present
2014-12-14 08:13:50 -06:00
Blade Barringer
195a8a5ca3
Merge pull request #4375 from thehindenburg/questimage
...
Quest image added in the completion screen
2014-12-14 07:39:16 -06:00
thehindenburg
7c6d8d4dc2
Update quests.styl
...
further white space cleanup
2014-12-12 11:02:55 -08:00
thehindenburg
670542f3ce
cleaning up white space
2014-12-12 10:44:06 -08:00
thehindenburg
2db80c6841
changed to style sheet
2014-12-12 10:26:55 -08:00
benmanley
45d30ffef5
fix(footerCtrl.js): disable addThis hover
...
Activate addThis dropdown on click/tap not on hover.
2014-12-12 17:41:45 +00:00
benmanley
0943a229ec
fix(avatar.styl): improve label layout
...
Fixes #4349
* Tweak position of labels to align better with background border.
* Increase z-index of share button to prevent it being obscured by
avatar.
* Move share button to bottom left corner to prevent it obscuring
avatar name.
2014-12-12 17:41:45 +00:00
Blade Barringer
38cd0e8de1
Added method for letting an admin unhide a flagged message
2014-12-11 17:29:01 -06:00
Blade Barringer
0cf7bba822
Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
2014-12-11 10:21:19 -06:00
Matteo Pagliazzi
ce73a75133
feat(email): add new image for subscription email
2014-12-09 17:34:28 +01:00
Blade Barringer
5ac7f479d3
Added some spacing between icons and text on challenge/guild buttons
2014-12-07 21:03:09 -06:00
Blade Barringer
05c01ebd3c
Made glyphicons white on for challenge/guild join/leave buttons
2014-12-07 21:01:40 -06:00
Matteo Pagliazzi
ae6e0255c6
feat(flag-message): add server methods
2014-12-07 14:35:09 +01:00
Blade Barringer
5acde1e609
Added todo for paglias
2014-12-07 13:50:47 +01:00
Blade Barringer
7a7c13ff6d
Prevent modal from popping up if already reported
2014-12-07 13:50:47 +01:00
Blade Barringer
2f506ce0e0
Give flag text danger class and already reported message if already
...
reproted
2014-12-07 13:50:47 +01:00
Blade Barringer
e9cffe6206
Error handling for if message already flagged
2014-12-07 13:50:46 +01:00
Blade Barringer
5a6c9fbf84
Added some logic for adding flags
2014-12-07 13:50:46 +01:00
Blade Barringer
c44c607ae7
Renamed flagChat to flagChatMessage
2014-12-07 13:50:46 +01:00
Blade Barringer
62d92db332
Added buttons to footer, cleaned up functions
2014-12-07 13:50:46 +01:00
