| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-11 | 1 | -1/+1 | |
| |\ | | | | | | | | | Replace photo URL for gallery on clonned channel post sync See merge request hubzilla/core!1645 | |||||
| | * | Replace photo URL for gallery on clonned channel post sync | Max Kostikov | 2019-05-11 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-05-11 | 1 | -5/+7 | |
| |\ \ | | | | | | | | | | | | | use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendered... See merge request hubzilla/core!1644 | |||||
| | * | | use 'cache' flag to bbcode() on content destined for Zot6. We've seen ↵ | zotlabs | 2019-05-09 | 1 | -5/+7 | |
| | | | | | | | | | | | | | rendered map HTML in a couple of places and these should never be rendered for outgoing content as they will only be purified on the other end. | |||||
| * | | | calendar merge: implement channel calendar import in cdav/calendar | Mario Vavti | 2019-05-10 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | calendar merge: cleanup and comment out some unused code | Mario Vavti | 2019-05-09 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-08 | 1 | -6/+5 | |
| |\| | | | | | | | | | Replace own image URL in clonned channel posts See merge request hubzilla/core!1638 | |||||
| | * | Replace own image URL in clonned channel posts | Max Kostikov | 2019-05-08 | 1 | -6/+5 | |
| | | | ||||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-05-06 | 1 | -7/+8 | |
| |\ \ | |/ |/| | | | | | possible xchan confusion include/follow See merge request hubzilla/core!1635 | |||||
| | * | review of last commit | zotlabs | 2019-05-06 | 1 | -2/+2 | |
| | | | ||||||
| | * | possible xchan (protocol) confusion in include/follow | zotlabs | 2019-05-06 | 1 | -5/+6 | |
| | | | ||||||
| * | | Remove 'os_syspath' from direct 'photo' table update | Max Kostikov | 2019-05-06 | 1 | -1/+0 | |
| | | | ||||||
| * | | Add arrows to scroll between related comments | Max Kostikov | 2019-05-05 | 1 | -0/+1 | |
| |/ | ||||||
| * | found another case where channel_r_photos could get referenced | zotlabs | 2019-05-04 | 1 | -1/+1 | |
| | | ||||||
| * | strip obsolete channel_(rw)_photos from channel sync packets | zotlabs | 2019-05-03 | 1 | -1/+2 | |
| | | ||||||
| * | removing items from ex-connections turns out to be more complicated than ↵ | zotlabs | 2019-05-03 | 1 | -3/+13 | |
| | | | | | originally envisioned | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-05-03 | 3 | -3/+21 | |
| |\ | ||||||
| | * | Merge branch 'unfriend_delete_posts_bug' into 'dev' | Mario | 2019-05-03 | 1 | -3/+20 | |
| | |\ | | | | | | | | | | | | | Unfriend delete posts bug See merge request hubzilla/core!1624 | |||||
| | * | | 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 | |
| | |\ | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |