aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Expand)AuthorAgeFilesLines
* more migration of page typesredmatrix2015-05-216-39/+37
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-211-1/+4
|\
| * preserve lock on edited commentsredmatrix2015-05-211-1/+4
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-204-11/+24
|\|
| * check for success before updating remote idredmatrix2015-05-201-8/+9
| * PRIVACY: possible privacy leakage under a defined set of circumstancesredmatrix2015-05-203-5/+15
* | merge redmatrix fixredmatrix2015-05-191-2/+2
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-191-1/+9
|\|
| * issue with deleting imported design elements and re-installing themredmatrix2015-05-191-1/+9
* | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ciph...redmatrix2015-05-191-2/+0
* | get rid of photo_flags in the coderedmatrix2015-05-181-7/+7
* | bring the new photo schema into playredmatrix2015-05-182-27/+19
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-182-4/+6
|\|
| * this should fix undeletable blocks and layoutsredmatrix2015-05-182-4/+6
* | fix some merge errorsredmatrix2015-05-181-2/+4
* | Merge branch 'master' into tresredmatrix2015-05-1711-22/+20
|\ \
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-1711-22/+20
| |\|
| | * more work isolating the projectname from core.redmatrix2015-05-1711-18/+18
* | | Merge branch 'master' into tresredmatrix2015-05-141-10/+15
|\| |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-141-10/+15
| |\|
| | * provide default permissions ('all') for existing and newly created OAuth app ...redmatrix2015-05-141-10/+15
* | | Merge branch 'master' into tresredmatrix2015-05-1424-69/+67
|\| |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-131-1/+1
| |\|
| | * remove project name dependency from most of the doc files to ease project mer...redmatrix2015-05-131-1/+1
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-135-7/+11
| |\|
| | * restrict webpage list to undeleted itemsredmatrix2015-05-132-3/+3
| | * product was a bad string to use because we may require it for e-commerce, and...redmatrix2015-05-133-3/+3
| | * issue #187redmatrix2015-05-121-1/+5
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-121-0/+3
| |\|
| | * let the site admin import a record directly from the probe diagnosticredmatrix2015-05-111-0/+3
| | * missing translationredmatrix2015-05-111-1/+1
| * | missing merge conflictredmatrix2015-05-111-6/+1
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-101-4/+18
| |\|
| | * provide drop down submenu suggestions in edit modeMario Vavti2015-05-101-3/+4
| | * provide ability to create submenusMario Vavti2015-05-101-2/+10
| * | missed one...redmatrix2015-05-061-1/+1
| * | convert ITEM_WALL from bitfield to standaloneredmatrix2015-05-0613-41/+38
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-061-1/+1
| |\|
| | * avoid double slash after editing layoutMario Vavti2015-05-061-1/+1
| * | for hubzilla we won't be obscuring items, only private mail, this will allow ...redmatrix2015-05-051-8/+0
| * | second pass name changeredmatrix2015-05-056-7/+7
| * | first pass name changeredmatrix2015-05-059-20/+20
| |/
* | Merge branch 'master' into tresfriendica2015-04-298-54/+91
|\|
| * disable voting in blocks, layouts and webpagesMario Vavti2015-04-293-2/+5
| * fix $noloc state in mod editwebpagesMario Vavti2015-04-291-1/+1
| * adjust placeholder namingMario Vavti2015-04-292-2/+3
| * Provide webpage layout descriptionMario Vavti2015-04-251-2/+5
| * Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-245-46/+32
| |\
| | * provide block titles in blocklistMario Vavti2015-04-241-1/+3
| | * add title to element arrayMario Vavti2015-04-243-3/+5