aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-04-298-21/+102
|\ | | | | | | | | Conflicts: include/notifier.php
| * fix block viewMario Vavti2015-04-291-1/+1
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-281-1/+0
| |\
| | * revert some changes in justified galleryMario Vavti2015-04-281-1/+0
| | |
| * | version updatefriendica2015-04-281-1/+1
| |/
| * Provide webpage layout descriptionMario Vavti2015-04-252-4/+12
| |
| * css fixesMario Vavti2015-04-242-0/+8
| |
| * provide block titles in blocklistMario Vavti2015-04-242-7/+11
| |
| * webpages layout fixesMario Vavti2015-04-243-13/+75
| |
* | Merge branch 'master' into tresfriendica2015-04-23160-28987/+32063
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
| * webpages blocks fixesMario Vavti2015-04-234-24/+95
| |
| * provide headings for blocks and layoutsMario Vavti2015-04-224-2/+36
| |
| * missing classMario Vavti2015-04-211-1/+1
| |
| * move .lockview to style.css and a typoMario Vavti2015-04-212-5/+5
| |
| * missing dropdown classMario Vavti2015-04-211-1/+1
| |
| * bring lockstate to webpagesMario Vavti2015-04-212-4/+7
| |
| * bring lockview to menu items, slightly change the way /lockview is calledMario Vavti2015-04-217-21/+20
| |
| * rework and hopefully improve webpage menu creation workflowMario Vavti2015-04-219-93/+138
| |
| * issue #162friendica2015-04-202-1/+2
| |
| * attach an id to menues, allow $menu_title to be empty, if no custom menu ↵Mario Vavti2015-04-192-16/+12
| | | | | | | | class is provided use default redbasic classes
| * Introduce wrap variable in comanche blocks (if set to none the block will ↵Mario Vavti2015-04-191-1/+1
| | | | | | | | not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo
| * css fixMario Vavti2015-04-181-1/+1
| |
| * fix page-title marginMario Vavti2015-04-181-0/+4
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-176-34/+26
| |\
| | * adjus webpage font size to match conv item font sizeMario Vavti2015-04-171-1/+2
| | |
| | * allow jot to be displayed expanded, remove deprected datetimepicker js and ↵Mario Vavti2015-04-176-33/+24
| | | | | | | | | | | | some random fixes
| * | hide event share button when editing an eventfriendica2015-04-171-0/+4
| |/
| * wording and css fixesMario Vavti2015-04-161-3/+2
| |
| * provide a separate input field for rpost attachmentsMario Vavti2015-04-165-9/+23
| |
| * move share webpage element from editwebpage to webpages and make it ↵Mario Vavti2015-04-162-4/+8
| | | | | | | | shareable with rpost
| * Added string for item ID in view sourcemrjive2015-04-151-0/+1
| |
| * title=>nameMario Vavti2015-04-151-5/+5
| |
| * css fixes and remove expert mode for block page content typeMario Vavti2015-04-142-2/+2
| |
| * some more on webpagesMario Vavti2015-04-141-1/+2
| |
| * webpages appearenceMario Vavti2015-04-136-37/+106
| |
| * add bs classes to design tools menuMario Vavti2015-04-133-24/+2
| |
| * remove superfluous view/preview buttonsMario Vavti2015-04-131-2/+0
| |
| * remove widget class from webpage blocks and make titles h2 to match the rest ↵Mario Vavti2015-04-131-1/+1
| | | | | | | | of the matrix
| * only add the h3 tag to the page if there is a titleMichael Johnston2015-04-121-1/+1
| |
| * bring ajax delete to filesMario Vavti2015-04-122-3/+3
| |
| * make dropItem more universal and move delete up in the dropdown menuMario Vavti2015-04-123-11/+9
| |
| * reverse file activity logicMario Vavti2015-04-122-26/+11
| |
| * move style to style.cssMario Vavti2015-04-101-0/+6
| |
| * bring ajax item delete to conv listMario Vavti2015-04-101-1/+1
| |
| * program the affinity slider labelsfriendica2015-04-092-2/+2
| |
| * make jRange behave againMario Vavti2015-04-091-21/+4
| |
| * delete conv items on the fly in backgroundMario Vavti2015-04-082-1/+16
| |
| * update jquery to 1.11.2Mario Vavti2015-04-081-5/+5
| |
| * this is easier on the eyes when collapsing a long post/commentMario Vavti2015-04-081-1/+2
| |
| * add endless scroll to viewconnections modulefriendica2015-04-062-1/+9
| |