Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Recreate MR#1419 for dev branch | DM42.Net (Matt Dent) | 2018-12-14 | 1 | -1/+1 | |
| |/ / / | ||||||
* / / / | update changelog | Mario Vavti | 2018-12-14 | 1 | -0/+12 | |
|/ / / | ||||||
* | | | fix issue with linkdropper | Mario Vavti | 2018-12-14 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-14 | 5 | -47/+94 | |
|\| | | |/ |/| | ||||||
| * | regression: the ability to order apps messed up since adding pinned apps to ↵ | zotlabs | 2018-12-12 | 5 | -47/+94 | |
| | | | | | | | | the ordering | |||||
* | | Merge branch 'fix_photo_imagick' into 'dev' | Max Kostikov | 2018-12-11 | 1 | -0/+1 | |
|\ \ | | | | | | | | | | | | | return on readImageBlob() exception See merge request hubzilla/core!1426 | |||||
| * | | return on readImageBlob() exception | Mario Vavti | 2018-12-11 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge branch 'photo-hook' into 'dev' | M. Dent | 2018-12-10 | 4 | -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 Vavti | 2018-12-10 | 4 | -3/+16 | |
| | | | | | | | | | | | | variable which resultet in a javascript error | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-10 | 5 | -3/+53 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | home notifications won't expand if there are more than 300 unseen network ↵ | zotlabs | 2018-12-09 | 1 | -2/+4 | |
| | | | | | | | | | | | | notifications ahead of them. | |||||
| * | | rmagic discovery for z6 networks | zotlabs | 2018-12-09 | 3 | -0/+48 | |
| | | | ||||||
| * | | total_identities restriction off by one | zotlabs | 2018-12-09 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'dark-theme-dev' into 'dev' | M. Dent | 2018-12-10 | 1 | -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 readable | phani00 | 2018-12-10 | 1 | -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 dev | Mario Vavti | 2018-12-06 | 1 | -2/+1 | |
|\| | | |/ |/| | ||||||
| * | reset page title if article has no title. | zotlabs | 2018-12-05 | 1 | -2/+1 | |
| | | ||||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-12-04 | 3 | -420/+445 | |
|\ \ | | | | | | | | | | | | | Add strings to Russian translation See merge request hubzilla/core!1418 | |||||
| * | | Update hstrings.php | Max Kostikov | 2018-12-04 | 1 | -20/+26 | |
| | | | ||||||
| * | | Update hmessages.po | Max Kostikov | 2018-12-04 | 1 | -399/+418 | |
| | | | ||||||
| * | | Create plink depending on message id format | Max Kostikov | 2018-11-30 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-12-04 | 1 | -15/+12 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Merge branch 'photocache' into 'dev' | Mario | 2018-12-04 | 1 | -15/+12 | |
| |\ \ | | | | | | | | | | | | | | | | | Less dependence on cache logic See merge request hubzilla/core!1417 | |||||
| | * | | Update Photo.php | Max Kostikov | 2018-12-03 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Update Photo.php | Max Kostikov | 2018-12-03 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Update Photo.php | Max Kostikov | 2018-12-03 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | New logic for less dependence on cache logic | Max Kostikov | 2018-12-03 | 1 | -15/+12 | |
| | | | | ||||||
* | | | | partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 ↵ | zotlabs | 2018-12-03 | 3 | -0/+12 | |
| | | | | | | | | | | | | | | | | version will be stored under $item['obj']['asld'] | |||||
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-03 | 86 | -1091/+3064 | |
|\| | | | ||||||
| * | | | quickfix for es-es language | Mario Vavti | 2018-12-03 | 1 | -2/+2 | |
| | | | | | | | | | | | | (cherry picked from commit 6b68a76bbe2869c505e4c12d2b25ceb59d3ab813) | |||||
| * | | | changelog | Mario Vavti | 2018-12-03 | 1 | -0/+18 | |
| | | | | | | | | | | | | (cherry picked from commit 88486a127849080222f5e6d5f8cb38af624413fe) | |||||
| * | | | more notifications fixes | Mario Vavti | 2018-12-03 | 3 | -6/+6 | |
| | | | | | | | | | | | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e) | |||||
| * | | | catch exception if readImageBlob() receives bogus data | Mario Vavti | 2018-12-03 | 1 | -3/+7 | |
| | | | | | | | | | | | | (cherry picked from commit 443d7684dbe8c1c3540df5aeb719403d67789747) | |||||
| * | | | Merge branch 'photocache' into 'dev' | Max Kostikov | 2018-12-03 | 1 | -13/+18 | |
| |\| | | | | | | | | | | | | | | | | | | Add flag to allow to save image without validation See merge request hubzilla/core!1416 | |||||
| | * | | Add Expires field support | Max Kostikov | 2018-12-03 | 1 | -11/+16 | |
| | | | | ||||||
| | * | | Add flag to allow to save image without validation | Max Kostikov | 2018-12-02 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch 'photocache' into 'dev' | M. Dent | 2018-12-02 | 7 | -38/+132 | |
| |\| | | | | | | | | | | | | | | | | | | Add Photo Cache addon support See merge request hubzilla/core!1412 | |||||
| | * | | Remove local_channel() check on cache_body_hook call | Max Kostikov | 2018-12-02 | 1 | -9/+7 | |
| | | | | ||||||
| | * | | Check local_channel() before cache call | Max Kostikov | 2018-11-30 | 1 | -6/+8 | |
| | | | | ||||||
| | * | | Move cache code to addon | Max Kostikov | 2018-11-30 | 1 | -17/+7 | |
| | | | | ||||||
| | * | | Fix wrong parameter | Max Kostikov | 2018-11-29 | 1 | -4/+3 | |
| | | | | ||||||
| | * | | Update text.php | Max Kostikov | 2018-11-29 | 1 | -5/+0 | |
| | | | | ||||||
| | * | | Better cache settings logic | Max Kostikov | 2018-11-29 | 1 | -4/+4 | |
| | | | | ||||||
| | * | | Skip sslify for images if it already were cached with https enabled | Max Kostikov | 2018-11-29 | 1 | -1/+6 | |
| | | | | ||||||
| | * | | Update text.php | Max Kostikov | 2018-11-29 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | Cache for viewer channel | Max Kostikov | 2018-11-29 | 1 | -5/+4 | |
| | | | | ||||||
| | * | | Disable links to cached photos for non logged viewers | Max Kostikov | 2018-11-29 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Code cleanup | Max Kostikov | 2018-11-29 | 1 | -3/+3 | |
| | | | | ||||||
| | * | | Update text.php | Max Kostikov | 2018-11-29 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Add photo cache support using sslify() | Max Kostikov | 2018-11-29 | 1 | -6/+27 | |
| | | | |