aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | major changes to "forum mode" on the network/matrix pageredmatrix2015-09-093-4/+11
* | | | | | | | | | | | | | | | slight hack to improve public forum detection in the forum widgetredmatrix2015-09-092-1/+4
* | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #37 from MicMee/masterredmatrix2015-09-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | typoMichael Meer2015-09-091-1/+1
| |/ / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / update bug reporting docoredmatrix2015-09-091-11/+25
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | profile photo issues #36redmatrix2015-09-091-1/+4
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'zottel2015-09-0917-61/+361
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | preserve code blocks on item import if channel has code rights. When importin...redmatrix2015-09-083-3/+81
* | | | | | | | | | | | | | | | move mod_admin to Comanche finallyredmatrix2015-09-084-43/+63
* | | | | | | | | | | | | | | | differentiate Community Server from Enterprise Serverredmatrix2015-09-081-2/+2
* | | | | | | | | | | | | | | | issues with "use this photo for profile photo" #36redmatrix2015-09-081-5/+27
* | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-080-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | export TERM_FILE when mirroringredmatrix2015-09-082-1/+7
| * | | | | | | | | | | | | | | merge conflictsredmatrix2015-09-082-2/+2
* | | | | | | | | | | | | | | | export TERM_FILE when mirroringredmatrix2015-09-081-2/+7
* | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-081-0/+1
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | add sync packets for menusredmatrix2015-09-083-1/+19
* | | | | | | | | | | | | | | | debugging menu syncredmatrix2015-09-082-2/+3
* | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-082-2/+11
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | menu exportredmatrix2015-09-082-2/+12
* | | | | | | | | | | | | | | | menu import and syncredmatrix2015-09-088-3/+167
| | * | | | | | | | | | | | | | 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