aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-0386-1091/+3064
|\
| * quickfix for es-es languageMario Vavti2018-12-031-2/+2
| * changelogMario Vavti2018-12-031-0/+18
| * more notifications fixesMario Vavti2018-12-033-6/+6
| * catch exception if readImageBlob() receives bogus dataMario Vavti2018-12-031-3/+7
| * Merge branch 'photocache' into 'dev'Max Kostikov2018-12-031-13/+18
| |\
| | * Add Expires field supportMax Kostikov2018-12-031-11/+16
| | * Add flag to allow to save image without validationMax Kostikov2018-12-021-2/+2
| * | Merge branch 'photocache' into 'dev'M. Dent2018-12-027-38/+132
| |\|
| | * Remove local_channel() check on cache_body_hook callMax Kostikov2018-12-021-9/+7
| | * Check local_channel() before cache callMax Kostikov2018-11-301-6/+8
| | * Move cache code to addonMax Kostikov2018-11-301-17/+7
| | * Fix wrong parameterMax Kostikov2018-11-291-4/+3
| | * Update text.phpMax Kostikov2018-11-291-5/+0
| | * Better cache settings logicMax Kostikov2018-11-291-4/+4
| | * Skip sslify for images if it already were cached with https enabledMax Kostikov2018-11-291-1/+6
| | * Update text.phpMax Kostikov2018-11-291-1/+2
| | * Cache for viewer channelMax Kostikov2018-11-291-5/+4
| | * Disable links to cached photos for non logged viewersMax Kostikov2018-11-291-1/+1
| | * Code cleanupMax Kostikov2018-11-291-3/+3
| | * Update text.phpMax Kostikov2018-11-291-2/+2
| | * Add photo cache support using sslify()Max Kostikov2018-11-291-6/+27
| | * Add photo cache hooksMax Kostikov2018-11-291-33/+57
| | * Add photo cache cleanupMax Kostikov2018-11-291-0/+23
| | * Update database with expires field for photoMax Kostikov2018-11-291-0/+32
| | * Add expires for photoMax Kostikov2018-11-291-0/+2
| | * Add expires for photoMax Kostikov2018-11-291-0/+2
| | * Add PHOTO_CACHE photo typeMax Kostikov2018-11-291-1/+2
| * | fallback to url if we have not got an addrMario Vavti2018-12-021-1/+1
| * | fix filtering by addr in handleNotificationsItems()Mario Vavti2018-12-022-2/+3
| * | Merge branch 'pdf_embed_fixes' into 'dev'M. Dent2018-12-021-1/+5
| |\ \
| | * | make pdf preview 100% width and 300px height to match it openstreetmaps previewMario Vavti2018-12-011-1/+5
| | |/
| * | Merge branch 'sticky_aside_fixes' into 'dev'M. Dent2018-12-021-3/+3
| |\ \
| | * | redbasic sticky aside fixesMario Vavti2018-12-011-3/+3
| | |/
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-017-12/+52
| |\ \ | | |/ | |/|
| * | Merge branch 'es-es' into 'dev'M. Dent2018-11-281-14/+21
| |\ \
| | * \ Merge branch 'cherry-pick-5ac08ec3' into 'es-es'Manuel Jiménez Friaza2018-11-261-14/+21
| | |\ \
| | | * | Revision 1 doc/es-es/about/about.bbManuel Jiménez Friaza2018-11-261-14/+21
| | |/ /
| * | | Merge branch 'default2flex-conversion' into 'dev'M. Dent2018-11-283-17/+35
| |\ \ \
| | * | | use flex for the default templateMario2018-11-263-17/+35
| * | | | Merge branch 'composer-updates' into 'dev'M. Dent2018-11-2819-118/+139
| |\ \ \ \
| | * | | | update jquery-file-upload and psr-log via composerMario2018-11-2521-175/+164
| * | | | | Merge branch 'update-imagesloaded' into 'dev'M. Dent2018-11-2840-98/+1870
| |\ \ \ \ \
| | * | | | | update imagesloaded to version 4.1.4 via composerMario2018-11-2540-98/+1870
| | |/ / / /
| * | | | | Merge branch 'pg-fixes' into 'dev'M. Dent2018-11-281-2/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | fix db upgrade 1228 for postgresMario2018-11-221-2/+2
| * | | | | Merge branch 'patch-20181120a' into 'dev'Mario2018-11-251-0/+5
| |\ \ \ \ \
| | * | | | | Do not store serialized pconfig value received via to Module/Pconfig.phpM. Dent2018-11-251-0/+5
| |/ / / / /
| * | | | | Merge branch 'es-es' into 'dev'Mario2018-11-242-27/+27
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| | * | | Update es-esManuel Jiménez Friaza2018-11-242-27/+27