aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-0417-67/+117
|\
| * Merge pull request #750 from zotlabs/abnotheregit-marijus2017-05-047-6/+19
| |\
| | * one file hadn't yet been saved when doing pull requestzotlabs2017-05-031-0/+1
| | * abook_not_here flag created to indicate singleton connections which are conne...zotlabs2017-05-036-6/+18
| * | Merge pull request #749 from anaqreon/devgit-marijus2017-05-042-1/+18
| |\ \
| | * | Add contributor to creditsAndrew Manning2017-05-031-1/+2
| | * | German translations for demohubAndrew Manning2017-05-032-483/+520
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-05-0320-624/+1175
| | |\|
| | * | Reformatted Webpages.php to clean up whitespace, where there was a mixture of...Andrew Manning2017-04-291-504/+483
| * | | Merge pull request #747 from dawnbreak/simplepiegit-marijus2017-05-048-60/+80
| |\ \ \ | | |_|/ | |/| |
| | * | :arrow_up: Update SimplePie library to 1.5.Klaus Weidenbach2017-05-048-60/+80
| |/ /
* / / bump versionMario Vavti2017-05-031-1/+1
|/ /
* | 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
|/ /
* | 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
|/
* 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
|/
* 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
| | |\ \ | | |/ / | |/| |
| | * | if there is no site record, site_dead won't be 0, in a left join it will in f...zotlabs2017-04-231-1/+1
* | | | The rest of the library and backend changes to support client-side e2ee and d...zotlabs2017-04-266-59/+20
* | | | In the rare case where a default channel is not selected but channels actuall...zotlabs2017-04-261-78/+82
* | | | 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
|/ / /
* | / Revert "fix the query of last pullrequest"Mario Vavti2017-04-241-1/+1
| |/ |/|
* | fix the query of last pullrequestMario Vavti2017-04-231-1/+1
* | Revert "Revert "if there is no site record, site_dead won't be 0, in a left j...Mario Vavti2017-04-231-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 19:16:29 +0000