aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* some diaspora import issues uncovered during dry-run testsredmatrix2015-06-211-6/+4
* Merge pull request #352 from solstag/store_update_fixredmatrix2015-06-211-9/+10
|\
| * Make item_store_update only affect the data we requestedAlexandre Hannud Abdo2015-06-201-9/+10
* | ensure the photo driver is includedredmatrix2015-06-201-0/+1
* | import_diaspora - incorrect method for importing channel photo, and add dupli...redmatrix2015-06-201-20/+42
* | wrong logicredmatrix2015-06-191-1/+1
* | import_diaspora - a few more atypical settingsredmatrix2015-06-191-3/+19
* | import_diaspora: add all the friendsredmatrix2015-06-191-4/+13
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-191-5/+2
|\ \
| * | bring some more generic-content-wrappers and fix some of themMario Vavti2015-06-191-5/+2
| |/
* / very early attempt diaspora import from diaspora export file. Currently the j...redmatrix2015-06-191-0/+100
|/
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-181-2/+2
|\
| * fix deleting of album for remote channelMario Vavti2015-06-161-2/+2
* | issues with markdownify and escaped HTMLredmatrix2015-06-182-4/+12
|/
* don't provide a connect button on the sys channel profile sidebarredmatrix2015-06-111-0/+4
* hubzilla compatibility functionredmatrix2015-06-111-0/+14
* retire old Friendica RINO encryption functionsredmatrix2015-06-091-28/+0
* toggle diaspora protocol on a per-channel level in addition to the existing p...redmatrix2015-06-092-0/+28
* add site_dead flag to prevent delivery to dead sites. Allow sys channel webpa...redmatrix2015-06-081-8/+17
* asjld workredmatrix2015-06-021-3/+13
* error in directory bbcode image filterredmatrix2015-05-311-1/+1
* bare bones ASLDredmatrix2015-05-311-4/+44
* 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
* add menu_created, menu_edited fields to DBredmatrix2015-05-281-4/+31
* menu encoding for sharing/exchangeredmatrix2015-05-271-0/+39
* 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
* 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
|\