Commit Graph

33 Commits

Author SHA1 Message Date
TheHollidayInn 2234c7219e Moved invite friends button to under the subscribe button 2015-06-03 20:33:39 -05:00
TheHollidayInn e3f5c22fe8 Added start party option, locales, and plus button 2015-06-01 21:07:53 -05:00
Blade Barringer 5d93f364c1 Merge branch 'blade-hairlessbear_markdown_help_table' into develop 2015-05-24 22:47:02 -05:00
Blade Barringer 165dd3a4a6 Fixes for minor visual inconsistencies with popovers and toolbars
Closes #5274, closes #5272, closes #5271
2015-05-24 15:34:12 -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
Alys 2ac763cc50 add message about Resting in the Inn to top of Dailies column when preferences.sleep is true 2015-05-13 16:56:52 +10:00
Blade Barringer 109ca1b67c Correct bullet list position; fixes #5181 2015-05-10 14:16:11 -05:00
Alys 5123bdb4c4 Merge pull request #5080 from joyclark/develop
Fixing the grid view for mounts so that the animals are aligned correctly.
2015-05-10 19:01:56 +10:00
Negue b2bad4d77f Update todo preview in dialog 2015-05-03 17:12:08 +02:00
Blade Barringer e4b21ac325 Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo 2015-04-29 17:19:24 -05:00
Negue 189423b0db markdown preview - code "inherit white-space" / hide links for 'system' 2015-04-27 19:47:42 +02:00
Blade Barringer 7494cb1438 Make gem popover consistent with gold and silver. Closes #5088 2015-04-25 21:53:00 -05:00
Joy Clark 0aff0b0f22 mounts are wider than pets and the empty paw prints in the mount view are smaller than the mounts that have been found. This makes the grid view uneven. Adjusted the css so that the mounts and paw prints are aligned. 2015-04-24 19:57:15 +02:00
Blade Barringer 523582f870 Add clear:both after task-column to fix floating issue 2015-04-23 17:58:33 -05:00
Blade Barringer 8cec2da905 Added button for jumping to inbox 2015-04-22 19:29:24 -05:00
Kevin Gisi d455666650 Join/Leave buttons on guild detail page. Addresses #4427 2015-04-15 06:15:11 -04:00
Kevin Gisi 3e653c9282 Reimplemented single challenge view code from #3319 2015-04-06 02:18:29 -04: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 def7ff906f Merge pull request #4866 from TheHollidayInn/edit-plusminus-habit-challenge
Removed css style hack for IE6 and IE7 that was interfering with habit plus/minus button behavior
2015-04-05 22:47:20 +10:00
Alys 6199e1d843 Merge branch 'remove-interactivity-challenge-tasks' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-remove-interactivity-challenge-tasks
Conflicts:
	website/public/css/tasks.styl
	website/views/shared/tasks/task.jade
2015-04-05 22:01:10 +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
kholliday e5cd319ef5 Changed empty task messageand added style. 2015-03-23 20:18:14 -05:00
kholliday 67b38f71f9 Removed styles and sorting ability for locked tasks (Challenge tasks) 2015-03-18 14:39:23 -05:00
kholliday 4c141f8918 Removed css style hack for IE6 and IE7 that was interfering with habit plus/minus button behavior 2015-03-16 12:28:23 -05:00
Blade Barringer cbc49829c8 Merge branch 'food_tray_padding' of https://github.com/kangabell/habitrpg into food-tray 2015-02-26 14:08:17 -06:00
Blade Barringer 6c85cd18a9 Adjusted style of bulk tasks 2015-02-17 08:37:26 -06:00
Blade Barringer 48e688d815 Merge branch 'bulk-add-tasks' of https://github.com/chimericdream/habitrpg into bulk-add 2015-02-17 08:05:36 -06:00
Bill Parrott 2de3a5dd55 first draft of bulk add 2015-02-17 00:25:56 -06:00
Bill Parrott b1b478bc74 add task export functionality 2015-02-16 21:21:49 -06:00
Blade Barringer 0858b871ff Closes #4693 2015-02-16 16:04:51 -06:00
Blade Barringer a1568b0c32 Corrected title on readme 2015-02-09 19:10:59 -06:00
Blade Barringer d2eafdd021 Started moving public folder stuff back to website 2015-02-03 14:02:34 -06:00