aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tresredmatrix2015-05-179-45/+216
|\
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-179-45/+216
| |\
| | * missing $redmatrix2015-05-171-1/+1
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-172-32/+105
| | |\
| | | * Merge pull request #322 from dawnbreak/masterredmatrix2015-05-181-0/+66
| | | |\
| | | | * Add functions to parse and get some values from php.ini.Klaus Weidenbach2015-05-161-0/+66
| | | * | Merge pull request #323 from dawnbreak/docuredmatrix2015-05-181-32/+39
| | | |\ \
| | | | * | Add some more documentation to attach_store()Klaus Weidenbach2015-05-171-32/+39
| | | | |/
| | * | / Implement permission checking for OAuth clients using the xperm table. Curren...redmatrix2015-05-173-5/+95
| | |/ /
| | * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-171-1/+8
| | |\|
| | | * allow a block to contain $contentMario Vavti2015-05-151-1/+8
| | * | more work isolating the projectname from core.redmatrix2015-05-173-7/+7
| | |/
* | | Merge branch 'master' into tresredmatrix2015-05-1424-119/+234
|\| |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-136-9/+9
| |\|
| | * product was a bad string to use because we may require it for e-commerce, and...redmatrix2015-05-136-9/+9
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-124-4/+23
| |\|
| | * provide a method for loading site/custom widgetsredmatrix2015-05-121-0/+3
| | * replace project name with $product or $Product in strings to avoid merge issu...redmatrix2015-05-121-2/+15
| | * fix a couple of miscellaneous errors which showed up in the logsredmatrix2015-05-112-2/+5
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-102-2/+20
| |\|
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-103-8/+88
| | |\
| | | * uid > channel id to make submenus visible for observersMario Vavti2015-05-101-3/+3
| | | * provide ability to create submenusMario Vavti2015-05-101-1/+19
| | * | rev updateredmatrix2015-05-101-1/+1
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-073-5/+59
| |\ \ \ | | | |/ | | |/|
| | * | provide wrap variable for comanche menusMario Vavti2015-05-072-4/+18
| | * | provide a possibility to include js/css libsMario Vavti2015-05-071-0/+40
| | * | adjust icon sizeMario Vavti2015-05-071-1/+1
| * | | missed one...redmatrix2015-05-061-0/+2
| * | | forgot to saveredmatrix2015-05-061-2/+0
| * | | Hopefully this will make item_cache the defaultredmatrix2015-05-062-14/+54
| * | | convert ITEM_WALL from bitfield to standaloneredmatrix2015-05-0614-49/+54
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-062-2/+25
| |\| |
| | * | allow blocks to have custom classes and add a new template called zen which g...Mario Vavti2015-05-061-2/+10
| | |/
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-051-1/+1
| | |\
| | * | turn consensus items into diaspora polls for that networkredmatrix2015-05-051-0/+15
| * | | 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-052-59/+1
| * | | second pass name changeredmatrix2015-05-052-3/+3
| * | | first pass name changeredmatrix2015-05-0513-22/+22
| | |/ | |/|
| * | remove obsolete linebreakMario Vavti2015-05-041-1/+1
| |/
* | Merge branch 'master' into tresfriendica2015-05-012-2/+28
|\|
| * more performance workfriendica2015-04-301-1/+9
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-301-0/+2
| |\
| * | just a test, please do not try to implement this as there are severe security...friendica2015-04-302-2/+20
* | | Merge branch 'master' into tresfriendica2015-04-295-13/+30
|\ \ \ | | |/ | |/|
| * | disable voting in blocks, layouts and webpagesMario Vavti2015-04-291-0/+2
| |/
| * Provide webpage layout descriptionMario Vavti2015-04-251-1/+1
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-242-1/+2
| |\
| | * add widget class to blocks again by default. we have the wrap variable now to...Mario Vavti2015-04-241-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 11:18:43 +0000