aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* resolve merge conflictMario Vavti2019-04-201-0/+1
|\
| * Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-0/+1
| |\
| | * Add translation to update buttonMax Kostikov2019-04-191-0/+1
* | | Merge branch 'dev' into calendar_mergeMario Vavti2019-04-191-4/+30
|\| |
| * | Merge branch 'dev' into 'dev'Mario2019-04-191-4/+30
| |\|
| | * Add remove profile photo buttonMax Kostikov2019-04-191-4/+30
* | | provide location and description informationMario Vavti2019-04-192-6/+13
* | | provide link to source and some cleanupMario Vavti2019-04-193-140/+4
* | | Merge branch 'dev' into calendar_mergeMario Vavti2019-04-193-32/+15
|\| |
| * | Merge branch 'dev' into 'dev'Mario2019-04-191-1/+1
| |\ \
| | * | required php version not available but allowed to continuezotlabs2019-04-181-1/+1
| * | | Merge branch 'dev' into 'dev'Mario2019-04-191-30/+13
| |\ \ \ | | | |/ | | |/|
| | * | Update Photo.phpMax Kostikov2019-04-181-1/+1
| | * | Update Photo.phpMax Kostikov2019-04-181-2/+4
| | * | Implement ETag: header support for cache controlMax Kostikov2019-04-181-15/+14
| | * | Add 'must-revalidate' to Cache-control header for profile photosMax Kostikov2019-04-171-1/+4
| | * | Precise 'Modified:' header processing if no profile photo added; remove dupli...Max Kostikov2019-04-171-29/+8
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-181-1/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-155-72/+152
| | |\
| | * | add attachments to zot6 event objects, add zot6 to federated transports (webf...zotlabs2019-04-151-1/+1
* | | | calendar merge initial commitMario Vavti2019-04-193-5/+803
|/ / /
* | / Fix file path with filesystem storageMax Kostikov2019-04-161-1/+1
| |/ |/|
* | Merge branch 'dev' into 'dev'Mario2019-04-133-40/+60
|\ \
| * | Update photo usage only for thumbnailsMax Kostikov2019-04-131-1/+1
| * | Add multiple profiles support on image operations in photo driverMax Kostikov2019-04-121-5/+8
| * | 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
* | | 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-102-34/+60
|\|
| * typozotlabs2019-04-081-1/+1
| * missing endTime on Zot6 encoded events, optimise the url fetch of embedphotoszotlabs2019-04-082-34/+60
* | Revert "Update htconfig.sample.php"Max Kostikov2019-04-102-2/+33
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-04-071-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
| * Prevent return wrong profile photo modification date by pluginMax Kostikov2019-04-051-21/+23
* | enable list viewsMario Vavti2019-04-061-0/+2
* | upgrade cdav calendar to version 4Mario Vavti2019-04-061-28/+53
|/
* Skip removal if no cover image foundMax Kostikov2019-04-041-6/+7
* Sync cover photo removal with clonesMax Kostikov2019-04-031-2/+13
* Fix sync cover photo for clonned channelsMax Kostikov2019-04-031-2/+5
* Revert "Revert "suggestion widget using feature_enabled still - upgrade to us...Mario2019-04-021-2/+4
* Revert "suggestion widget using feature_enabled still - upgrade to use apps."Mario2019-04-021-4/+2
* Add text to cover remove buttonMax Kostikov2019-04-011-0/+1
* Merge branch 'dev' into 'dev'Mario2019-04-011-0/+10
|\
| * Add remove cover photo processingMax Kostikov2019-03-301-0/+10
* | Merge branch 'dev' of ../hz into devzotlabs2019-03-312-3/+5
|\ \
| * | suggestion widget using feature_enabled still - upgrade to use apps.zotlabs2019-03-311-2/+4