Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-14 | 9 | -1400/+1539 |
|\ | |||||
| * | fix some more PHP7.2 warnings | Mario Vavti | 2017-12-14 | 1 | -2/+2 |
| | | |||||
| * | make remote homelink link to the home host and not to the home channel | Mario Vavti | 2017-12-14 | 1 | -4/+6 |
| | | |||||
| * | bump version | Mario Vavti | 2017-12-14 | 1 | -1/+1 |
| | | |||||
| * | strings and version bump | Mario Vavti | 2017-12-13 | 2 | -1380/+1514 |
| | | |||||
| * | fix issue with long filenames in mod cloud | Mario Vavti | 2017-12-13 | 1 | -0/+4 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-12-13 | 3 | -1/+9 |
| |\ | |||||
| | * | hubzilla #475 continued - show photos in root folder. Part of Andrew's fix ↵ | zotlabs | 2017-12-12 | 2 | -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 3 | zotlabs | 2017-12-12 | 1 | -1/+5 |
| | | | |||||
| * | | Revert "try as best we can to keep the directory table (cloud list mode) ↵ | Mario Vavti | 2017-12-12 | 2 | -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_merge | zotlabs | 2017-12-12 | 19 | -38/+199 |
|\| | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-12-12 | 2 | -5/+14 |
| |\ | |||||
| | * | try as best we can to keep the directory table (cloud list mode) inside the ↵ | zotlabs | 2017-12-11 | 2 | -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 Vavti | 2017-12-11 | 5 | -10/+55 |
| |/ | | | | | | | stream items on click (we can not mark them read) | ||||
| * | sql compliance issue | zotlabs | 2017-12-10 | 2 | -2/+2 |
| | | |||||
| * | regression in channel sources delivery | zotlabs | 2017-12-10 | 1 | -2/+14 |
| | | |||||
| * | auto promote beginner (techlevel 0) accounts to level 1 after they show ↵ | zotlabs | 2017-12-10 | 1 | -1/+23 |
| | | | | | | | | signs of active participation. | ||||
| * | go back to including the photo thumbnail data in the export file. We have ↵ | zotlabs | 2017-12-10 | 1 | -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/export | zotlabs | 2017-12-10 | 3 | -11/+59 |
| | | |||||
| * | xlink_rating_text default value | zotlabs | 2017-12-09 | 1 | -1/+3 |
| | | |||||
| * | hubzilla-addons issues #73 | zotlabs | 2017-12-09 | 1 | -1/+1 |
| | | |||||
| * | strip acct: from OWA auth to API endpoints | zotlabs | 2017-12-07 | 3 | -3/+4 |
| | | |||||
| * | fix loading of theme-specific widgets | zotlabs | 2017-12-07 | 1 | -6/+13 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-07 | 5 | -7/+56 |
|\| | |||||
| * | Merge pull request #924 from dentm42/bugfix-pr922 | git-marijus | 2017-12-07 | 1 | -1/+1 |
| |\ | | | | | | | Fix 'unable to add pages with spaces' (pr 922) | ||||
| | * | Fix 'unable to add pages with spaces' (pr 922) | M.Dent | 2017-12-06 | 1 | -1/+1 |
| | | | |||||
| * | | hubzilla issue #680, implement IMoveTarget and recursive file/directory ↵ | zotlabs | 2017-12-06 | 2 | -3/+38 |
| | | | | | | | | | | | | move/rename | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-12-06 | 3 | -25/+108 |
| |\| | |||||
| * | | synchronise an attach_move operation to clones | zotlabs | 2017-12-06 | 3 | -3/+17 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-06 | 19 | -436/+206 |
|\ \ \ | | |/ | |/| | |||||
| * | | missed a spot while resolving merge conflict | Mario Vavti | 2017-12-06 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dentm42-wiki-create-missing' into dev | Mario Vavti | 2017-12-06 | 3 | -25/+108 |
| |\ \ | | |/ | |/| | |||||
| | * | resolve merge conflict | Mario Vavti | 2017-12-06 | 3 | -25/+108 |
| |/ | |||||
| * | don't force tile photos to be square, as there's no way to sensibly ↵ | zotlabs | 2017-12-05 | 1 | -8/+9 |
| | | | | | | | | auto-crop; increase the tile size slightly to compensate | ||||
| * | mod_cloud: provide a themed page with an error notification on errors ↵ | zotlabs | 2017-12-05 | 2 | -1/+25 |
| | | | | | | | | instead of an obtuse XML error structure | ||||
| * | disallow backslashes in wiki and wiki-page names | zotlabs | 2017-12-05 | 2 | -6/+18 |
| | | |||||
| * | explain what happened here | zotlabs | 2017-12-04 | 1 | -0/+3 |
| | | |||||
| * | fix mod display and others that require a non-zero profile_uid for updates | zotlabs | 2017-12-04 | 2 | -4/+9 |
| | | |||||
| * | We only require one Update module. The rest are superfluous. | zotlabs | 2017-12-04 | 11 | -393/+35 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-04 | 19 | -90/+232 |
|\| | |||||
| * | fix another PHP 7.2 warning | Mario Vavti | 2017-12-04 | 1 | -1/+1 |
| | | |||||
| * | hq template | Mario Vavti | 2017-12-04 | 1 | -0/+9 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-12-04 | 9 | -30/+145 |
| |\ | |||||
| | * | render installable elements as buttons instead of links | zotlabs | 2017-12-03 | 1 | -2/+2 |
| | | | |||||
| | * | pagetitle lost importing a pdl element from conversation | zotlabs | 2017-12-03 | 2 | -2/+4 |
| | | | |||||
| | * | js warning - getelementbyid (id doesn't exist) | zotlabs | 2017-12-03 | 1 | -1/+1 |
| | | | |||||
| | * | rename button | zotlabs | 2017-12-03 | 1 | -1/+1 |
| | | | |||||
| | * | chunked uploads for photos page | zotlabs | 2017-12-03 | 3 | -20/+136 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-12-02 | 7 | -17/+65 |
| | |\ | |||||
| | * | | remove warning for large files on cloud upload | zotlabs | 2017-12-02 | 2 | -4/+1 |
| | | | |