aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'zottel2015-09-0810-107/+276
|\
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-0/+19
| |\
| | * export eventsredmatrix2015-09-071-0/+19
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-9/+13
| |\|
| | * minor fix to event syncredmatrix2015-09-071-9/+13
| * | work on event syncredmatrix2015-09-073-1/+89
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-072-1/+34
| |\|
| | * create event sync packetsredmatrix2015-09-072-0/+33
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-072-4/+19
| |\|
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-073-380/+393
| | |\
| | | * fix postgres zotfeedHabeas Codice2015-09-071-4/+6
| | | * Merge pull request #391 from tuscanhobbit/masterWave2015-09-072-376/+387
| | | |\
| | | | * Updated Italian stringsPaolo Tacconi2015-09-072-376/+387
| | * | | sync posted top level items rather than deliver them (actually we do both, bu...redmatrix2015-09-071-3/+30
| | |/ /
| * | | consolidate import_items/sync_itemsredmatrix2015-09-076-102/+112
* | | | Merge remote-tracking branch 'upstream/master'zottel2015-09-073-9/+12
|\| | |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-073-9/+12
| |\| |
| | * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-6/+9
| | |\ \
| | | * | uexport template fixesMario Vavti2015-09-041-6/+9
| | * | | PRIVACY: item_private seems to have been removed from permissions_sql checkin...redmatrix2015-09-073-182/+182
| | |/ /
* | | | Merge remote-tracking branch 'upstream/master'zottel2015-09-0714-45/+69
|\| | |
| * | | Always open rpost editor on document readyredmatrix2015-09-062-9/+7
| * | | use conversation defaults for /public page instead of collapsed list mode, bu...redmatrix2015-09-061-3/+5
| * | | Update dav_windows.bbjeroenpraat2015-09-061-3/+3
| * | | Update dav_nemo.bbjeroenpraat2015-09-061-5/+5
| * | | Update dav_mount.bbjeroenpraat2015-09-061-3/+3
| * | | Update dav_mount.bbjeroenpraat2015-09-061-1/+1
| * | | Update dav_dolphin.bbjeroenpraat2015-09-061-2/+2
| * | | Update dav_nautilus.bbjeroenpraat2015-09-061-2/+2
| * | | make js_upload work with hubzilla. It still needs a rewrite.redmatrix2015-09-052-12/+36
| * | | syntaxredmatrix2015-09-051-1/+1
| * | | Merge pull request #26 from anaqreon/logo-in-readmeredmatrix2015-09-052-3/+3
| |\ \ \
| | * | | Updating logo icon in Readme file and change markup heading for universality.Andrew Manning2015-08-152-3/+3
| * | | | Merge pull request #35 from redmatrix/jeroenpraat-patch-1redmatrix2015-09-051-1/+1
| |\ \ \ \
| | * | | | Fix for PHP Fatal error: Function name must be a string in /var/www/hubzilla...jeroenpraat2015-09-041-1/+1
| |/ / / /
* | | | | Merge remote-tracking branch 'upstream/master'zottel2015-09-0411-25/+174
|\| | | |
| * | | | fix typos before pushing0.9redmatrix2015-09-031-1/+1
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-030-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | export chatroomsredmatrix2015-09-031-0/+6
| * | | | import and sync chatroomsredmatrix2015-09-036-4/+114
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-031-5/+7
| |\| | |
| | * | | channel export - don't include linked resource items (photos, events). These ...redmatrix2015-09-031-2/+4
| * | | | profile import error #34redmatrix2015-09-031-3/+2
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-031-3/+2
| |\| | |
| | * | | in this case no results is not an errorredmatrix2015-09-031-3/+2
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-033-13/+20
| |\| | |
| | * | | revision updateredmatrix2015-09-031-1/+1
| | * | | Merge pull request #390 from zzottel/masterredmatrix2015-09-042-12/+19
| | |\ \ \
| | | * | | fix update 1148zottel2015-09-032-12/+19
| | |/ / /
| * | | | bug reporting docredmatrix2015-09-032-0/+32
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 13:58:20 +0000