aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-075-7/+56
|\
| * Merge pull request #924 from dentm42/bugfix-pr922git-marijus2017-12-071-1/+1
| |\
| | * Fix 'unable to add pages with spaces' (pr 922)M.Dent2017-12-061-1/+1
| * | hubzilla issue #680, implement IMoveTarget and recursive file/directory move/...zotlabs2017-12-062-3/+38
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-12-063-25/+108
| |\|
| * | synchronise an attach_move operation to cloneszotlabs2017-12-063-3/+17
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-0619-436/+206
|\ \ \ | | |/ | |/|
| * | missed a spot while resolving merge conflictMario Vavti2017-12-061-1/+1
| * | Merge branch 'dentm42-wiki-create-missing' into devMario Vavti2017-12-063-25/+108
| |\ \ | | |/ | |/|
| | * resolve merge conflictMario Vavti2017-12-063-25/+108
| |/
| * don't force tile photos to be square, as there's no way to sensibly auto-crop...zotlabs2017-12-051-8/+9
| * mod_cloud: provide a themed page with an error notification on errors instead...zotlabs2017-12-052-1/+25
| * disallow backslashes in wiki and wiki-page nameszotlabs2017-12-052-6/+18
| * explain what happened herezotlabs2017-12-041-0/+3
| * fix mod display and others that require a non-zero profile_uid for updateszotlabs2017-12-042-4/+9
| * We only require one Update module. The rest are superfluous.zotlabs2017-12-0411-393/+35
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-0419-90/+232
|\|
| * fix another PHP 7.2 warningMario Vavti2017-12-041-1/+1
| * hq templateMario Vavti2017-12-041-0/+9
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-12-049-30/+145
| |\
| | * render installable elements as buttons instead of linkszotlabs2017-12-031-2/+2
| | * pagetitle lost importing a pdl element from conversationzotlabs2017-12-032-2/+4
| | * js warning - getelementbyid (id doesn't exist)zotlabs2017-12-031-1/+1
| | * rename buttonzotlabs2017-12-031-1/+1
| | * chunked uploads for photos pagezotlabs2017-12-033-20/+136
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-12-027-17/+65
| | |\
| | * | remove warning for large files on cloud uploadzotlabs2017-12-022-4/+1
| * | | fix typo in HTTPSigMario Vavti2017-12-041-1/+1
| * | | PHP 7.2 silence some warningsMario Vavti2017-12-042-5/+5
| * | | mod hq: do not 404 if we have no itemMario Vavti2017-12-041-49/+59
| * | | fix some pubstream on/off weirdnessMario2017-12-035-4/+12
| | |/ | |/|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-0212-49/+132
|\| |
| * | fix acl issue in mod cloudMario Vavti2017-12-021-1/+22
| * | bump versionMario Vavti2017-12-011-1/+1
| * | add a cursor-pointer classMario Vavti2017-12-012-3/+4
| * | add a filter for notification to show new posts onlyMario Vavti2017-12-014-14/+40
| |/
| * make sure we get a file upload progress indicator in the tiles view.zotlabs2017-11-301-0/+4
| * remove logging linezotlabs2017-11-301-1/+0
| * Merge branch 'chunk'zotlabs2017-11-306-33/+65
| |\
| | * more or less working chunked uploads on /cloud now.zotlabs2017-11-303-32/+22
| | * made it to prepareHtmlzotlabs2017-11-302-4/+6
| | * progress on chunked uploads in /cloudzotlabs2017-11-302-12/+13
| | * more chunk stuffzotlabs2017-11-292-4/+4
| | * more chunkzotlabs2017-11-283-4/+7
| | * more chunk workzotlabs2017-11-281-13/+12
| | * more chunk workzotlabs2017-11-284-24/+29
| | * first integration attempt with /cloud and blueimp uploaderzotlabs2017-11-282-0/+32
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-308-309/+152
|\| |
| * | fix issue #921 - default addressbook has no nameMario2017-11-301-1/+1
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-302-12/+54
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 02:55:33 +0000