aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'photocache' into 'dev'M. Dent2018-12-027-38/+132
|\ | | | | | | | | Add Photo Cache addon support See merge request hubzilla/core!1412
| * 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
| | | | | | (cherry picked from commit a3ba7f0788705a6ebee57433e80712b282b0e784)
* | fix filtering by addr in handleNotificationsItems()Mario Vavti2018-12-022-2/+3
| | | | | | (cherry picked from commit f083c0cba10248926661db42d99d04b5eb7579e8)
* | 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 preview See merge request hubzilla/core!1414
| * | 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 fixes See merge request hubzilla/core!1415
| * | redbasic sticky aside fixesMario Vavti2018-12-011-3/+3
| |/
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-017-12/+52
|\ \ | |/ |/|
| * typozotlabs2018-11-301-1/+1
| |
| * allow notification filtering by name or addrzotlabs2018-11-304-8/+16
| |
| * attached photo permissions regressionzotlabs2018-11-301-4/+4
| |
| * prevent incompatible export files (osada/zap) from being imported. This is ↵zotlabs2018-11-272-0/+32
| | | | | | | | to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible
* | Merge branch 'es-es' into 'dev'M. Dent2018-11-281-14/+21
|\ \ | | | | | | | | | | | | Revision 1 doc/es-es/about/about.bb See merge request hubzilla/core!1410
| * \ Merge branch 'cherry-pick-5ac08ec3' into 'es-es'Manuel Jiménez Friaza2018-11-261-14/+21
| |\ \ | | | | | | | | | | | | | | | | Revision 1 doc/es-es/about/about.bb See merge request mjfriaza/core!3
| | * | Revision 1 doc/es-es/about/about.bbManuel Jiménez Friaza2018-11-261-14/+21
| |/ / | | | | | | (cherry picked from commit 5ac08ec3aa8ede14141390670a8097a60769e11e)
* | | Merge branch 'default2flex-conversion' into 'dev'M. Dent2018-11-283-17/+35
|\ \ \ | | | | | | | | | | | | | | | | use flex for the default template See merge request hubzilla/core!1409
| * | | 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 composer See merge request hubzilla/core!1408
| * | | | 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 composer See merge request hubzilla/core!1407
| * | | | | 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 postgres See merge request hubzilla/core!1403
| * | | | 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.php See merge request hubzilla/core!1402
| * | | | | 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-es See merge request hubzilla/core!1406
| * | | Update es-esManuel Jiménez Friaza2018-11-242-27/+27
| | | |
| * | | Resolved merge conflictsManuel Jiménez Friaza2018-11-2454-1060/+1770
| |\ \ \ | |/ / / |/| | |
* | | | Merge remote-tracking branch 'mike/master' into devMario2018-11-231-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Organization actor type was missingzotlabs2018-11-231-1/+1
| | | |
* | | | Merge remote-tracking branch 'mike/master' into devMario2018-11-233-18/+20
|\| | | | |_|/ |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 21:23:58 +0000