aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | Update hmessages.poMax Kostikov2019-05-031-2617/+2688
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'revert-3528610a' into 'dev'Max Kostikov2019-05-031-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Fix comment edit field expansion on reply on comment" See merge request kostikov/core!1
| | | * | | | | | | | | Revert "Fix comment edit field expansion on reply on comment"Max Kostikov2019-05-031-1/+1
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3528610a51df54e843a2f3d55c8b7d925fa2fac7
| | * | | | | | | | | Fix comment edit field expansion on reply on commentMax Kostikov2019-05-031-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-05-031-3/+13
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing items from ex-connections turns out to be more complicated than originally envisioned See merge request hubzilla/core!1626
| | * | | | | | | | | 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-030-0/+0
| | |\| | | | | | | |
| | * | | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-05-0314-82/+234
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fix item queryzotlabs2019-05-021-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | update directory on cover photo changesMario Vavti2019-05-031-2/+7
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | parent -> idMario Vavti2019-05-031-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'replyto_fixes' into 'dev'Mario2019-05-032-4/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide xchan_url if there is no xchan_addr See merge request hubzilla/core!1622
| | * | | | | | | | | more provide xchan_url if there is no xchan_addrMario Vavti2019-05-021-2/+2
| | | | | | | | | | |
| | * | | | | | | | | provide xchan_url if there is no xchan_addrMario Vavti2019-05-022-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-05-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | work on emoji reactions - sync with matching update to addons See merge request hubzilla/core!1623
| | * \ \ \ \ \ \ \ \ \ Merge branch 'dev' of ../hz into devzotlabs2019-05-022-0/+12
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of /home/macgirvin/hz into devzotlabs2019-05-023-3/+59
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'unfriend_delete_posts_bug' into 'dev'Mario2019-05-035-6/+91
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfriend delete posts bug See merge request hubzilla/core!1624
| | * | | | | | | | | | | | when removed items for unfriended connections, check if the parent has been ↵zotlabs2019-05-021-3/+20
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retained, not just the item
| | * | | | | | | | | | | emojireaction compatzotlabs2019-05-022-0/+12
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | move apschema to core to use for emojiReaction mapping for zot6zotlabs2019-05-023-3/+59
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add check if threads are enabled globally See merge request hubzilla/core!1621
| | * | | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-02134-4456/+4572
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Zotlabs/Lib/ThreadItem.php
| * | | | | | | | | | | Revert "Merge branch 'dev' into 'dev'"Max Kostikov2019-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !1620
| * | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-05-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if 'reply on comment' enabled for this profile See merge request hubzilla/core!1620
| * | | | | | | | | | | | calendar merge: use b64 encoded mid for plinkMario Vavti2019-05-021-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-021-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Zap threads support See merge request hubzilla/core!1619
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-05-011-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add AS threaded comments support See merge request hubzilla/core!1618
| * | | | | | | | | | | | | | Update Item.phpMax Kostikov2019-05-011-9/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | 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-013-11/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use thr_parent tp handle reply on comment feature See merge request hubzilla/core!1617
| * | | | | | | | | | | | | | | | calendar merge: remove deprecated share variableMario Vavti2019-05-011-20/+2
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | calendar merge: fix event_xchan mixupMario Vavti2019-05-012-13/+13
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-05-011-5/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a couple of issues with the suggestions when viewing from the directory module See merge request hubzilla/core!1615
| | * | | | | | | | | | | | | | Merge branch 'dev' of ../hz into devzotlabs2019-04-301-5/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | disable directory options when using suggestion mode and only return one ↵zotlabs2019-04-301-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page (60 items) so that sorting works correctly
| | | * | | | | | | | | | | | | fix suggestion ordering in directory modulezotlabs2019-04-301-3/+25
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-05-017-13/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'reply on comment' feature See merge request hubzilla/core!1614
| * | | | | | | | | | | | | | | | do not allow editing events that do not belong to usMario Vavti2019-04-302-1/+10
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | select event by event_hash instead of item_idMario Vavti2019-04-305-12/+23
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | remove loggingMario Vavti2019-04-301-3/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | calendar merge: implement single event editing UIMario Vavti2019-04-305-8/+71
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-294-5/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add jot videos inline and with poster if possible See merge request hubzilla/core!1613
| | * | | | | | | | | | | | | | | Merge branch 'dev' of ../hz into devzotlabs2019-04-281-2/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | event attachments still weren't being delivered to zot6zotlabs2019-04-281-2/+9
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-28102-3792/+2900
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-282-12/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'dev' of ../hz into devzotlabs2019-04-273-3/+100
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Add jot videos inline and with poster if possiblezotlabs2019-04-273-3/+100
| | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 18:23:50 +0000