aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | 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
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| |
| * | | | | more mergingzotlabs2018-12-031-9/+67
| * | | | | more work on z6 commentingzotlabs2018-12-033-64/+268
| * | | | | fix generated plinkzotlabs2018-12-031-3/+3
| | |_|_|/ | |/| | |
| * | | | 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 to...zotlabs2018-11-272-0/+32
* | | | | Revision 1 doc/es-es/about/about.bbManuel Jiménez Friaza2018-11-261-14/+21
| |_|/ / |/| | |
* | | | 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
| |\| | | | |/ | |/|
| | * use uuid in file storagezotlabs2018-11-222-3/+3
| | * fix mastodon tag notifications (again)zotlabs2018-11-211-15/+17
| * | Merge remote-tracking branch 'mike/master' into devMario2018-11-223-5/+8
| |\|
| | * no mention notifications from mastodon (and pleroma)zotlabs2018-11-212-5/+5
| | * use this form insteadzotlabs2018-11-191-2/+1
| | * push recent changeszotlabs2018-11-193-2/+6
| * | fix call to undefined functionMario Vavti2018-11-211-1/+1
| * | Merge branch 'dev' into 'dev'Mario2018-11-202-712/+693
| |\ \
| | * | Replace hmessages.poMax Kostikov2018-11-191-688/+673
| | * | Replace hstrings.phpMax Kostikov2018-11-191-24/+20
| * | | Revert "Fix return on wrong sotred in Content-Length size for full size photos"Mario2018-11-191-4/+2
| * | | Revert "Add filesize for streaming content"Mario2018-11-191-1/+0
| * | | changelogMario Vavti2018-11-191-0/+9