| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | | * | port zot_record_preferred | zotlabs | 2019-03-08 | 1 | -2/+22 | |
| | | | | | ||||||
| | | | * | It is in fact the 'Content Import' app string that needs to be translated. A ↵ | zotlabs | 2019-03-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | previous commit errantly included the string 'Content Filter'. But don't remove 'Content Filter'. That is actually a thing in Zap and will eventually make its way to Hubzilla. | |||||
| | | | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-03-07 | 2 | -0/+112 | |
| | | |/| | | |/ | |/| | ||||||
| | * | | update changelog | Mario Vavti | 2019-03-07 | 1 | -0/+1 | |
| | | | | ||||||
| | * | | Merge branch 'dev' into 'dev' | Mario | 2019-03-07 | 1 | -0/+1 | |
| | |\ \ | | | | | | | | | | | | | | | | | guest access tokens: xchan record not created on URL login See merge request hubzilla/core!1543 | |||||
| | * | | | changelog | Mario Vavti | 2019-03-06 | 1 | -0/+104 | |
| | | | | | ||||||
| | * | | | Merge branch 'patch-20190305a' into 'dev' | Mario | 2019-03-06 | 1 | -0/+7 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Add CURLOPT_CONNECTTIMEOUT See merge request hubzilla/core!1542 | |||||
| | | * | | | Add CURLOPT_CONNECTTIMEOUT | M. Dent | 2019-03-06 | 1 | -0/+7 | |
| | |/ / / | ||||||
| | * | | | Merge branch 'dev' into 'dev' | Mario | 2019-03-06 | 1 | -0/+18 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | sync recent z6 protocol change See merge request hubzilla/core!1541 | |||||
| | * \ \ \ | Merge branch 'dev' into 'dev' | Mario | 2019-03-05 | 4 | -2/+17 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | assorted minor fixes from downstream See merge request hubzilla/core!1540 | |||||
| | | | | | * | fetch private objects using delivery channel credentials | zotlabs | 2019-03-07 | 1 | -5/+28 | |
| | | | | |/ | ||||||
| | | | | * | guest access tokens: xchan record not created on URL login | zotlabs | 2019-03-06 | 1 | -0/+1 | |
| | | | |/ | ||||||
| | | | * | channel_type is not integer | zotlabs | 2019-03-05 | 1 | -5/+17 | |
| | | | | | ||||||
| | | | * | maintain compatibility with recent zot6 changes | zotlabs | 2019-03-05 | 1 | -0/+6 | |
| | | |/ | ||||||
| | | * | api_router - allow parameters as final path argument | zotlabs | 2019-03-04 | 1 | -1/+9 | |
| | | | | ||||||
| | | * | remove clones from delivery recipients for top-level posts - they will get ↵ | zotlabs | 2019-03-04 | 1 | -0/+6 | |
| | | | | | | | | | | | | | the post via clone sync | |||||
| | | * | mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash ↵ | zotlabs | 2019-03-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | and is throwing php warnings when trying to decode | |||||
| | | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-03-04 | 16 | -15761/+16056 | |
| | | |\ | | |/ | |/| | ||||||
| | * | | Merge branch 'dev' into 'dev' | Mario | 2019-03-04 | 1 | -2/+2 | |
| | |\ \ | | | | | | | | | | | | | | | | | Addressing new 'support@zotadel.net' support forum instead of old 'support@gravizot.de' See merge request hubzilla/core!1539 | |||||
| | | * | | Addressing new 'support@zotadel.net' support forum instead of old ↵ | mike | 2019-03-03 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | 'support@gravizot.de' | |||||
| | * | | | Merge branch 'core_fixes' into 'dev' | M. Dent | 2019-03-03 | 1 | -1/+1 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | while in legacy zot $sender is expected to be an array, in zot6 $sender is... See merge request hubzilla/core!1538 | |||||
| | | * | | | while in legacy zot $sender is expected to be an array, in zot6 $sender is ↵ | Mario Vavti | 2019-03-02 | 1 | -1/+1 | |
| | |/ / / | | | | | | | | | | | | | expected to be a string (xchan_hash) | |||||
| | * | | | Merge branch 'dev' into 'dev' | Mario | 2019-03-02 | 1 | -1/+1 | |
| | |\| | | | | | | | | | | | | | | | | | | Mention php-zip module dependency in administrator guide See merge request hubzilla/core!1537 | |||||
| | | * | | Mention php-zip module dependency in administrator guide | mike | 2019-03-02 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Merge branch 'patch-20190301a' into 'dev' | Mario | 2019-03-02 | 1 | -1/+1 | |
| | |\ \ \ | | |/ / | |/| | | | | | | | | | | Use sender hash See merge request hubzilla/core!1535 | |||||
| | | * | | Use sender hash | DM42.Net (Matt Dent) | 2019-03-01 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Merge branch 'js_fixes' into 'dev' | M. Dent | 2019-03-01 | 1 | -5/+11 | |
| | |\ \ \ | | |/ / | |/| | | | | | | | | | | iron out some kinks with scrollToItem() in combination with collapsed content and images See merge request hubzilla/core!1534 | |||||
| | | * | | iron out some kinks with scrollToItem() in combination with collapsed ↵ | Mario Vavti | 2019-03-01 | 1 | -5/+11 | |
| | |/ / | | | | | | | | | | content and images | |||||
| | | * | translate name of content filter (addon) app. | zotlabs | 2019-02-28 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | merge text.php and hmessages.po4.0 | Mario Vavti | 2019-03-08 | 2 | -23/+1 | |
| | | | | ||||||
| * | | | Merge branch '4.0RC' | Mario Vavti | 2019-03-08 | 172 | -19665/+24100 | |
| |\ \ \ | ||||||
| | * | | | update changelog | Mario Vavti | 2019-03-08 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | bump version | Mario Vavti | 2019-03-08 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | $sender is supposed to be string in libzot | Mario | 2019-03-08 | 1 | -12/+9 | |
| | | | | | | | | | | | | | (cherry picked from commit 507c71f64c68cc0de0f090f1abdd024866e91068) | |||||
| | * | | | fetch private objects using delivery channel credentials | zotlabs | 2019-03-08 | 1 | -5/+28 | |
| | | | | | | | | | | | | | (cherry picked from commit 1f7622e4c42bf71d1d38dd88c40c903d83a8d6c0) | |||||
| | * | | | update changelog | Mario Vavti | 2019-03-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | | (cherry picked from commit 04fe7e61deb19b9b05c87bff037b7bbf1d7bc662) | |||||
| | * | | | guest access tokens: xchan record not created on URL login | zotlabs | 2019-03-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | | (cherry picked from commit 0b2213dd41a7ef275766725c070e16f8ba94d5a5) | |||||
| | * | | | changelog | Mario Vavti | 2019-03-06 | 1 | -0/+104 | |
| | | | | | | | | | | | | | (cherry picked from commit 08725c44c6874bdbbb46649645a9ac818f0abe36) | |||||
| | * | | | bump version | Mario Vavti | 2019-03-06 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | while in legacy zot $sender is expected to be an array, in zot6 $sender is ↵ | Mario Vavti | 2019-03-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | expected to be a string (xchan_hash) (cherry picked from commit 117a8cafca6982e7d976fe00f32ecb0df66b2899) | |||||
| | * | | | Add CURLOPT_CONNECTTIMEOUT | M. Dent | 2019-03-06 | 1 | -0/+7 | |
| | | | | | | | | | | | | | (cherry picked from commit 0c05e6593e020180ca678dff6d60c095e23b34cd) | |||||
| | * | | | channel_type is not integer | zotlabs | 2019-03-06 | 1 | -5/+17 | |
| | | | | | | | | | | | | | (cherry picked from commit 26e7da0b969c834cc6c2ff7c00713c7be05cb5c4) | |||||
| | * | | | maintain compatibility with recent zot6 changes | zotlabs | 2019-03-06 | 1 | -0/+6 | |
| | | | | | | | | | | | | | (cherry picked from commit 98b1c7a38c3f3ef8ba7d36b77d9366691c3fbf15) | |||||
| | * | | | api_router - allow parameters as final path argument | zotlabs | 2019-03-05 | 1 | -1/+9 | |
| | | | | | | | | | | | | | (cherry picked from commit 47001c33039e6915f12b95a3e948caae6cf21d41) | |||||
| | * | | | remove clones from delivery recipients for top-level posts - they will get ↵ | zotlabs | 2019-03-05 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | the post via clone sync (cherry picked from commit 8e50fecccca5dd72a49869502e541db03632cd86) | |||||
| | * | | | mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash ↵ | zotlabs | 2019-03-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | and is throwing php warnings when trying to decode (cherry picked from commit 938fcdd1a6e8db47d2e66d68f8face9925bb7963) | |||||
| | * | | | translate name of content filter (addon) app. | zotlabs | 2019-03-05 | 1 | -0/+1 | |
| | | | | | | | | | | | | | (cherry picked from commit 29cb62af3dba0a6a2891800cfe97578c1a2819ae) | |||||
| | * | | | Addressing new 'support@zotadel.net' support forum instead of old ↵ | mike | 2019-03-04 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | 'support@gravizot.de' (cherry picked from commit e26de9c1d11dc8175ea520be091f0437d99ea5e0) | |||||
| | * | | | Mention php-zip module dependency in administrator guide | mike | 2019-03-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | (cherry picked from commit 747ce9b1f15d3f656ed8ca816c1790c351decec9) | |||||
| | * | | | Use sender hash | DM42.Net (Matt Dent) | 2019-03-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | (cherry picked from commit 5febc3e07dd1c1aeda68c09b4092d5d4219f39b5) | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Eilertsens Kodeknekkeri |
| aboutsummaryrefslogtreecommitdiffstats |