aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-162-5/+6
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-121-1/+1
| |\
| | * Merge pull request #770 from zotlabs/mast496git-marijus2017-05-121-1/+1
| | |\
| | | * consolidate and simplify the generation of activitystreams persons, add a cou...zotlabs2017-05-111-1/+1
| * | | Empty ACL should not result in no ACL when uploading a fileMario Vavti2017-05-111-4/+5
| |/ /
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-111-1/+3
|\| |
| * | send directory realm_token for navbar autocomplete searches - if configuredzotlabs2017-05-101-1/+3
| |/
| * get rid of edit activitieszotlabs2017-05-081-1/+11
| * cover photo was unintentionally disabled when block_public in effectzotlabs2017-05-081-3/+4
* | consolidate email validation checkszotlabs2017-05-112-2/+2
* | errorzotlabs2017-05-081-1/+1
* | cleanup of last checkinzotlabs2017-05-071-2/+4
* | cover photo was unintentionally disabled when block_public in effectzotlabs2017-05-071-3/+4
* | get rid of edit activitieszotlabs2017-05-071-1/+11
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-051-1/+2
|\|
| * abook_not_here flag created to indicate singleton connections which are conne...zotlabs2017-05-031-1/+2
* | oauth2/oidc testing (please do not port - this requires several extra DB tabl...zotlabs2017-05-032-0/+111
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-031-1/+6
|\|
| * add check for php zip extensionMario Vavti2017-05-031-1/+6
| * authenticate onepoll so we can receive private posts/comments in zotfeed; if ...zotlabs2017-05-011-1/+2
| * more work on client side e2eezotlabs2017-05-011-1/+25
| * provide a broken feed as a separate modulezotlabs2017-04-263-2/+50
* | authenticate onepoll so we can receive private posts/comments in zotfeed; if ...zotlabs2017-04-301-1/+2
* | more work on client side e2eezotlabs2017-04-291-1/+25
* | more client-side mail privacy workzotlabs2017-04-261-46/+28
* | provide a broken feed as a separate modulezotlabs2017-04-263-2/+50
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-263-12/+12
|\|
| * make mastodon happy argsMario Vavti2017-04-262-2/+2
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-261-10/+10
| |\
| | * database support for client side e2ee for private mailzotlabs2017-04-251-10/+10
| * | The rest of the library and backend changes to support client-side e2ee and d...zotlabs2017-04-264-19/+10
| * | In the rare case where a default channel is not selected but channels actuall...zotlabs2017-04-261-78/+82
| * | provide a broken feed for services which require a broken feedzotlabs2017-04-263-32/+37
| |/
| * webfinger cleanupzotlabs2017-04-191-20/+23
| * allow downloading via viewsrc to support client side e2eezotlabs2017-04-171-1/+10
* | provide a broken feed for services which require a broken feedzotlabs2017-04-253-32/+37
* | The rest of the library and backend changes to support client-side e2ee and d...zotlabs2017-04-204-19/+10
* | In the rare case where a default channel is not selected but channels actuall...zotlabs2017-04-201-78/+82
* | allow downloading via viewsrc to support client side e2eezotlabs2017-04-171-1/+10
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-171-0/+1
|\|
| * missing includesMario Vavti2017-04-131-0/+1
| * fix connectDefaultShare generated js function, though it isn't obvious if we ...zotlabs2017-04-031-19/+11
| * Merge pull request #710 from dawnbreak/importcsrfgit-marijus2017-03-312-0/+6
| |\
| * | get rid of get_app()zotlabs2017-03-311-2/+0
| * | get rid of 'davguest' and allow for project specific DB updates (currently db...zotlabs2017-03-312-3/+1
* | | webfinger cleanupzotlabs2017-04-111-20/+23
* | | fix connectDefaultShare generated js function, though it isn't obvious if we ...zotlabs2017-04-021-19/+11
* | | Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrfzotlabs2017-03-302-0/+6
|\ \ \ | | |/ | |/|
| * | :lock: Add CSRF protection for import and import_items.Klaus Weidenbach2017-03-302-0/+6
| |/
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-303-59/+66
|\|