aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-035-32/+296
|\
| * add check for php zip extensionMario Vavti2017-05-031-1/+6
| * Update INSTALL.txtAndrew Manning2017-05-031-1/+1
| * Merge pull request #742 from dawnbreak/QA_testinggit-marijus2017-05-033-30/+289
| |\
| | * :white_check_mark::bulb: Add Unit Tests for AccessList class.Klaus Weidenbach2017-05-013-30/+289
| |/
* | more cleanupzotlabs2017-05-021-0/+3
* | finish the red conversion of the markdown utilities considering their relatio...zotlabs2017-05-021-0/+52
* | more code refactoring to put external protocol dependencies in plugins.zotlabs2017-05-022-31/+85
* | profile_sidebar hook ignored the updated html contentzotlabs2017-05-022-70/+2
* | Revert "move theme specific files to theme dir"zotlabs2017-05-02277-0/+0
* | 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 s...zotlabs2017-05-011-0/+9
* | 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
| * 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
| * more work client mail cryptozotlabs2017-05-011-5/+15
| * make mail_store() safe for postgres or mysql5.7 - although this interface nee...zotlabs2017-05-011-2/+9
* | 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
* | 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
| * Merge pull request #739 from zotlabs/mast35git-marijus2017-04-282-11/+22
| |\
| | * 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 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
* | more work client mail cryptozotlabs2017-04-271-5/+15
* | make mail_store() safe for postgres or mysql5.7 - although this interface nee...zotlabs2017-04-271-2/+9
* | 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
| | |\
| | | * 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 of the pa...Andrew Manning2017-04-232-0/+10
| | * | | Merge pull request #734 from zotlabs/emojionelicensegit-marijus2017-04-261-0/+2
| | |\ \ \
| | | * | | Attribution is requiredzotlabs2017-04-261-0/+2
| | | | |/ | | | |/|
| | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-250-0/+0
| | | |\ \ | | | |/ / | | |/| |