| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' into dark-fix-dev | phani00 | 2018-12-17 | 4 | -8/+35 |
| |\ | |||||
| | * | Merge branch 'dev' into 'dev' | Mario | 2018-12-17 | 1 | -4/+10 |
| | |\ | | | | | | | | | | | | | Keep remote site headers to respect caching policy See merge request hubzilla/core!1440 | ||||
| | | * | Keep remote site headers for caching | Max Kostikov | 2018-12-17 | 1 | -4/+10 |
| | | | | |||||
| | * | | Merge branch 'memory-warn2' into 'dev' | Mario | 2018-12-17 | 1 | -0/+5 |
| | |\ \ | | | | | | | | | | | | | | | | | add warning if upload_filesize < 4MB. See merge request hubzilla/core!1438 | ||||
| | | * | | Update Zotlabs/Module/Setup.php | phani00 | 2018-12-16 | 1 | -1/+0 |
| | | | | | |||||
| | | * | | add warning if upload_filesize < 4MB. | phani00 | 2018-12-16 | 1 | -0/+6 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-17 | 1 | -0/+15 |
| | |\ \ \ | |||||
| | | * | | | default curl to http/1.1 | zotlabs | 2018-12-16 | 1 | -0/+15 |
| | | | | | | |||||
| | | * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-13 | 10 | -438/+493 |
| | | |\ \ \ | |||||
| | * | \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-12-17 | 1 | -6/+5 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | Move SSLify code from Photo cache addon See merge request hubzilla/core!1439 | ||||
| | | * | | | | Move SSLify code from Photo cache addon | Max Kostikov | 2018-12-17 | 1 | -6/+5 |
| | |/ / / / | |||||
| | * | | | | Revert Photos.php code | Max Kostikov | 2018-12-17 | 1 | -245/+1357 |
| | | | | | | |||||
| | * | | | | SSLify cached URL on redirect if needed | Max Kostikov | 2018-12-17 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | SSLify cached URL on redirect if needed | Max Kostikov | 2018-12-17 | 1 | -1357/+245 |
| | | | | | | |||||
| * | | | | | remove my dark theme fixes. | phani00 | 2018-12-17 | 1 | -5/+8 |
| |/ / / / | |||||
| * | | | | Remove photo_cache_enable variable | Max Kostikov | 2018-12-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'patch-20181214a' into 'dev' | Mario | 2018-12-16 | 1 | -2/+10 |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed. See merge request hubzilla/core!1427 | ||||
| | * | | | Add return if no local_channel() | DM42.Net (Matt Dent) | 2018-12-15 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed. | DM42.Net (Matt Dent) | 2018-12-14 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | Merge branch 'dev' into 'dev' | M. Dent | 2018-12-15 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update OAuth2Storage.php - fix email retrieval in getUser See merge request hubzilla/core!1436 | ||||
| | * | | | | Update OAuth2Storage.php - fix email retrieval in getUser | Pascal Deklerck | 2018-12-15 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'custom-item-types' into 'dev' | Mario | 2018-12-15 | 6 | -0/+98 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add ITEM_TYPE_CUSTOM and hooks for processing custom item types See merge request hubzilla/core!1431 | ||||
| | * | | | | Add ITEM_TYPE_CUSTOM and hooks for processing custom item types | DM42.Net (Matt Dent) | 2018-12-14 | 6 | -0/+98 |
| | |/ / / | |||||
| * | | | | Merge branch 'patch-20181214f' into 'dev' | Mario | 2018-12-15 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Set min/maxversion for plugins to STD_VERSION unless otherwise specified See merge request hubzilla/core!1430 | ||||
| | * | | | | Set min/maxversion for plugins to STD_VERSION unless otherwise specified | DM42.Net (Matt Dent) | 2018-12-14 | 1 | -2/+2 |
| | |/ / / | |||||
| * | | | | Merge branch 'patch-20181214d' into 'dev' | Mario | 2018-12-15 | 3 | -2/+22 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Make Affinity Slider (optionally) 'sticky' across page loads. See merge request hubzilla/core!1429 | ||||
| | * | | | | Fix syntax error | DM42.Net (Matt Dent) | 2018-12-14 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Make Affinity Slider (optionally) 'sticky' across page loads. (default is ↵ | DM42.Net (Matt Dent) | 2018-12-14 | 3 | -2/+22 |
| | |/ / / | | | | | | | | | | | | | current behavior: reset slider with each page load) | ||||
| * | | | | fix wiki preview issue with hyperlinks | Mario Vavti | 2018-12-15 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'patch-20181214b' into 'dev' | Max Kostikov | 2018-12-14 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Recreate MR#1419 for dev branch See merge request hubzilla/core!1428 | ||||
| | * | | | | 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 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |