aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-101-28/+0
|\
| * retire old Friendica RINO encryption functionsredmatrix2015-06-091-28/+0
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-092-0/+28
|\|
| * toggle diaspora protocol on a per-channel level in addition to the existing ↵redmatrix2015-06-092-0/+28
| | | | | | | | per site setting. Default is enabled if the site setting is enabled.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-091-8/+17
|\| | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php
| * add site_dead flag to prevent delivery to dead sites. Allow sys channel ↵redmatrix2015-06-081-8/+17
| | | | | | | | webpages to be viewed even if site is configured "block public".
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-022-7/+57
|\|
| * asjld workredmatrix2015-06-021-3/+13
| |
| * error in directory bbcode image filterredmatrix2015-05-311-1/+1
| |
| * bare bones ASLDredmatrix2015-05-311-4/+44
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-313-13/+70
|\|
| * some basic background work for activitystreams-json-ld-2.0 conversionsredmatrix2015-05-312-0/+45
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-302-9/+14
| |\
| | * should not redefine $var in the function callMario Vavti2015-05-291-1/+1
| | |
| | * fix menu render for menu item edit - menu previewMario Vavti2015-05-291-1/+5
| | |
| | * some fixes to make menu sharing work and expose it in the ui.Mario Vavti2015-05-292-6/+7
| | |
| * | strip images from directory text entriesredmatrix2015-05-301-0/+5
| |/
| * there was a reason we included that fileredmatrix2015-05-281-3/+3
| |
| * parse errorredmatrix2015-05-281-2/+2
| |
| * another case of committing with unsaved changes in a second windowredmatrix2015-05-281-2/+4
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-281-4/+70
|\| | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php
| * 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
|\| | | | | | | | | Conflicts: mod/impel.php
| * some high-level stuff we may need for shareable menus. Also make the client ↵redmatrix2015-05-271-11/+1
| | | | | | | | register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks.
| * 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 ↵Mario Vavti2015-05-271-0/+15
| | | | | | | | | | | | | | | | blocks of course
| * | | 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
| |/ | | | | one comma to much
| * 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
|\| | | | | | | | | | | Conflicts: index.php mod/setup.php
| * 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 log
| | * Import security only when necessary, use correct variable in logAlexandre Hannud Abdo2015-05-221-3/+1
| | | | | | | | | | | | Just some cleanup, seemed like the intent of previous changes was so
| * | federation problem from diaspora comments relayed through red channels due ↵redmatrix2015-05-231-1/+1
| | | | | | | | | | | | to typo
| * | 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
| | |/ | | | | | | | | | with webpages - foundation
| * / 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
|\| | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 06:08:28 +0000