aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| | * 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-264-19/+10
| | | | | | | | | | | | 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.
| * | provide a broken feed for services which require a broken feedzotlabs2017-04-263-32/+37
| | |
| * | Revert "fix the query of last pullrequest"Mario Vavti2017-04-241-1/+1
| | | | | | | | | | | | This reverts commit bda9a833ba2511a36a569dd03991130e775c5ca7.
| * | 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 ↵Mario Vavti2017-04-231-1/+1
| | | | | | | | | | | | | | | | | | join it will in fact be null. As long as it isn't 1, we should attempt delivery."" This reverts commit b6be0e1b996840192ea50b864b260d4d4cefbbb2.
| * | Revert "if there is no site record, site_dead won't be 0, in a left join it ↵Mario Vavti2017-04-231-1/+1
| | | | | | | | | | | | | | | | | | will in fact be null. As long as it isn't 1, we should attempt delivery." This reverts commit 42f5291f692965944076a5005b101fe409bb182c.
| * | if there is no site record, site_dead won't be 0, in a left join it will in ↵zotlabs2017-04-221-1/+1
| |/ | | | | | | fact be null. As long as it isn't 1, we should attempt delivery.
* | issues from hubzilla:#737zotlabs2017-04-263-5/+16
| |
* | provide a broken feed for services which require a broken feedzotlabs2017-04-253-32/+37
| |
* | mostly text formatting changeszotlabs2017-04-251-64/+66
| |
* | 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-204-19/+10
| | | | | | | | deprecate previous uses of item_obscured.
* | In the rare case where a default channel is not selected but channels ↵zotlabs2017-04-201-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.
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-191-1/+1
|\|
| * order wiki pages by creation dateMario Vavti2017-04-191-1/+1
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-191-31/+29
| |\
| | * envelope privacyzotlabs2017-04-181-31/+29
| | |
| * | don't allow any null fields in notify creationzotlabs2017-04-191-2/+3
| | |
| * | webfinger cleanupzotlabs2017-04-191-20/+23
| |/
| * allow downloading via viewsrc to support client side e2eezotlabs2017-04-171-1/+10
| |
* | oembed cache: don't store the url (which may need to be truncated), store a ↵zotlabs2017-04-181-6/+6
| | | | | | | | hash instead. This will allow us to convert the table to utf8mb4 without running into mysql key length restrictions as well as dealing with the potential ambiguity of truncated urls.
* | envelope privacyzotlabs2017-04-181-31/+29
| |
* | 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
| |
| * sql error photos_albums_list with non-logged-in viewerzotlabs2017-04-031-1/+1
| |
| * fix connectDefaultShare generated js function, though it isn't obvious if we ↵zotlabs2017-04-031-19/+11
| | | | | | | | still use it.
| * app sorting issuezotlabs2017-04-031-3/+13
| |
| * Merge pull request #710 from dawnbreak/importcsrfgit-marijus2017-03-312-0/+6
| |\ | | | | | | :lock: Add CSRF protection for import and import_items.
| * | get rid of some more deprecated uses of $azotlabs2017-03-312-2/+2
| | |
| * | remove obsolete app argument from load_pdlzotlabs2017-03-312-2/+2
| | |
| * | get rid of get_app()zotlabs2017-03-312-4/+3
| | |
| * | provide compatibility with old-style update systemzotlabs2017-03-311-6/+16
| | |
| * | get rid of 'davguest' and allow for project specific DB updates (currently ↵zotlabs2017-03-313-13/+15
| | | | | | | | | | | | db updates are common between all possible projects/subprojects/forks).
| * | move db_upgrade to zlibzotlabs2017-03-313-8/+115
| | |
* | | whitespacezotlabs2017-04-121-2/+2
| | |
* | | don't allow any null fields in notify creationzotlabs2017-04-111-2/+3
| | |
* | | webfinger cleanupzotlabs2017-04-111-20/+23
| | |
* | | sql error photos_albums_list with non-logged-in viewerzotlabs2017-04-021-1/+1
| | |
* | | remove some obsolete permissions stuffzotlabs2017-04-021-0/+1
| | |
* | | fix connectDefaultShare generated js function, though it isn't obvious if we ↵zotlabs2017-04-021-19/+11
| | | | | | | | | | | | still use it.
* | | app sorting issuezotlabs2017-04-021-3/+13
| | |
* | | 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
| |/