aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-05-015-3/+37
|\
| * more performance workfriendica2015-04-301-1/+9
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-309-5/+19
| |\
| | * document [var=wrap]none[/var] for block elementsMario Vavti2015-04-302-0/+8
| | |
| * | just a test, please do not try to implement this as there are severe ↵friendica2015-04-303-3/+21
| | | | | | | | | | | | security issues
* | | Merge branch 'master' into tresfriendica2015-04-2926-1122/+1210
|\ \ \ | | |/ | |/| | | | | | | Conflicts: include/notifier.php
| * | fix block viewMario Vavti2015-04-291-1/+1
| | |
| * | disable voting in blocks, layouts and webpagesMario Vavti2015-04-294-2/+7
| | |
| * | fix $noloc state in mod editwebpagesMario Vavti2015-04-291-1/+1
| | |
| * | adjust placeholder namingMario Vavti2015-04-292-2/+3
| |/
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-283-7/+3
| |\
| | * Merge pull request #316 from oliverlorenz/patch-1redmatrix2015-04-291-1/+1
| | |\ | | | | | | | | Thank you! Updated INSTALL.txt - outdated link corrected
| | | * Updated INSTALL.txt - outdated link correctedOliver Lorenz2015-04-281-1/+1
| | | |
| | * | revert some changes in justified galleryMario Vavti2015-04-282-6/+2
| | |/
| * / version updatefriendica2015-04-282-2/+2
| |/
| * Provide webpage layout descriptionMario Vavti2015-04-254-7/+18
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-2413-66/+127
| |\
| | * css fixesMario Vavti2015-04-242-0/+8
| | |
| | * add widget class to blocks again by default. we have the wrap variable now ↵Mario Vavti2015-04-241-1/+1
| | | | | | | | | | | | to remove the div wrapper if necessary.
| | * provide block titles in blocklistMario Vavti2015-04-244-8/+15
| | |
| | * add title to element arrayMario Vavti2015-04-243-3/+5
| | |
| | * there is no key named term in this arrayMario Vavti2015-04-241-1/+0
| | |
| | * copy/paste typoMario Vavti2015-04-241-1/+1
| | |
| | * webpages layout fixesMario Vavti2015-04-246-56/+101
| | |
| * | zotfeed issuesfriendica2015-04-241-3/+3
| | |
| * | reset routefriendica2015-04-241-1/+1
| | |
| * | mod/branchtopic - move an off-topic comment to its own thread as a fresh ↵friendica2015-04-244-1028/+1026
| |/ | | | | | | wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains.
| * block unfederated posts from zot_feedfriendica2015-04-231-0/+6
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-236-56/+122
| |\
| * | disconnectfriendica2015-04-234-12/+22
| | |
* | | Merge branch 'master' into tresfriendica2015-04-231727-201129/+48987
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-236-56/+122
| |/
| * explain a bit more about the structure and scopefriendica2015-04-222-1/+3
| |
| * do not show acl button if not ownerMario Vavti2015-04-221-3/+4
| |
| * fix webpages profile_tabsMario Vavti2015-04-221-5/+2
| |
| * fix webpage permsMario Vavti2015-04-223-3/+12
| |
| * provide headings for blocks and layoutsMario Vavti2015-04-227-10/+51
| |
| * add translation plugin to the to-dofriendica2015-04-211-0/+1
| |
| * use PERMS_SPECIFIC for anything that hasn't been specified. This way there's ↵friendica2015-04-212-25/+25
| | | | | | | | nothing that's "only yourself", and let's you add additional permissions at will rather than be forced to accept the defaults or turn on custom permissions just to give a friend delegation rights or the ability to post photos.
| * 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-213-5/+12
| |
| * bring lockview to menu items, slightly change the way /lockview is calledMario Vavti2015-04-219-35/+46
| |
| * rework and hopefully improve webpage menu creation workflowMario Vavti2015-04-2111-200/+258
| |
| * issue #162friendica2015-04-203-1/+3
| |
| * issue #176, sender copy of item not obscured if using private mentionfriendica2015-04-202-2/+4
| |
| * force event obj_type on updatefriendica2015-04-201-1/+2
| |
| * update to-do listfriendica2015-04-202-1/+3
| |
| * issue #178, searching for words such as 'data' would return private items ↵friendica2015-04-191-2/+4
| | | | | | | | regardless of their unobscured content.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 22:30:02 +0000