aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-315-15/+60
|\|
| * fix unable to crop profile pic on postgresHabeas Codice2015-05-301-1/+1
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-303-12/+18
| |\
| | * whitespaceMario Vavti2015-05-291-1/+1
| | * add some yes/no labels and minor template fixesMario Vavti2015-05-292-6/+6
| | * some fixes to make menu sharing work and expose it in the ui.Mario Vavti2015-05-291-5/+9
| | * show created/edited dates for menusMario Vavti2015-05-291-0/+2
| * | strip images from directory text entriesredmatrix2015-05-301-1/+1
| |/
| * untested menu element import, be aware that the menu api does not over-write ...redmatrix2015-05-281-7/+46
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-282-0/+4
|\|
| * catch a window that wasn't yet saved when the last checkin occurredredmatrix2015-05-271-1/+0
| * menu encoding for sharing/exchangeredmatrix2015-05-271-0/+4
| * missing row in sql query which is used further downredmatrix2015-05-271-1/+1
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-272-58/+84
|\|
| * some high-level stuff we may need for shareable menus. Also make the client r...redmatrix2015-05-271-57/+83
| * some work on issue #329redmatrix2015-05-251-1/+1
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-251-5/+37
|\|
| * add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ...redmatrix2015-05-251-5/+37
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-244-11/+16
|\|
| * timezone setting not saved issue #336redmatrix2015-05-241-1/+1
| * typo and update to rfc7033 (webfinger) as well as webfinger diagnostic pageredmatrix2015-05-243-10/+15
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-241-2/+2
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-242-191/+257
| |\
| * | search result heading not translatableredmatrix2015-05-241-2/+2
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-242-190/+258
|\ \ \ | | |/ | |/|
| * | Merge pull request #331 from solstag/jquerypropredmatrix2015-05-241-2/+2
| |\ \
| | * | Fix accepting contacts by using correct jquery calls.Alexandre Hannud Abdo2015-05-221-2/+2
| | |/
| * / Add PHP's xml module check and upload limits to setup.Klaus Weidenbach2015-05-241-189/+255
| |/
* | 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
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 15:14:48 +0000