aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'httpsig' into 'dev'Mario2019-06-273-6/+7
|\
| * http signature consolidationzotlabs2019-06-263-6/+7
* | Merge branch 'dev' into 'dev'Mario2019-06-261-1/+5
|\|
| * allow api login by address or url (url will use zot6 hubloc records, address ...zotlabs2019-06-251-1/+5
* | Merge branch 'fix-item_export-api-path' into 'dev'Mario2019-06-261-2/+2
|\ \
| * | 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 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 syncMax Kostikov2019-06-211-1/+1
| * | Revert "Respect photo thumbnails storage in import"Max Kostikov2019-06-211-3/+5
| * | 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 with...Mario Vavti2019-06-211-2/+2
* | | Merge branch 'dev' into 'dev'Mario2019-06-201-7/+8
|\ \ \ | |/ / |/| / | |/
| * changes to support direct messages in zot6 (set item.item_private = 2 when pr...zotlabs2019-06-191-7/+8
* | 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 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 t...Mario Vavti2019-06-132-69/+53
* | 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
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-301-1/+1
|\
| * 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
* | fix #1374Mario Vavti2019-05-241-0/+4
* | improve timezone detection for caldav and remove smart birthday feature. Forc...Mario Vavti2019-05-222-4/+5
* | move smart birthday feature to calendar settings and override the adjust flag...Mario Vavti2019-05-202-9/+9
* | 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
* | | 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.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 from...Mario Vavti2019-05-131-6/+5
* | optimise oembed pdf processing so we do not actually load the content, which ...Mario Vavti2019-05-131-15/+16
|/
* add btlogger to unxmlify()Mario Vavti2019-05-111-0/+9
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-111-1/+1
|\