Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | support zot and zot6 in social graph operations (suggestions, common friends) | zotlabs | 2019-06-28 | 1 | -2/+19 |
| | | | (cherry picked from commit 9def9a5cb7ab7799911013580c714605e9698122) | ||||
* | photo objects: incorrect media type on links | zotlabs | 2019-06-28 | 1 | -4/+4 |
| | | | (cherry picked from commit 60c003733e7fed70f28eadaf3d9abcf16ec3a8ab) | ||||
* | Merge branch 'httpsig' into 'dev' | Mario | 2019-06-27 | 3 | -6/+7 |
|\ | | | | | | | | | http signature consolidation See merge request hubzilla/core!1685 | ||||
| * | http signature consolidation | zotlabs | 2019-06-26 | 3 | -6/+7 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-06-26 | 1 | -1/+5 |
|\| | | | | | | | | | provide auto redirect from zot6 /item permalinks See merge request hubzilla/core!1684 | ||||
| * | allow api login by address or url (url will use zot6 hubloc records, address ↵ | zotlabs | 2019-06-25 | 1 | -1/+5 |
| | | | | | | | | can use either zot or zot6 hubloc records) | ||||
* | | Merge branch 'fix-item_export-api-path' into 'dev' | Mario | 2019-06-26 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | Make export_page API endpoint match ZAP See merge request hubzilla/core!1683 | ||||
| * | | Make export_page API endpoint match ZAP | DM42.Net (Matt Dent) | 2019-06-23 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'export_items-export_all' into 'dev' | Mario | 2019-06-26 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Export items export all See merge request hubzilla/core!1680 | ||||
| * | | | export all items except photos | DM42.Net (Matt Dent) | 2019-06-21 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-21 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | Fix thumbnails processing logic on files sync See merge request hubzilla/core!1682 | ||||
| * | | Fix thumbnails processing logic on files sync | Max Kostikov | 2019-06-21 | 1 | -1/+1 |
| | | | |||||
| * | | Revert "Respect photo thumbnails storage in import" | Max Kostikov | 2019-06-21 | 1 | -3/+5 |
| | | | | | | | | | This reverts commit e8918ca149f9eb0ea4148431772b9e5090f3ea7f | ||||
| * | | Respect photo thumbnails storage in import | Max Kostikov | 2019-06-21 | 1 | -5/+3 |
| | | | |||||
* | | | fix mid not dbesc'd. the comment was no longer true. this fixes an issue ↵ | Mario Vavti | 2019-06-21 | 1 | -2/+2 |
| | | | | | | | | | | | | with mid's that contain single quotes | ||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-06-20 | 1 | -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 ↵ | zotlabs | 2019-06-19 | 1 | -7/+8 |
| | | | | | | | | private mentions are used and federate with zot:directMessage attribute which aligns with litepub:directMessage) | ||||
* | | Update zid.php | Max Kostikov | 2019-06-19 | 1 | -1/+1 |
| | | |||||
* | | Include Zot6 hubs in the Grid scope | Max Kostikov | 2019-06-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-06-18 | 1 | -1/+1 |
|\| | | | | | | | | | minor zot6 compatibility issues uncovered through daily use See merge request hubzilla/core!1671 | ||||
| * | minor zot6 compatibility issues uncovered through daily use | zotlabs | 2019-06-17 | 1 | -1/+1 |
| | | |||||
* | | update feature set | Mario Vavti | 2019-06-17 | 1 | -14/+0 |
| | | |||||
* | | Formatting | Max Kostikov | 2019-06-14 | 1 | -1/+1 |
| | | |||||
* | | Add signatures processing for private messages | Max Kostikov | 2019-06-14 | 1 | -0/+4 |
| | | |||||
* | | Add signatures processing for private messages | Max Kostikov | 2019-06-14 | 1 | -3/+2 |
| | | |||||
* | | fix typo | Mario Vavti | 2019-06-14 | 1 | -1/+1 |
| | | |||||
* | | more work on linked item/resource deletion for photos and events, deprecate ↵ | Mario Vavti | 2019-06-13 | 2 | -69/+53 |
| | | | | | | | | the force flag in drop_item() and comment out goaway() in drop_item(). | ||||
* | | port delete fixes from zap | Mario Vavti | 2019-06-12 | 1 | -10/+13 |
| | | |||||
* | | more work on event item deletion | Mario Vavti | 2019-06-12 | 2 | -1/+30 |
|/ | |||||
* | attach sync issues | zotlabs | 2019-06-11 | 1 | -5/+7 |
| | |||||
* | do not change default timezone in parse_ical_file() | Mario Vavti | 2019-06-03 | 1 | -9/+0 |
| | |||||
* | fix timezone issue when importing adjusted events | Mario Vavti | 2019-06-03 | 1 | -7/+13 |
| | |||||
* | regard timezones in calendar import/export | Mario | 2019-06-03 | 1 | -4/+23 |
| | | | (cherry picked from commit 5b4aa1afc2d3811aae93706299dfb5d5c703198f) | ||||
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-30 | 1 | -1/+1 |
|\ | | | | | | | | | Add single photo URL rewrite for clonned channel See merge request hubzilla/core!1663 | ||||
| * | Add single photo URL rewrite for clonned channel | Max Kostikov | 2019-05-30 | 1 | -1/+1 |
| | | |||||
* | | anomolies in calls to datetime_convert in include/import | zotlabs | 2019-05-28 | 1 | -6/+6 |
| | | |||||
* | | mod cal band-aid fixes | Mario Vavti | 2019-05-26 | 1 | -2/+3 |
| | | |||||
* | | adjust birthday handling according to community decision and slightly change ↵ | Mario Vavti | 2019-05-26 | 4 | -15/+23 |
| | | | | | | | | display of allday event items | ||||
* | | fix #1374 | Mario Vavti | 2019-05-24 | 1 | -0/+4 |
| | | |||||
* | | improve timezone detection for caldav and remove smart birthday feature. ↵ | Mario Vavti | 2019-05-22 | 2 | -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 Vavti | 2019-05-20 | 2 | -9/+9 |
| | | | | | | | | flag at display time instead of import | ||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-05-20 | 1 | -2/+1 |
|\ \ | |||||
| * | | Fix a really disturbing comment | Xanthor | 2019-05-17 | 1 | -2/+1 |
| | | | | | | | | | (cherry picked from commit 823c0434ebcba7b7669203323f9cec4bbb9e0f4b) | ||||
* | | | calendar merge: initial commit for timezone support | Mario Vavti | 2019-05-20 | 2 | -12/+19 |
|/ / | |||||
* | | missing backslash | Mario Vavti | 2019-05-15 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-05-14 | 1 | -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. | zotlabs | 2019-05-13 | 1 | -6/+9 |
| | | |||||
* | | port db_indexes() from zap | Mario Vavti | 2019-05-13 | 1 | -0/+25 |
| | | |||||
* | | don't do oembed processing on naked links and smarty lib cleanup. ported ↵ | Mario Vavti | 2019-05-13 | 1 | -6/+5 |
| | | | | | | | | from zap. | ||||
* | | optimise oembed pdf processing so we do not actually load the content, which ↵ | Mario Vavti | 2019-05-13 | 1 | -15/+16 |
|/ | | | | could cause performance issues. ported from zap. |