aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-145-47/+94
|\
| * regression: the ability to order apps messed up since adding pinned apps to ↵zotlabs2018-12-125-47/+94
| | | | | | | | the ordering
* | Merge branch 'fix_photo_imagick' into 'dev'Max Kostikov2018-12-111-0/+1
|\ \ | | | | | | | | | | | | return on readImageBlob() exception See merge request hubzilla/core!1426
| * | return on readImageBlob() exceptionMario Vavti2018-12-111-0/+1
|/ /
* | Merge branch 'photo-hook' into 'dev'M. Dent2018-12-104-3/+16
|\ \ | | | | | | | | | | | | add photo_view_filter hook and fix minor issue with unset auto_save_draft… See merge request hubzilla/core!1425
| * | add photo_view_filter hook and fix minor issue with unset auto_save_draft ↵Mario Vavti2018-12-104-3/+16
| | | | | | | | | | | | variable which resultet in a javascript error
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-105-3/+53
|\ \ \ | | |/ | |/|
| * | home notifications won't expand if there are more than 300 unseen network ↵zotlabs2018-12-091-2/+4
| | | | | | | | | | | | notifications ahead of them.
| * | rmagic discovery for z6 networkszotlabs2018-12-093-0/+48
| | |
| * | total_identities restriction off by onezotlabs2018-12-091-1/+1
| | |
* | | Merge branch 'dark-theme-dev' into 'dev'M. Dent2018-12-101-0/+19
|\ \ \ | | | | | | | | | | | | | | | | change redbasic dark schema to make categories and highlights readable See merge request hubzilla/core!1424
| * | | change redbasic dark schema to make categories and highlights readablephani002018-12-101-0/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | additions to /view/theme/redbasic/schema/dark.css to change the appearance of category badges and highlighted text ([hl]...[/hl]). hl text changed from master: it's not 'strong' anymore. commented out the pseudo-class selector that works in master but not in dev anymore.
* | / Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-061-2/+1
|\| | | |/ |/|
| * reset page title if article has no title.zotlabs2018-12-051-2/+1
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2018-12-043-420/+445
|\ \ | | | | | | | | | | | | Add strings to Russian translation See merge request hubzilla/core!1418
| * | Update hstrings.phpMax Kostikov2018-12-041-20/+26
| | |
| * | Update hmessages.poMax Kostikov2018-12-041-399/+418
| | |
| * | Create plink depending on message id formatMax Kostikov2018-11-301-1/+1
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-12-041-15/+12
|\ \ \ | |_|/ |/| |
| * | Merge branch 'photocache' into 'dev'Mario2018-12-041-15/+12
| |\ \ | | | | | | | | | | | | | | | | Less dependence on cache logic See merge request hubzilla/core!1417
| | * | Update Photo.phpMax Kostikov2018-12-031-1/+1
| | | |
| | * | Update Photo.phpMax Kostikov2018-12-031-1/+1
| | | |
| | * | Update Photo.phpMax Kostikov2018-12-031-1/+1
| | | |
| | * | New logic for less dependence on cache logicMax Kostikov2018-12-031-15/+12
| | | |
* | | | partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 ↵zotlabs2018-12-033-0/+12
| | | | | | | | | | | | | | | | version will be stored under $item['obj']['asld']
* | | | 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
| | | | | | | | | | | | (cherry picked from commit 6b68a76bbe2869c505e4c12d2b25ceb59d3ab813)
| * | | changelogMario Vavti2018-12-031-0/+18
| | | | | | | | | | | | (cherry picked from commit 88486a127849080222f5e6d5f8cb38af624413fe)
| * | | more notifications fixesMario Vavti2018-12-033-6/+6
| | | | | | | | | | | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e)
| * | | catch exception if readImageBlob() receives bogus dataMario Vavti2018-12-031-3/+7
| | | | | | | | | | | | (cherry picked from commit 443d7684dbe8c1c3540df5aeb719403d67789747)
| * | | Merge branch 'photocache' into 'dev'Max Kostikov2018-12-031-13/+18
| |\| | | | | | | | | | | | | | | | | | Add flag to allow to save image without validation See merge request hubzilla/core!1416
| | * | 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
| |\| | | | | | | | | | | | | | | | | | 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
| | | |