aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update pt-br transationAlexandre Hannud Abdo2015-05-112-6099/+7075
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-1018-5474/+5835
|\
| * uid > channel id to make submenus visible for observersMario Vavti2015-05-101-3/+3
| * provide drop down submenu suggestions in edit modeMario Vavti2015-05-102-3/+6
| * copy/paste typoMario Vavti2015-05-101-1/+1
| * provide ability to create submenusMario Vavti2015-05-108-11/+47
| * Merge pull request #318 from zzottel/masterzzottel2015-05-082-5226/+5453
| |\
| | * update to German stringszottel2015-05-082-5226/+5453
| |/
| * provide wrap variable for comanche menusMario Vavti2015-05-073-5/+23
| * Update Dutchjeroenpraat2015-05-072-221/+232
| * provide a possibility to include js/css libsMario Vavti2015-05-071-0/+40
| * adjust icon sizeMario Vavti2015-05-073-6/+6
| * comanche docoMario Vavti2015-05-062-2/+10
| * avoid double slash after editing layoutMario Vavti2015-05-061-1/+1
| * allow blocks to have custom classes and add a new template called zen which g...Mario Vavti2015-05-062-2/+20
* | rev updateredmatrix2015-05-103-47/+63
|/
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-056-8102/+8003
|\
| * Merge pull request #317 from tuscanhobbit/devPaolo T2015-05-042-4048/+3998
| |\
| | * Italian translationPaolo Tacconi2015-05-042-4048/+3998
| * | fix center page content settingMario Vavti2015-05-041-1/+2
| * | remove obsolete linebreakMario Vavti2015-05-041-1/+1
| * | Updating Dutchjeroenpraat2015-05-022-4052/+4002
* | | turn consensus items into diaspora polls for that networkredmatrix2015-05-055-201/+243
|/ /
* | 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
| * | 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
* | | just a test, please do not try to implement this as there are severe security...friendica2015-04-303-3/+21
|/ /
* | 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
| |\ \
| | * | 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 to...Mario Vavti2015-04-241-1/+1
| * | 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 wall...friendica2015-04-244-1028/+1026
|/ /
* | block unfederated posts from zot_feedfriendica2015-04-231-0/+6
* | Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-236-56/+122
|\ \