Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-02 | 1 | -1/+5 |
|\ | | | | | | | # Conflicts: # Zotlabs/Lib/ThreadItem.php | ||||
| * | Revert "Merge branch 'dev' into 'dev'" | Max Kostikov | 2019-05-02 | 1 | -1/+1 |
| | | | | | | This reverts merge request !1620 | ||||
| * | Merge branch 'dev' into 'dev' | Mario | 2019-05-02 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Check if 'reply on comment' enabled for this profile See merge request hubzilla/core!1620 | ||||
| * \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-02 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | Add Zap threads support See merge request hubzilla/core!1619 | ||||
| * \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-01 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Add AS threaded comments support See merge request hubzilla/core!1618 | ||||
| * \ \ \ | Merge branch 'dev' into 'dev' | Mario | 2019-05-01 | 1 | -5/+5 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add 'reply on comment' feature See merge request hubzilla/core!1614 | ||||
| * | | | | | event attachments still weren't being delivered to zot6 | zotlabs | 2019-04-28 | 1 | -2/+9 |
| | | | | | | |||||
| * | | | | | hubloc confusion during magic auth where hublocs with more than one network ↵ | zotlabs | 2019-04-24 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | may exist | ||||
* | | | | | | Add check if threads are enabled globally | Max Kostikov | 2019-05-02 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Check if 'reply on comment' enabled for this profile | Max Kostikov | 2019-05-02 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Add Zap threads support | Max Kostikov | 2019-05-02 | 1 | -0/+1 |
| |_|/ |/| | | |||||
* | | | Add threaded comments support | Max Kostikov | 2019-05-01 | 1 | -4/+11 |
| |/ |/| | |||||
* | | Add "reply to" hint to submit button | Max Kostikov | 2019-04-30 | 1 | -1/+1 |
| | | |||||
* | | Add variables for threaded comments support | Max Kostikov | 2019-04-29 | 1 | -5/+5 |
|/ | |||||
* | typo | zotlabs | 2019-04-08 | 1 | -1/+1 |
| | |||||
* | missing endTime on Zot6 encoded events, optimise the url fetch of embedphotos | zotlabs | 2019-04-08 | 1 | -20/+26 |
| | |||||
* | add punify() again | Mario | 2019-03-23 | 1 | -2/+2 |
| | |||||
* | aparently we do not use underscores anymore. this fixes spaming of dreports ↵ | Mario | 2019-03-23 | 1 | -1/+1 |
| | | | | with recipient not found entries for our own xchan | ||||
* | revert accidental moving of Enotify.php | Mario | 2019-03-23 | 1 | -0/+854 |
| | |||||
* | fix typo | Mario | 2019-03-23 | 1 | -854/+0 |
| | |||||
* | fix wrong variable in unused function | Mario | 2019-03-23 | 1 | -1/+1 |
| | |||||
* | Webfinger::zot_url() requires a string (webfinger address), empty var given ↵ | Mario | 2019-03-23 | 1 | -1/+1 |
| | | | | in update_directory_entry() | ||||
* | db_columns() requires a string, empty var given in ↵ | Mario | 2019-03-23 | 1 | -1/+1 |
| | | | | process_channel_sync_delivery() | ||||
* | share encoding issue between hz and zap | zotlabs | 2019-03-18 | 1 | -0/+4 |
| | |||||
* | messagefilter enhancements, fix edge case in unsupported advisory privacy | zotlabs | 2019-03-18 | 1 | -1/+15 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mike Macgirvin | 2019-03-18 | 1 | -8/+10 |
|\ | |||||
| * | Cleanup and fixes | Mario | 2019-03-15 | 1 | -8/+10 |
| | | |||||
* | | use php_eol for all mail header generation | zotlabs | 2019-03-16 | 1 | -12/+12 |
|/ | |||||
* | authenticated fetch fixes | zotlabs | 2019-03-09 | 1 | -1/+4 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-03-08 | 1 | -12/+9 |
|\ | |||||
| * | $sender is supposed to be string in libzot | Mario | 2019-03-08 | 1 | -12/+9 |
| | | |||||
* | | port zot_record_preferred | zotlabs | 2019-03-08 | 1 | -2/+22 |
| | | |||||
* | | It is in fact the 'Content Import' app string that needs to be translated. A ↵ | zotlabs | 2019-03-07 | 1 | -0/+1 |
|/ | | | | previous commit errantly included the string 'Content Filter'. But don't remove 'Content Filter'. That is actually a thing in Zap and will eventually make its way to Hubzilla. | ||||
* | fetch private objects using delivery channel credentials | zotlabs | 2019-03-07 | 1 | -5/+28 |
| | |||||
* | channel_type is not integer | zotlabs | 2019-03-05 | 1 | -5/+17 |
| | |||||
* | maintain compatibility with recent zot6 changes | zotlabs | 2019-03-05 | 1 | -0/+6 |
| | |||||
* | api_router - allow parameters as final path argument | zotlabs | 2019-03-04 | 1 | -1/+9 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-03-04 | 1 | -1/+1 |
|\ | |||||
| * | while in legacy zot $sender is expected to be an array, in zot6 $sender is ↵ | Mario Vavti | 2019-03-02 | 1 | -1/+1 |
| | | | | | | | | expected to be a string (xchan_hash) | ||||
* | | translate name of content filter (addon) app. | zotlabs | 2019-02-28 | 1 | -0/+1 |
|/ | |||||
* | support zot location independent urls | zotlabs | 2019-02-18 | 3 | -22/+134 |
| | |||||
* | disable repeats until issues are resolved | Mario Vavti | 2019-02-14 | 1 | -1/+2 |
| | |||||
* | affinity slider as app | phani00 | 2019-02-14 | 1 | -0/+1 |
| | |||||
* | Only cascade privacy warning if thread parent has privacy concerns. | M.Dent | 2019-02-13 | 1 | -5/+2 |
| | |||||
* | Fix: only first lock red with privacy_warning | M.Dent | 2019-02-12 | 1 | -3/+9 |
| | |||||
* | Get all listeners | M.Dent | 2019-02-11 | 1 | -2/+2 |
| | |||||
* | use ACTIVITY_SHARE to match the verb | Mario Vavti | 2019-02-08 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-02-07 | 1 | -2/+13 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-02-07 | 2 | -3/+6 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-02-06 | 1 | -12/+28 |
| |\ \ |