aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Max Kostikov2019-04-182-2/+7
|\
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-15156-14399/+42049
| |\
| * | add attachments to zot6 event objects, add zot6 to federated transports (webf...zotlabs2019-04-152-2/+7
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-161-1/+1
|\ \ \
| * | | Fix file path with filesystem storageMax Kostikov2019-04-161-1/+1
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-161-11/+5
|\| | | | |_|/ |/| |
| * | Use base image content instead of os_path; fix base images statsMax Kostikov2019-04-161-11/+5
* | | Merge branch 'dev' into 'dev'Mario2019-04-151-37/+58
|\ \ \ | |/ / |/| |
| * | Extending GitLab CI/CD.Klaus Weidenbach2019-04-131-37/+58
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-151-1/+1
|\ \ \
| * | | Update INSTALL.txtMax Kostikov2019-04-151-1/+1
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-153-14110/+14263
|\| | |
| * | | Update Russian hstrings.phpMax Kostikov2019-04-151-2785/+2792
| * | | Update Russian hmessages.poMax Kostikov2019-04-151-11324/+11470
| * | | Fix space in plurals regexpMax Kostikov2019-04-151-1/+1
* | | | Add command line tool for thumbnails storage convertionMax Kostikov2019-04-141-0/+137
* | | | Merge branch 'dev' into 'dev'Mario2019-04-136-81/+137
|\| | | | |/ / |/| |
| * | Update photo usage only for thumbnailsMax Kostikov2019-04-131-1/+1
| * | Update xchan profile edited date only onceMax Kostikov2019-04-131-9/+10
| * | Set 'os_syspath' with local pathMax Kostikov2019-04-121-1/+2
| * | Override received 'content' if we saving thumbnail in filesystemMax Kostikov2019-04-121-0/+1
| * | Add multiple profiles support on image operations in photo driverMax Kostikov2019-04-121-5/+8
| * | Fix 'os_syspath' if we store thumbnails in filesystemMax Kostikov2019-04-121-1/+3
| * | Save profile photo in filesystem or database; more precise modification time ...Max Kostikov2019-04-121-21/+35
| * | Save cover photo thumbnails in filesystem or databaseMax Kostikov2019-04-121-15/+19
| * | Add comment on required changes in upcoming releasesMax Kostikov2019-04-121-31/+47
| * | Store thumbnails in filesystem or databaseMax Kostikov2019-04-121-6/+3
| * | Fetch thumbnails and store it in filesystem or DB; update xchan profile edit ...Max Kostikov2019-04-121-4/+22
* | | Merge branch 'dev' into 'dev'Mario2019-04-122-2/+2
|\| |
| * | Update comment htconfig.sample.phpMax Kostikov2019-04-101-1/+1
| * | Fix use UNIX socket file to connect DBMax Kostikov2019-04-101-1/+1
* | | Fix wrong image resolution selectionMax Kostikov2019-04-101-2/+3
* | | Fix image scale on thumbnail saveMax Kostikov2019-04-101-1/+2
|/ /
* | Merge branch 'dev' into 'dev'Mario2019-04-103-38/+72
|\|
| * typozotlabs2019-04-081-1/+1
| * missing endTime on Zot6 encoded events, optimise the url fetch of embedphotoszotlabs2019-04-082-34/+60
| * Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devzotlabs2019-04-075-35/+57
| |\
| * | permissions cleanupzotlabs2019-04-051-4/+12
* | | Merge branch 'dev' into 'dev'Mario2019-04-104-7/+48
|\ \ \
| * | | Revert "Update htconfig.sample.php"Max Kostikov2019-04-104-7/+48
|/ / /
* | | more changelogMario Vavti2019-04-081-0/+1
* | | changelog and version bumpMario Vavti2019-04-082-1/+24
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-04-072-24/+27
|\ \ \ | | |/ | |/|
| * | Merge branch 'dev' into 'dev'Mario2019-04-061-3/+3
| |\|
| | * Merge branch 'dev' of ../hz into devzotlabs2019-04-051-3/+3
| | |\
| | | * security: perms_pending not evaluated correctlyzotlabs2019-04-051-3/+3
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-051-21/+24
| |\ \ \
| | * | | Update Photo.phpMax Kostikov2019-04-051-5/+5
| | * | | Update Photo.phpMax Kostikov2019-04-051-1/+1
| | * | | Update Photo.phpMax Kostikov2019-04-051-3/+4