aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-149-1400/+1539
|\
| * fix some more PHP7.2 warningsMario Vavti2017-12-141-2/+2
| |
| * make remote homelink link to the home host and not to the home channelMario Vavti2017-12-141-4/+6
| |
| * bump versionMario Vavti2017-12-141-1/+1
| |
| * strings and version bumpMario Vavti2017-12-132-1380/+1514
| |
| * fix issue with long filenames in mod cloudMario Vavti2017-12-131-0/+4
| |
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-12-133-1/+9
| |\
| | * hubzilla #475 continued - show photos in root folder. Part of Andrew's fix ↵zotlabs2017-12-122-1/+6
| | | | | | | | | | | | for this wasn't in my repository and hopefully won't conflict; as it appears to have been lost somewhere. It also needed a small change to the folder permissions check.
| | * hubzilla issue #475, item 3zotlabs2017-12-121-1/+5
| | |
| * | Revert "try as best we can to keep the directory table (cloud list mode) ↵Mario Vavti2017-12-122-14/+5
| |/ | | | | | | | | | | inside the containing div. It looks pretty bad when you have a long filename." This reverts commit 4d7acdd44d4413c5bb712fe05a77bcaccc3054a5.
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-12-1219-38/+199
|\|
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-12-122-5/+14
| |\
| | * try as best we can to keep the directory table (cloud list mode) inside the ↵zotlabs2017-12-112-5/+14
| | | | | | | | | | | | containing div. It looks pretty bad when you have a long filename.
| * | notification: slight animation for loading... and do not remove public ↵Mario Vavti2017-12-115-10/+55
| |/ | | | | | | stream items on click (we can not mark them read)
| * sql compliance issuezotlabs2017-12-102-2/+2
| |
| * regression in channel sources deliveryzotlabs2017-12-101-2/+14
| |
| * auto promote beginner (techlevel 0) accounts to level 1 after they show ↵zotlabs2017-12-101-1/+23
| | | | | | | | signs of active participation.
| * go back to including the photo thumbnail data in the export file. We have ↵zotlabs2017-12-101-2/+17
| | | | | | | | the ability to fetch each thumbnail directly if there is a problem with resource consumption, but this is the most efficient way to deal with it and most sites should be able to handle the memory consumption of our thumbnail data. The original full scale photo is a different issue; these can exhaust memory even before base64.
| * improvements to file import/exportzotlabs2017-12-103-11/+59
| |
| * xlink_rating_text default valuezotlabs2017-12-091-1/+3
| |
| * hubzilla-addons issues #73zotlabs2017-12-091-1/+1
| |
| * strip acct: from OWA auth to API endpointszotlabs2017-12-073-3/+4
| |
| * fix loading of theme-specific widgetszotlabs2017-12-071-6/+13
| |
* | 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)
| | * Fix 'unable to add pages with spaces' (pr 922)M.Dent2017-12-061-1/+1
| | |
| * | hubzilla issue #680, implement IMoveTarget and recursive file/directory ↵zotlabs2017-12-062-3/+38
| | | | | | | | | | | | move/rename
| * | 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 ↵zotlabs2017-12-051-8/+9
| | | | | | | | auto-crop; increase the tile size slightly to compensate
| * mod_cloud: provide a themed page with an error notification on errors ↵zotlabs2017-12-052-1/+25
| | | | | | | | instead of an obtuse XML error structure
| * 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
| | | |