aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Mario2019-06-201-7/+8
|\ | | | | | | | | changes to support direct messages in zot6 (set item.item_private = 2 when... See merge request hubzilla/core!1679
| * changes to support direct messages in zot6 (set item.item_private = 2 when ↵zotlabs2019-06-191-7/+8
| | | | | | | | private mentions are used and federate with zot:directMessage attribute which aligns with litepub:directMessage)
* | Update zid.phpMax Kostikov2019-06-191-1/+1
| |
* | Include Zot6 hubs in the Grid scopeMax Kostikov2019-06-181-1/+1
| |
* | Merge branch 'dev' into 'dev'Mario2019-06-181-1/+1
|\| | | | | | | | | minor zot6 compatibility issues uncovered through daily use See merge request hubzilla/core!1671
| * minor zot6 compatibility issues uncovered through daily usezotlabs2019-06-171-1/+1
| |
* | update feature setMario Vavti2019-06-171-14/+0
| |
* | FormattingMax Kostikov2019-06-141-1/+1
| |
* | Add signatures processing for private messagesMax Kostikov2019-06-141-0/+4
| |
* | Add signatures processing for private messagesMax Kostikov2019-06-141-3/+2
| |
* | fix typoMario Vavti2019-06-141-1/+1
| |
* | more work on linked item/resource deletion for photos and events, deprecate ↵Mario Vavti2019-06-132-69/+53
| | | | | | | | the force flag in drop_item() and comment out goaway() in drop_item().
* | port delete fixes from zapMario Vavti2019-06-121-10/+13
| |
* | more work on event item deletionMario Vavti2019-06-122-1/+30
|/
* attach sync issueszotlabs2019-06-111-5/+7
|
* do not change default timezone in parse_ical_file()Mario Vavti2019-06-031-9/+0
|
* fix timezone issue when importing adjusted eventsMario Vavti2019-06-031-7/+13
|
* regard timezones in calendar import/exportMario2019-06-031-4/+23
| | | (cherry picked from commit 5b4aa1afc2d3811aae93706299dfb5d5c703198f)
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-301-1/+1
|\ | | | | | | | | Add single photo URL rewrite for clonned channel See merge request hubzilla/core!1663
| * Add single photo URL rewrite for clonned channelMax Kostikov2019-05-301-1/+1
| |
* | anomolies in calls to datetime_convert in include/importzotlabs2019-05-281-6/+6
| |
* | mod cal band-aid fixesMario Vavti2019-05-261-2/+3
| |
* | adjust birthday handling according to community decision and slightly change ↵Mario Vavti2019-05-264-15/+23
| | | | | | | | display of allday event items
* | fix #1374Mario Vavti2019-05-241-0/+4
| |
* | improve timezone detection for caldav and remove smart birthday feature. ↵Mario Vavti2019-05-222-4/+5
| | | | | | | | Force adjust birthdays until we agree on how to deal with this.
* | move smart birthday feature to calendar settings and override the adjust ↵Mario Vavti2019-05-202-9/+9
| | | | | | | | flag at display time instead of import
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-05-201-2/+1
|\ \
| * | Fix a really disturbing comment Xanthor2019-05-171-2/+1
| | | | | | | | | (cherry picked from commit 823c0434ebcba7b7669203323f9cec4bbb9e0f4b)
* | | calendar merge: initial commit for timezone supportMario Vavti2019-05-202-12/+19
|/ /
* | missing backslashMario Vavti2019-05-151-1/+1
| |
* | Merge branch 'dev' into 'dev'Mario2019-05-141-6/+9
|\ \ | |/ |/| | | | | bbcode map bypass wasn't catching all map forms. See merge request hubzilla/core!1647
| * bbcode map bypass wasn't catching all map forms.zotlabs2019-05-131-6/+9
| |
* | port db_indexes() from zapMario Vavti2019-05-131-0/+25
| |
* | don't do oembed processing on naked links and smarty lib cleanup. ported ↵Mario Vavti2019-05-131-6/+5
| | | | | | | | from zap.
* | optimise oembed pdf processing so we do not actually load the content, which ↵Mario Vavti2019-05-131-15/+16
|/ | | | could cause performance issues. ported from zap.
* add btlogger to unxmlify()Mario Vavti2019-05-111-0/+9
|
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-111-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 syncMax Kostikov2019-05-111-1/+1
| |
* | Merge branch 'dev' into 'dev'Mario2019-05-111-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 ↵zotlabs2019-05-091-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/calendarMario Vavti2019-05-101-1/+1
|/ /
* | 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
|