aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Max Kostikov2019-07-132-2/+2
|\
| * Missprint fixedMax Kostikov2019-07-131-1/+1
| * Missprint fixedMax Kostikov2019-07-131-1/+1
* | Merge branch 'dev' into 'dev'Mario2019-07-122-1/+14
|\ \
| * | emoji reactions from hubzilla becoming top level posts on zap because of miss...zotlabs2019-07-112-1/+14
* | | webfinger: better handling of URLs that contain a @Mario Vavti2019-07-121-5/+6
* | | calendar: revert back to UTC strings for dates due to better legibility. Stri...Mario Vavti2019-07-113-30/+30
* | | calendar: display date values as ISO stringMario Vavti2019-07-091-19/+19
* | | hide timezone select on allday eventsMario Vavti2019-07-082-4/+20
* | | fix typoMario Vavti2019-07-031-1/+1
* | | Merge branch 'dev' into 'dev'Mario2019-07-024-8/+45
|\| |
| * | I'm pretty sure the LD construct 'diaspora:guid' isn't actually legal without...zotlabs2019-07-012-2/+5
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-07-011-1/+1
| |\ \ | |/ / |/| |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-07-011-1/+1
|\ \ \ | | |/ | |/|
| * | Update hstrings.phpMax Kostikov2019-07-011-1/+1
| | * add opengraph meta info to channel pagezotlabs2019-06-291-0/+11
| | * zot_finger() and Zotlabs\Zot\Finger::run() have different output. Adjusted ac...zotlabs2019-06-281-5/+2
| | * I wonder how long zot_finger() has been missing and how this may have affecte...zotlabs2019-06-281-1/+1
| | * minor fixzotlabs2019-06-281-1/+1
| | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-06-285-11/+8
| | |\ | |_|/ |/| |
* | | decode encoded midMario Vavti2019-06-281-2/+1
* | | missing class importMario Vavti2019-06-281-0/+1
* | | regenerate autoload cacheMario Vavti2019-06-282-2/+0
* | | support zot and zot6 in social graph operations (suggestions, common friends)zotlabs2019-06-282-538/+19
* | | photo objects: incorrect media type on linkszotlabs2019-06-281-4/+4
* | | extend definition of direct message to anything with allow_cid but *not* allo...zotlabs2019-06-281-1/+6
* | | fix typoMario Vavti2019-06-271-1/+1
* | | do not check send_stream permission for commentsMario Vavti2019-06-271-7/+6
* | | Merge branch 'httpsig' into 'dev'Mario2019-06-2722-177/+296
|\ \ \
| | | * begin directory migration to zot6, see the code commentszotlabs2019-06-281-0/+26
| | | * extend definition of direct message to anything with allow_cid but *not* allo...zotlabs2019-06-271-1/+6
| | | * photo objects: incorrect media type on linkszotlabs2019-06-271-4/+4
| | | * support zot and zot6 in social graph operations (suggestions, common friends)zotlabs2019-06-272-538/+19
| | | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-06-2653-32045/+16193
| | |/| | |/|/ | |/| |/| |
* | | port some functions from osadaMario Vavti2019-06-261-15/+272
* | | Merge branch 'dev' into 'dev'Mario2019-06-262-1/+24
|\ \ \
* \ \ \ 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
* | | | apply calendar encoding fixes to mod calMario Vavti2019-06-201-3/+3
* | | | fix encoding also for description and locationMario Vavti2019-06-201-3/+3
* | | | various calendar UI improvements: make day- and weeknumbers clickable for nav...Mario Vavti2019-06-201-8/+31
* | | | Merge branch 'dev' into 'dev'Mario2019-06-209-21/+32
|\ \ \ \
* \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-06-191-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |