aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-073-46/+21
|\
| * fix sorting of channel suggestionsMario Vavti2015-07-071-1/+1
| * rename function get_directory_settings => get_directory_setting and move sort...Mario Vavti2015-07-072-21/+5
| * make public forums only setting sticky and simplify function to get directory...Mario Vavti2015-07-072-29/+17
| * code style correctionMario Vavti2015-07-071-3/+2
| * make directory suggest work with directory optionsMario Vavti2015-07-072-3/+7
* | incorrect value for hubloc_deleted in zot_get_hublocs() queryredmatrix2015-07-071-1/+1
* | more work on db storage of docoredmatrix2015-07-052-2/+4
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-031-1/+0
|\|
| * in hubzilla we're going to convert doco to items. define it here so that an a...redmatrix2015-07-031-2/+5
* | start doco cleanupredmatrix2015-07-031-0/+2
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-022-1/+14
|\|
| * a few clone sync fixes as well as some work on hubzilla clone sync back to re...redmatrix2015-07-022-0/+36
* | sync abook entries from redmatrixredmatrix2015-07-021-0/+21
|\|
| * provide backward compatibility with hubzilla extended item exportredmatrix2015-07-011-0/+55
* | provide compatibility with redmatrix extended item exportredmatrix2015-07-011-3/+50
* | lots of work on clone/import from redmatrix to hubzilla (won't go back the ot...redmatrix2015-06-301-3/+2
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-292-0/+6
|\|
| * turn the connection filter into a feature.redmatrix2015-06-292-0/+6
* | fix the postgres schema with all the changes to dateredmatrix2015-06-291-2/+1
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-292-1/+100
|\|
| * some prep workredmatrix2015-06-292-1/+100
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-282-17/+94
|\|
| * no this isn't it. well ok, it's part of it, but not the important part. it's ...redmatrix2015-06-282-17/+93
* | bring single instance file storage to dav and cloud uploaded photosredmatrix2015-06-272-8/+28
* | undo the disabling of browser_prefetch and for the time being revert the HTML...redmatrix2015-06-252-53/+39
* | remove all QR-code stuff from core - now in qrator addonredmatrix2015-06-251-14/+0
* | localise event calendarredmatrix2015-06-252-55/+114
* | more work on photos, including os_storage for the size '0' photo and numberin...redmatrix2015-06-233-15/+67
* | more work on mail flagsredmatrix2015-06-235-23/+18
* | item flag fixes discovered after a few mergesredmatrix2015-06-235-28/+9
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-232-3/+30
|\|
| * ensure we always sign a trimmed item body.redmatrix2015-06-221-3/+3
| * discovered a couple of loose ends in the per-member enable diaspora settingredmatrix2015-06-221-0/+26
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-213-11/+156
|\|
| * 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
| |/
* | all file attachments are now stored natively, still have photos-0 to store na...redmatrix2015-06-181-11/+68
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-182-4/+12
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-181-2/+2
| |\
| * | issues with markdownify and escaped HTMLredmatrix2015-06-182-4/+12