aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* photo objects: incorrect media type on linkszotlabs2019-06-271-4/+4
|
* support zot and zot6 in social graph operations (suggestions, common friends)zotlabs2019-06-271-2/+19
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-06-269-91/+96
|\
| * Merge branch 'dev' into 'dev'Mario2019-06-261-1/+5
| |\ | | | | | | | | | | | | provide auto redirect from zot6 /item permalinks See merge request hubzilla/core!1684
| * \ Merge branch 'fix-item_export-api-path' into 'dev'Mario2019-06-261-2/+2
| |\ \ | | | | | | | | | | | | | | | | Make export_page API endpoint match ZAP See merge request hubzilla/core!1683
| | * | Make export_page API endpoint match ZAPDM42.Net (Matt Dent)2019-06-231-2/+2
| | | |
| * | | Merge branch 'export_items-export_all' into 'dev'Mario2019-06-261-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Export items export all See merge request hubzilla/core!1680
| | * | | export all items except photosDM42.Net (Matt Dent)2019-06-211-2/+2
| | |/ /
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-211-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | Fix thumbnails processing logic on files sync See merge request hubzilla/core!1682
| | * | Fix thumbnails processing logic on files syncMax Kostikov2019-06-211-1/+1
| | | |
| | * | Revert "Respect photo thumbnails storage in import"Max Kostikov2019-06-211-3/+5
| | | | | | | | | | | | This reverts commit e8918ca149f9eb0ea4148431772b9e5090f3ea7f
| | * | Respect photo thumbnails storage in importMax Kostikov2019-06-211-5/+3
| | | |
| * | | fix mid not dbesc'd. the comment was no longer true. this fixes an issue ↵Mario Vavti2019-06-211-2/+2
| | | | | | | | | | | | | | | | with mid's that contain single quotes
| * | | 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
| * | | 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
| * | | | 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
| | | | |
* | | | | http signature consolidationzotlabs2019-06-263-6/+7
| |_|_|/ |/| | |
* | | | allow api login by address or url (url will use zot6 hubloc records, address ↵zotlabs2019-06-251-1/+5
| |_|/ |/| | | | | | | | can use either zot or zot6 hubloc records)
* | | 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)
* | minor zot6 compatibility issues uncovered through daily usezotlabs2019-06-171-1/+1
|/
* 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.