aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "move theme specific files to theme dir"zotlabs2017-05-02277-0/+0
| | | | This reverts commit e332d1074f1b663ec66d37b0f575df2e41d5535c.
* typozotlabs2017-05-011-1/+1
|
* move theme specific files to theme dirzotlabs2017-05-01277-0/+0
|
* add cdav fileszotlabs2017-05-014-0/+998
|
* new function Hook::register_array() to bulk register several hooks from the ↵zotlabs2017-05-011-0/+9
| | | | same file with default settings
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-017-15/+2371
|\
| * version and stringsMario Vavti2017-05-012-541/+558
| |
| * update bs4-devMario Vavti2017-05-016-14/+50
| |
| * use hostname, not urlzotlabs2017-05-011-1/+1
| |
| * authenticate onepoll so we can receive private posts/comments in zotfeed; if ↵zotlabs2017-05-012-5/+22
| | | | | | | | local server bypass the network access and invoke zotfeed directly.
| * ugly postgres fixeszotlabs2017-05-011-22/+34
| |
| * more work on client side e2eezotlabs2017-05-012-6/+25
| |
| * profile_tabs is now channel_apps (except the original was left behind as the ↵zotlabs2017-05-011-2/+171
| | | | | | | | gitwiki addon still uses it). A couple of things were modernised but basic functionality is the same as the latest revisions to the original.
| * more work client mail cryptozotlabs2017-05-011-5/+15
| |
| * make mail_store() safe for postgres or mysql5.7 - although this interface ↵zotlabs2017-05-011-2/+9
| | | | | | | | needs to be refactored in the future
* | use hostname, not urlzotlabs2017-04-301-1/+1
| |
* | authenticate onepoll so we can receive private posts/comments in zotfeed; if ↵zotlabs2017-04-302-5/+22
| | | | | | | | local server bypass the network access and invoke zotfeed directly.
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-303-12/+23
|\|
| * Update api_zot.bbAndrew Manning2017-04-291-1/+1
| | | | | | Fix incorrect parameter name
| * Merge pull request #739 from zotlabs/mast35git-marijus2017-04-282-11/+22
| |\ | | | | | | update feedutils with as:author changes, also update tests
| | * update feedutils with as:author changes, also update testszotlabs2017-04-272-11/+22
| |/
| * issues from hubzilla:#737zotlabs2017-04-274-7/+18
| |
| * Merge pull request #736 from zotlabs/feedfckgit-marijus2017-04-273-2/+50
| |\ | | | | | | provide a broken feed as a separate module
| | * provide a broken feed as a separate modulezotlabs2017-04-263-2/+50
| |/
* | ugly postgres fixeszotlabs2017-04-301-22/+34
| |
* | more work on client side e2eezotlabs2017-04-292-6/+25
| |
* | profile_tabs is now channel_apps (except the original was left behind as the ↵zotlabs2017-04-271-2/+171
| | | | | | | | gitwiki addon still uses it). A couple of things were modernised but basic functionality is the same as the latest revisions to the original.
* | more work client mail cryptozotlabs2017-04-271-5/+15
| |
* | make mail_store() safe for postgres or mysql5.7 - although this interface ↵zotlabs2017-04-271-2/+9
| | | | | | | | needs to be refactored in the future
* | more client-side mail privacy workzotlabs2017-04-263-52/+56
| |
* | 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-2612-17/+46
|\|
| * make mastodon happy argsMario Vavti2017-04-263-3/+3
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-269-14/+43
| |\
| | * Merge pull request #733 from zotlabs/etwoeemailgit-marijus2017-04-266-14/+31
| | |\ | | | | | | | | Etwoeemail
| | | * database support for client side e2ee for private mailzotlabs2017-04-256-14/+31
| | | |
| | * | Merge pull request #731 from anaqreon/devgit-marijus2017-04-262-0/+10
| | |\ \ | | | | | | | | | | When template "none" is used in a webpage layout, then the contents o…
| | | * | When template "none" is used in a webpage layout, then the contents of the ↵Andrew Manning2017-04-232-0/+10
| | | | | | | | | | | | | | | | | | | | page should be the sole output, with no other code before or after the page element content.
| | * | | Merge pull request #734 from zotlabs/emojionelicensegit-marijus2017-04-261-0/+2
| | |\ \ \ | | | | | | | | | | | | Emojionelicense
| | | * | | Attribution is requiredzotlabs2017-04-261-0/+2
| | | | |/ | | | |/|
| | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-250-0/+0
| | | |\ \ | | | |/ / | | |/| |
| | | * | if there is no site record, site_dead won't be 0, in a left join it will in ↵zotlabs2017-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | fact be null. As long as it isn't 1, we should attempt delivery.
| * | | | The rest of the library and backend changes to support client-side e2ee and ↵zotlabs2017-04-266-59/+20
| | | | | | | | | | | | | | | | | | | | deprecate previous uses of item_obscured.
| * | | | In the rare case where a default channel is not selected but channels ↵zotlabs2017-04-261-78/+82
| | | | | | | | | | | | | | | | | | | | actually exist, you should be able to visit /manage and set a default channel. Originally I believe this may have been possible but the ability was lost when delegation was added to the interface - which requires an active channel. Remove the active channel restriction so that the rest of the interface works (channel selections can be made and the ability to set a default is provided) however delegation info isn't presented unless there is an active channel.
| * | | | support reverse magic-auth in oembed requests.zotlabs2017-04-261-2/+9
| | | | |
| * | | | provide a broken feed for services which require a broken feedzotlabs2017-04-266-70/+83
| | | | |
| * | | | make it easier to hook into feed headers in the futurezotlabs2017-04-261-13/+19
| | | | |
| * | | | smilies - add param to only list default emoticonszotlabs2017-04-261-1/+6
| |/ / /
* | | | issues from hubzilla:#737zotlabs2017-04-264-7/+18
| | | |
* | | | provide a broken feed for services which require a broken feedzotlabs2017-04-256-70/+83
| | | |