Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | 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 |
| | |||||
* | 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. | ||||
| * | :lock: Add CSRF protection for import and import_items. | Klaus Weidenbach | 2017-03-30 | 2 | -0/+6 |
| | | |||||
* | | 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 |
|/ | |||||
* | Merge pull request #709 from dawnbreak/docu | Klaus | 2017-03-30 | 2 | -56/+56 |
|\ | | | | | Add some documentation for import functions. | ||||
| * | Add some documentation for import functions. | Klaus Weidenbach | 2017-03-30 | 2 | -56/+56 |
| | | |||||
* | | do not allow creating two wikis with the same name | Mario Vavti | 2017-03-30 | 1 | -3/+10 |
| | | |||||
* | | circular logic - we need the mailbox to find the last message so move the ↵ | zotlabs | 2017-03-30 | 1 | -4/+9 |
| | | | | | | | | code block back where it was, and only set a direct mid if one was specified. | ||||
* | | when clicking a notification to view a private mail message, actually view ↵ | zotlabs | 2017-03-30 | 1 | -2/+9 |
|/ | | | | that message instead of the most recent. | ||||
* | allow setting the system email name/address/reply | zotlabs | 2017-03-29 | 1 | -0/+15 |
| | |||||
* | more cloud updates - upgrade the DAV structures as well. | zotlabs | 2017-03-29 | 2 | -23/+51 |
| | |||||
* | some more photo issues | zotlabs | 2017-03-29 | 1 | -24/+22 |
| | |||||
* | fix photo prvnxt after all the changes yesterday | zotlabs | 2017-03-29 | 1 | -6/+5 |
| | |||||
* | more work on the photo album mess | zotlabs | 2017-03-29 | 1 | -92/+65 |
| | |||||
* | photos_album_exists() requires an observer to work correctly; provide it. | zotlabs | 2017-03-29 | 1 | -2/+2 |
| | |||||
* | use the same host macro for sender address as for reply_to address | zotlabs | 2017-03-29 | 1 | -2/+2 |
| | |||||
* | begin the process of using the relevant attach directory/path for photo ↵ | zotlabs | 2017-03-29 | 1 | -31/+14 |
| | | | | albums instead of an album basename which may not be unique. Created an 'ellipsify()' function to shorten long names and keep the beginning and end intact | ||||
* | more markdown purification | zotlabs | 2017-03-29 | 1 | -5/+5 |
| | |||||
* | perform attach_upgrade() | zotlabs | 2017-03-29 | 1 | -0/+3 |
| | |||||
* | after all of this, I would be very hesitant to use any multi-user system ↵ | zotlabs | 2017-03-29 | 1 | -1/+1 |
| | | | | which uses markdown and which doesn't have a large security budget. | ||||
* | even more fine tuning of the markdown purifier - especially when used with ↵ | zotlabs | 2017-03-29 | 3 | -2/+3 |
| | | | | the wiki | ||||
* | various input filter fixes | zotlabs | 2017-03-29 | 9 | -23/+76 |
| | |||||
* | more work related to attach/photo and os_path, display_path and general code ↵ | zotlabs | 2017-03-29 | 2 | -36/+40 |
| | | | | cleanup | ||||
* | input filter updates | zotlabs | 2017-03-29 | 4 | -46/+9 |
| | |||||
* | class MarkdownSoap to safely store markdown by purifying and preserving ↵ | zotlabs | 2017-03-29 | 1 | -0/+86 |
| | | | | (escaped) what may be unsafe code in codeblocks. The stored item needs to be unescaped just prior to calling the markdown-to-html processor |