aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* consolidate import_items/sync_itemsredmatrix2015-09-076-102/+112
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-073-9/+12
|\ | | | | | | | | Conflicts: util/messages.po
| * 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 ↵redmatrix2015-09-073-182/+182
| |/ | | | | | | checking with an observer.
* | Always open rpost editor on document readyredmatrix2015-09-062-9/+7
| |
* | use conversation defaults for /public page instead of collapsed list mode, ↵redmatrix2015-09-061-3/+5
| | | | | | | | but allow over-ride
* | 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
| * | 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/…
| * | | Fix for PHP Fatal error: Function name must be a string in ↵jeroenpraat2015-09-041-1/+1
|/ / / | | | | | | | | | | | | /var/www/hubzilla/include/items.php on line 3325 Please review if this is correct?
* | | 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
|\| | | | | | | | | | | | | | Conflicts: include/identity.php
| * | channel export - don't include linked resource items (photos, events). These ↵redmatrix2015-09-031-2/+4
| | | | | | | | | | | | items will need to be provided with those objects so that they can be re-linked.
* | | 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 1148
| | * | fix update 1148zottel2015-09-032-12/+19
| |/ /
* | | bug reporting docredmatrix2015-09-032-0/+32
| | |
* | | app syncredmatrix2015-09-023-2/+91
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-023-3/+15
|\| |
| * | more adjustment to apps containersredmatrix2015-09-021-2/+3
| | |
| * | sort out some app display weirdnessredmatrix2015-09-023-3/+14
| | |
| * | increase height of app-container so edit controls aren't shadowedredmatrix2015-09-021-1/+1
| | |
* | | add timestamps for syncing appsredmatrix2015-09-024-6/+35
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-022-3/+11
|\| |
| * | dummy updateredmatrix2015-09-022-3/+11
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-023-5/+8
|\| | | | | | | | | | | | | | | | | Conflicts: doc/credits.bb mod/thing.php
| * | sync "things" (obj elements)redmatrix2015-09-021-0/+28
| | |
| * | Update the creditsredmatrix2015-09-022-5/+7
| | |
| * | protect from sql injectionredmatrix2015-09-022-2/+2
| | |
* | | start to modularise the clone import and sync functionsredmatrix2015-09-025-204/+386
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-021-4/+3
|\| | | | | | | | | | | | | | Conflicts: include/zot.php
| * | Merge pull request #389 from zzottel/masterredmatrix2015-09-031-2/+2
| |\ \ | | | | | | | | really fix post filtering
| | * | really fix post filteringzottel2015-09-021-2/+2
| |/ /
* | | obscure mail subject in conversation structureredmatrix2015-09-011-1/+10
| | |