| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | calendar merge: use b64 encoded mid for plink | Mario Vavti | 2019-05-02 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Merge branch 'xmlify' into 'dev' | Max Kostikov | 2019-05-01 | 1 | -2/+12 | |
| | |\ \ | | | | | | | | | | | | | | | | | address xmlify/unxmlify performance issue See merge request hubzilla/core!1616 | |||||
| | | * | | address xmlify/unxmlify performance issue | Mario Vavti | 2019-05-01 | 1 | -2/+12 | |
| | | | | | ||||||
| | * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-01 | 1 | -4/+1 | |
| | |\ \ \ | | |/ / | |/| | | | | | | | | | | Use thr_parent tp handle reply on comment feature See merge request hubzilla/core!1617 | |||||
| | | * | | Preserve parent_mid with threaded comments | Max Kostikov | 2019-05-01 | 1 | -4/+1 | |
| | | | | | ||||||
| | * | | | Merge branch 'dev' into 'dev' | Mario | 2019-05-01 | 2 | -1/+12 | |
| | |\| | | | | | | | | | | | | | | | | | | Add 'reply on comment' feature See merge request hubzilla/core!1614 | |||||
| | | * | | Add 'reply on comment' feature | Max Kostikov | 2019-04-29 | 1 | -0/+8 | |
| | | | | | | | | | | | | | (cherry picked from commit 80ca2023aa67ef7c0c43414acaf135e5748044b2) | |||||
| | | * | | Add initial threaded comment support | Max Kostikov | 2019-04-29 | 1 | -2/+5 | |
| | | | | | ||||||
| * | | | | fix item query | zotlabs | 2019-05-02 | 1 | -1/+1 | |
| | |_|/ |/| | | ||||||
| * | | | when removed items for unfriended connections, check if the parent has been ↵ | zotlabs | 2019-05-02 | 1 | -3/+20 | |
| |/ / | | | | | | | retained, not just the item | |||||
| * | | possible sql performance improvement | Mario Vavti | 2019-04-27 | 1 | -1/+1 | |
| | | | ||||||
| * | | import/export zot6 hublocs+xchans | Zot | 2019-04-26 | 1 | -0/+7 | |
| | | | ||||||
| * | | hubloc confusion in magic auth | Zot | 2019-04-25 | 3 | -21/+60 | |
| | | | ||||||
| * | | Fix infinite loop using postgres as backend | Daniel Lowe | 2019-04-21 | 1 | -12/+6 | |
| | | | | | | | | | | | | | unescapebin is handed a string in some cases, and it causes an infinite loop when it does. This ensures that the argument is a resource before loading its contents. | |||||
| * | | Merge branch 'dev' into calendar_merge | Mario Vavti | 2019-04-19 | 1 | -1/+6 | |
| |\ \ | ||||||
| | * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-15 | 5 | -46/+92 | |
| | |\| | ||||||
| | * | | add attachments to zot6 event objects, add zot6 to federated transports ↵ | zotlabs | 2019-04-15 | 1 | -1/+6 | |
| | | | | | | | | | | | | | (webfinger) | |||||
| * | | | calendar merge initial commit | Mario Vavti | 2019-04-19 | 1 | -0/+4 | |
| | |/ |/| | ||||||
| * | | Update xchan profile edited date only once | Max Kostikov | 2019-04-13 | 1 | -9/+10 | |
| | | | ||||||
| * | | Set 'os_syspath' with local path | Max Kostikov | 2019-04-12 | 1 | -1/+2 | |
| | | | ||||||
| * | | Override received 'content' if we saving thumbnail in filesystem | Max Kostikov | 2019-04-12 | 1 | -0/+1 | |
| | | | ||||||
| * | | Fix 'os_syspath' if we store thumbnails in filesystem | Max Kostikov | 2019-04-12 | 1 | -1/+3 | |
| | | | ||||||
| * | | Add comment on required changes in upcoming releases | Max Kostikov | 2019-04-12 | 1 | -31/+47 | |
| | | | ||||||
| * | | Store thumbnails in filesystem or database | Max Kostikov | 2019-04-12 | 1 | -6/+3 | |
| | | | ||||||
| * | | Fetch thumbnails and store it in filesystem or DB; update xchan profile edit ↵ | Max Kostikov | 2019-04-12 | 1 | -4/+22 | |
| | | | | | | | | | time on fetch | |||||
| * | | Fix use UNIX socket file to connect DB | Max Kostikov | 2019-04-10 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-04-10 | 1 | -4/+12 | |
| |\| | | | | | | | | | Dev See merge request hubzilla/core!1586 | |||||
| | * | Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev | zotlabs | 2019-04-07 | 1 | -8/+0 | |
| | |\ | ||||||
| | * | | permissions cleanup | zotlabs | 2019-04-05 | 1 | -4/+12 | |
| | | | | ||||||
| * | | | Revert "Update htconfig.sample.php" | Max Kostikov | 2019-04-10 | 2 | -5/+15 | |
| | |/ |/| | | | | | This reverts commit f2126ef18c8b66020305d07dcefeacc4e55a3c12 | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-04-06 | 1 | -3/+3 | |
| |\| | | | | | | | | | security: perms_pending not evaluated correctly See merge request hubzilla/core!1583 | |||||
| | * | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-04-05 | 1 | -3/+3 | |
| | |\ | ||||||
| | | * | security: perms_pending not evaluated correctly | zotlabs | 2019-04-05 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Remove suggest channels from features | Mario | 2019-04-02 | 1 | -8/+0 | |
| |/ / | ||||||
| * | | check service class limits when syncing files | zotlabs | 2019-03-30 | 1 | -0/+14 | |
| | | | ||||||
| * | | Merge branch 'z6_discover_fixes' into 'dev' | Max Kostikov | 2019-03-29 | 1 | -4/+6 | |
| |\ \ | | | | | | | | | | | | | fix various issues in z6_discover() and add zot6 hubloc creation on channel import See merge request hubzilla/core!1575 | |||||
| | * | | another fix for z6_discover() and create a zot6 hubloc if applicable | Mario Vavti | 2019-03-28 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | fix various issues in z6_discover() | Mario Vavti | 2019-03-27 | 1 | -3/+5 | |
| | | | | ||||||
| * | | | Fix wrong bracket | Max Kostikov | 2019-03-27 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Fix wrong permissions on attached images in personal messages | Max Kostikov | 2019-03-27 | 1 | -2/+2 | |
| |/ / | ||||||
| * | | if we have an uuid deduplicate by uuid otherwise by mid | Mario Vavti | 2019-03-25 | 1 | -5/+15 | |
| | | | ||||||
| * | | fix wrong field name | Mario Vavti | 2019-03-24 | 1 | -2/+2 | |
| | | | ||||||
| * | | Revert "item_store(): deduplicate by mid OR uuid" | Mario Vavti | 2019-03-24 | 1 | -2/+1 | |
| | | | | | | | | | This reverts commit d8ce0d0df0b7b58b3f2a1abfc26f455fb943f8ea. | |||||
| * | | item_store(): deduplicate by mid OR uuid | Mario Vavti | 2019-03-24 | 1 | -1/+2 | |
| | | | ||||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-03-21 | 1 | -0/+1 | |
| |\ \ | | | | | | | | | | | | | hubzilla core issue #1356 , permissions not getting decrypted on follow See merge request hubzilla/core!1563 | |||||
| | * | | hubzilla core issue #1356 , permissions not getting decrypted on follow | zotlabs | 2019-03-20 | 1 | -0/+1 | |
| | |/ | ||||||
| * | | another whitespace to trigger tests | Mario Vavti | 2019-03-21 | 1 | -1/+0 | |
| | | | ||||||
| * | | just whitespace to trigger a new build test | Mario Vavti | 2019-03-20 | 1 | -1/+0 | |
| | | | ||||||
| * | | Video | Mario | 2019-03-20 | 1 | -0/+22 | |
| |/ | ||||||
| * | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-03-18 | 1 | -2/+6 | |
| |\ | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |