aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | allow blocks to have custom classes and add a new template called zen which g...Mario Vavti2015-05-062-2/+20
| | |/
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-056-8102/+8003
| | |\
| | * | turn consensus items into diaspora polls for that networkredmatrix2015-05-055-201/+243
| * | | no need to obscure the diaspora signature if we're not obscuring the postsredmatrix2015-05-062-6/+12
| * | | for hubzilla we won't be obscuring items, only private mail, this will allow ...redmatrix2015-05-053-67/+1
| * | | i think this is 100redmatrix2015-05-052-14/+6
| * | | update 99redmatrix2015-05-052-20/+20
| * | | second pass name changeredmatrix2015-05-0593-372/+372
| * | | first pass name changeredmatrix2015-05-0591-680/+680
| * | | iteration #97redmatrix2015-05-052-4/+4
| * | | this will settle down eventually.redmatrix2015-05-052-6/+6
| * | | change nameredmatrix2015-05-051-1/+1
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-054-4050/+4001
| |\ \ \ | | | |/ | | |/|
| | * | 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
| * | | | are we there yet?redmatrix2015-05-042-16/+16
| * | | | readme, ad nauseumredmatrix2015-05-042-6/+6
| * | | | readme, yet againredmatrix2015-05-042-16/+6
| * | | | readmeredmatrix2015-05-042-2/+2
| * | | | readmeredmatrix2015-05-042-21/+36
| * | | | readmeredmatrix2015-05-042-14/+55
| * | | | update readmeredmatrix2015-05-041-1/+1
| * | | | fine tuningredmatrix2015-05-031-2/+4
| * | | | try and update user variablesredmatrix2015-05-031-0/+2
| * | | | update readmefriendica2015-05-032-10/+12
| |/ / /
| * | / Updating Dutchjeroenpraat2015-05-022-4052/+4002
| | |/ | |/|
* | | 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 security...friendica2015-04-303-3/+21
* | | | Merge branch 'master' into tresfriendica2015-04-2926-1122/+1210
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| | |\ \
| | | * | 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