Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-26 | 3 | -12/+12 |
|\ | |||||
| * | make mastodon happy args | Mario Vavti | 2017-04-26 | 2 | -2/+2 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-04-26 | 1 | -10/+10 |
| |\ | |||||
| | * | database support for client side e2ee for private mail | zotlabs | 2017-04-25 | 1 | -10/+10 |
| | | | |||||
| | * | if there is no site record, site_dead won't be 0, in a left join it will in ↵ | zotlabs | 2017-04-23 | 1 | -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 ↵ | zotlabs | 2017-04-26 | 4 | -19/+10 |
| | | | | | | | | | | | | deprecate previous uses of item_obscured. | ||||
| * | | In the rare case where a default channel is not selected but channels ↵ | zotlabs | 2017-04-26 | 1 | -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 feed | zotlabs | 2017-04-26 | 3 | -32/+37 |
| | | | |||||
| * | | Revert "fix the query of last pullrequest" | Mario Vavti | 2017-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit bda9a833ba2511a36a569dd03991130e775c5ca7. | ||||
| * | | fix the query of last pullrequest | Mario Vavti | 2017-04-23 | 1 | -1/+1 |
| | | | |||||
| * | | Revert "Revert "if there is no site record, site_dead won't be 0, in a left ↵ | Mario Vavti | 2017-04-23 | 1 | -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 Vavti | 2017-04-23 | 1 | -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 ↵ | zotlabs | 2017-04-22 | 1 | -1/+1 |
| |/ | | | | | | | fact be null. As long as it isn't 1, we should attempt delivery. | ||||
* | | issues from hubzilla:#737 | zotlabs | 2017-04-26 | 3 | -5/+16 |
| | | |||||
* | | provide a broken feed for services which require a broken feed | zotlabs | 2017-04-25 | 3 | -32/+37 |
| | | |||||
* | | mostly text formatting changes | zotlabs | 2017-04-25 | 1 | -64/+66 |
| | | |||||
* | | if there is no site record, site_dead won't be 0, in a left join it will in ↵ | zotlabs | 2017-04-23 | 1 | -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 ↵ | zotlabs | 2017-04-20 | 4 | -19/+10 |
| | | | | | | | | deprecate previous uses of item_obscured. | ||||
* | | In the rare case where a default channel is not selected but channels ↵ | zotlabs | 2017-04-20 | 1 | -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_merge | zotlabs | 2017-04-19 | 1 | -1/+1 |
|\| | |||||
| * | order wiki pages by creation date | Mario Vavti | 2017-04-19 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-04-19 | 1 | -31/+29 |
| |\ | |||||
| | * | envelope privacy | zotlabs | 2017-04-18 | 1 | -31/+29 |
| | | | |||||
| * | | don't allow any null fields in notify creation | zotlabs | 2017-04-19 | 1 | -2/+3 |
| | | | |||||
| * | | webfinger cleanup | zotlabs | 2017-04-19 | 1 | -20/+23 |
| |/ | |||||
| * | allow downloading via viewsrc to support client side e2ee | zotlabs | 2017-04-17 | 1 | -1/+10 |
| | | |||||
* | | oembed cache: don't store the url (which may need to be truncated), store a ↵ | zotlabs | 2017-04-18 | 1 | -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 privacy | zotlabs | 2017-04-18 | 1 | -31/+29 |
| | | |||||
* | | allow downloading via viewsrc to support client side e2ee | zotlabs | 2017-04-17 | 1 | -1/+10 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-17 | 1 | -0/+1 |
|\| | |||||
| * | missing includes | Mario Vavti | 2017-04-13 | 1 | -0/+1 |
| | | |||||
| * | sql error photos_albums_list with non-logged-in viewer | zotlabs | 2017-04-03 | 1 | -1/+1 |
| | | |||||
| * | fix connectDefaultShare generated js function, though it isn't obvious if we ↵ | zotlabs | 2017-04-03 | 1 | -19/+11 |
| | | | | | | | | still use it. | ||||
| * | app sorting issue | zotlabs | 2017-04-03 | 1 | -3/+13 |
| | | |||||
| * | Merge pull request #710 from dawnbreak/importcsrf | git-marijus | 2017-03-31 | 2 | -0/+6 |
| |\ | | | | | | | :lock: Add CSRF protection for import and import_items. | ||||
| * | | get rid of some more deprecated uses of $a | zotlabs | 2017-03-31 | 2 | -2/+2 |
| | | | |||||
| * | | remove obsolete app argument from load_pdl | zotlabs | 2017-03-31 | 2 | -2/+2 |
| | | | |||||
| * | | get rid of get_app() | zotlabs | 2017-03-31 | 2 | -4/+3 |
| | | | |||||
| * | | provide compatibility with old-style update system | zotlabs | 2017-03-31 | 1 | -6/+16 |
| | | | |||||
| * | | get rid of 'davguest' and allow for project specific DB updates (currently ↵ | zotlabs | 2017-03-31 | 3 | -13/+15 |
| | | | | | | | | | | | | db updates are common between all possible projects/subprojects/forks). | ||||
| * | | move db_upgrade to zlib | zotlabs | 2017-03-31 | 3 | -8/+115 |
| | | | |||||
* | | | whitespace | zotlabs | 2017-04-12 | 1 | -2/+2 |
| | | | |||||
* | | | don't allow any null fields in notify creation | zotlabs | 2017-04-11 | 1 | -2/+3 |
| | | | |||||
* | | | webfinger cleanup | zotlabs | 2017-04-11 | 1 | -20/+23 |
| | | | |||||
* | | | sql error photos_albums_list with non-logged-in viewer | zotlabs | 2017-04-02 | 1 | -1/+1 |
| | | | |||||
* | | | remove some obsolete permissions stuff | zotlabs | 2017-04-02 | 1 | -0/+1 |
| | | | |||||
* | | | fix connectDefaultShare generated js function, though it isn't obvious if we ↵ | zotlabs | 2017-04-02 | 1 | -19/+11 |
| | | | | | | | | | | | | still use it. | ||||
* | | | app sorting issue | zotlabs | 2017-04-02 | 1 | -3/+13 |
| | | | |||||
* | | | Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrf | zotlabs | 2017-03-30 | 2 | -0/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | :lock: Add CSRF protection for import and import_items. | Klaus Weidenbach | 2017-03-30 | 2 | -0/+6 |
| |/ |