aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-281-4/+70
|\
| * add menu_created, menu_edited fields to DBredmatrix2015-05-281-4/+31
| * menu encoding for sharing/exchangeredmatrix2015-05-271-0/+39
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-278-15/+130
|\|
| * some high-level stuff we may need for shareable menus. Also make the client r...redmatrix2015-05-271-11/+1
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-272-0/+81
| |\
| | * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-05-271-1/+1
| | |\
| | * | define some custom attributes and html5 elements for htmlpurifierMario Vavti2015-05-271-0/+66
| | * | make it possible to include menus in blocks - this will only work in html blo...Mario Vavti2015-05-271-0/+15
| * | | fix for forked thread on diasporaredmatrix2015-05-272-11/+5
| * | | revert for nowredmatrix2015-05-271-5/+5
| * | | Comments need to have some kind of routing instructions.redmatrix2015-05-261-0/+13
| | |/ | |/|
| * | Update api.phpjeroenpraat2015-05-261-1/+1
| |/
| * placeholder for dynamic regoredmatrix2015-05-252-10/+2
| * slow but forward progress on dynamic client registrationredmatrix2015-05-251-0/+42
| * some work on issue #329redmatrix2015-05-253-7/+10
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-244-18/+27
|\|
| * one moreHabeas Codice2015-05-241-2/+2
| * avoid db compatibility issuesHabeas Codice2015-05-241-2/+2
| * logic has changed - this is not needed anymoreMario Vavti2015-05-241-6/+1
| * should not call prepare text here anymoreMario Vavti2015-05-241-1/+1
| * Merge pull request #332 from solstag/zotfeedcleanupKlaus2015-05-241-3/+1
| |\
| | * Import security only when necessary, use correct variable in logAlexandre Hannud Abdo2015-05-221-3/+1
| * | federation problem from diaspora comments relayed through red channels due to...redmatrix2015-05-231-1/+1
| * | add channel_id to local_dir_update hookredmatrix2015-05-231-1/+1
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-231-4/+17
| |\ \
| | * | use $a->data instead of $a->page for $content and ad another library for use ...Mario Vavti2015-05-231-4/+17
| | |/
| * / add local_dir_update hookredmatrix2015-05-231-1/+4
| |/
* | more migration of page typesredmatrix2015-05-212-3/+3
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-205-34/+50
|\|
| * cloning abook entries was broken in several ways if the target xchan wasn't a...redmatrix2015-05-202-16/+13
| * don't allow item_id to update without a valid post idredmatrix2015-05-201-0/+5
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-201-1/+18
| |\
| | * make design elements translateableMario Vavti2015-05-201-1/+18
| * | PRIVACY: possible privacy leakage under a defined set of circumstancesredmatrix2015-05-203-20/+13
| |/
* | re-arrange the html cache a bitredmatrix2015-05-203-12/+19
* | more db structureredmatrix2015-05-191-10/+1
* | add rot47 to the mix. This shouldn't affect the speed to any measurable degree.redmatrix2015-05-194-20/+26
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-191-1/+2
|\|
| * remove dbg codeMario Vavti2015-05-191-1/+1
| * be verbose about what type of element (block, layout, webpage) is beeing inst...Mario Vavti2015-05-191-1/+2
* | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ciph...redmatrix2015-05-194-33/+29
* | vsprintf errorredmatrix2015-05-181-1/+1
* | consensus items not working correctly and make the collections widget abide b...redmatrix2015-05-182-4/+8
* | bring the new photo schema into playredmatrix2015-05-182-24/+16
* | fix some merge errorsredmatrix2015-05-181-1/+1
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-181-2/+9
|\|
| * if block title contains $content but $content title is empty do not show an e...Mario Vavti2015-05-181-1/+1
| * remove dbg codeMario Vavti2015-05-181-2/+0
| * allow block title to contain $content titleMario Vavti2015-05-181-2/+11
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 07:44:44 +0000