aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* calendar merge: cleanup and comment out some unused codeMario Vavti2019-05-091-1/+1
|
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-081-6/+5
|\ | | | | | | | | Replace own image URL in clonned channel posts See merge request hubzilla/core!1638
| * Replace own image URL in clonned channel postsMax Kostikov2019-05-081-6/+5
| |
* | Merge branch 'dev' into 'dev'Mario2019-05-061-7/+8
|\ \ | |/ |/| | | | | possible xchan confusion include/follow See merge request hubzilla/core!1635
| * review of last commitzotlabs2019-05-061-2/+2
| |
| * possible xchan (protocol) confusion in include/followzotlabs2019-05-061-5/+6
| |
* | Remove 'os_syspath' from direct 'photo' table updateMax Kostikov2019-05-061-1/+0
| |
* | Add arrows to scroll between related commentsMax Kostikov2019-05-051-0/+1
|/
* found another case where channel_r_photos could get referencedzotlabs2019-05-041-1/+1
|
* strip obsolete channel_(rw)_photos from channel sync packetszotlabs2019-05-031-1/+2
|
* removing items from ex-connections turns out to be more complicated than ↵zotlabs2019-05-031-3/+13
| | | | originally envisioned
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-05-033-3/+21
|\
| * Merge branch 'unfriend_delete_posts_bug' into 'dev'Mario2019-05-031-3/+20
| |\ | | | | | | | | | | | | Unfriend delete posts bug See merge request hubzilla/core!1624
| * | calendar merge: use b64 encoded mid for plinkMario Vavti2019-05-021-1/+1
| | |
| * | Merge branch 'xmlify' into 'dev'Max Kostikov2019-05-011-2/+12
| |\ \ | | | | | | | | | | | | | | | | address xmlify/unxmlify performance issue See merge request hubzilla/core!1616
| | * | address xmlify/unxmlify performance issueMario Vavti2019-05-011-2/+12
| | | |
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-011-4/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | Use thr_parent tp handle reply on comment feature See merge request hubzilla/core!1617
| | * | Preserve parent_mid with threaded commentsMax Kostikov2019-05-011-4/+1
| | | |
| * | | Merge branch 'dev' into 'dev'Mario2019-05-012-1/+12
| |\| | | | | | | | | | | | | | | | | | Add 'reply on comment' feature See merge request hubzilla/core!1614
| | * | Add 'reply on comment' featureMax Kostikov2019-04-291-0/+8
| | | | | | | | | | | | (cherry picked from commit 80ca2023aa67ef7c0c43414acaf135e5748044b2)
| | * | Add initial threaded comment supportMax Kostikov2019-04-291-2/+5
| | | |
* | | | fix item queryzotlabs2019-05-021-1/+1
| |_|/ |/| |
* | | when removed items for unfriended connections, check if the parent has been ↵zotlabs2019-05-021-3/+20
|/ / | | | | | | retained, not just the item
* | possible sql performance improvementMario Vavti2019-04-271-1/+1
| |
* | import/export zot6 hublocs+xchansZot2019-04-261-0/+7
| |
* | hubloc confusion in magic authZot2019-04-253-21/+60
| |
* | Fix infinite loop using postgres as backendDaniel Lowe2019-04-211-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_mergeMario Vavti2019-04-191-1/+6
|\ \
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-155-46/+92
| |\|
| * | add attachments to zot6 event objects, add zot6 to federated transports ↵zotlabs2019-04-151-1/+6
| | | | | | | | | | | | (webfinger)
* | | calendar merge initial commitMario Vavti2019-04-191-0/+4
| |/ |/|
* | Update xchan profile edited date only onceMax Kostikov2019-04-131-9/+10
| |
* | Set 'os_syspath' with local pathMax Kostikov2019-04-121-1/+2
| |
* | Override received 'content' if we saving thumbnail in filesystemMax Kostikov2019-04-121-0/+1
| |
* | Fix 'os_syspath' if we store thumbnails in filesystemMax Kostikov2019-04-121-1/+3
| |
* | Add comment on required changes in upcoming releasesMax Kostikov2019-04-121-31/+47
| |
* | Store thumbnails in filesystem or databaseMax Kostikov2019-04-121-6/+3
| |
* | Fetch thumbnails and store it in filesystem or DB; update xchan profile edit ↵Max Kostikov2019-04-121-4/+22
| | | | | | | | time on fetch
* | Fix use UNIX socket file to connect DBMax Kostikov2019-04-101-1/+1
| |
* | Merge branch 'dev' into 'dev'Mario2019-04-101-4/+12
|\| | | | | | | | | Dev See merge request hubzilla/core!1586
| * Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devzotlabs2019-04-071-8/+0
| |\
| * | permissions cleanupzotlabs2019-04-051-4/+12
| | |
* | | Revert "Update htconfig.sample.php"Max Kostikov2019-04-102-5/+15
| |/ |/| | | | | This reverts commit f2126ef18c8b66020305d07dcefeacc4e55a3c12
* | Merge branch 'dev' into 'dev'Mario2019-04-061-3/+3
|\| | | | | | | | | security: perms_pending not evaluated correctly See merge request hubzilla/core!1583
| * Merge branch 'dev' of ../hz into devzotlabs2019-04-051-3/+3
| |\
| | * security: perms_pending not evaluated correctlyzotlabs2019-04-051-3/+3
| | |
* | | Remove suggest channels from featuresMario2019-04-021-8/+0
|/ /
* | check service class limits when syncing fileszotlabs2019-03-301-0/+14
| |
* | Merge branch 'z6_discover_fixes' into 'dev'Max Kostikov2019-03-291-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 applicableMario Vavti2019-03-281-1/+1
| | |