Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | provide a broken feed as a separate module | zotlabs | 2017-04-26 | 3 | -2/+50 |
| | |||||
* | 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 |
| | | |||||
* | | 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 |
|/ | |||||
* | 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 |
| | |||||
* | fix connectDefaultShare generated js function, though it isn't obvious if we ↵ | zotlabs | 2017-04-03 | 1 | -19/+11 |
| | | | | still use it. | ||||
* | 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 get_app() | zotlabs | 2017-03-31 | 1 | -2/+0 |
| | | |||||
* | | get rid of 'davguest' and allow for project specific DB updates (currently ↵ | zotlabs | 2017-03-31 | 2 | -3/+1 |
|/ | | | | db updates are common between all possible projects/subprojects/forks). | ||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | 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 | ||||
* | even more fine tuning of the markdown purifier - especially when used with ↵ | zotlabs | 2017-03-29 | 1 | -0/+1 |
| | | | | the wiki | ||||
* | various input filter fixes | zotlabs | 2017-03-29 | 6 | -14/+33 |
| | |||||
* | 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 | 2 | -16/+6 |
| | |||||
* | code_allowed is a real mess. Start the cleanup by remving the account level ↵ | zotlabs | 2017-03-29 | 2 | -23/+4 |
| | | | | code allow and limiting to specific channels only. This reduces the possibility of cross channel security issues coming into play. Then provide a single function for checking the code permission. This is only partially done as we often need to check against the observer or logged in channel as well as the resource owner to ensure that this only returns true for local channels which also own the requested resource. | ||||
* | remove include/widgets.php | zotlabs | 2017-03-29 | 4 | -11/+1 |
| | |||||
* | Import Module documentation and @-sign replacement. | Klaus Weidenbach | 2017-03-25 | 1 | -111/+115 |
| | | | | | If you copy the identity from your profile page the @-sign is invalid for the import and fails. Replace it for convenience. | ||||
* | move profile tabs to app-tray | Mario Vavti | 2017-03-20 | 9 | -9/+15 |
| | |||||
* | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-19 | 2 | -4/+2 |
|\ | |||||
| * | fix php warning and remove logging | Mario Vavti | 2017-03-19 | 1 | -4/+2 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-18 | 1 | -2/+1 |
| |\ | |||||
| * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-15 | 2 | -18/+6 |
| |\ \ | |||||
| * | | | Monday is a proper name and should be capitalised (except in private ↵ | zotlabs | 2017-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | conversation amongst unix geeks). | ||||
* | | | | fix abook_edit and private mail | Mario Vavti | 2017-03-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-18 | 1 | -2/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Missed one old Markdown() | Klaus | 2017-03-18 | 1 | -2/+1 |
| | |/ | |/| | |||||
* | | | fix item_list and item_search templates. make item filer use a bootdtrap ↵ | Mario Vavti | 2017-03-17 | 1 | -1/+3 |
| | | | | | | | | | | | | modal and some css and class fixes | ||||
* | | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-15 | 2 | -18/+6 |
|\| | | |||||
| * | | better handling of mimetype security | Mario Vavti | 2017-03-15 | 2 | -18/+6 |
| |/ | |||||
* / | many dropdown and class fixes. still a long way to go... | Mario Vavti | 2017-03-12 | 1 | -11/+11 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-02 | 1 | -1/+1 |
|\ | |||||
| * | reset schema value after we empty and repopulate it. second half of fix for #624 | Mario Vavti | 2017-03-02 | 1 | -1/+1 |
| | | |||||
* | | activity widget - like the forum widget but represents unseen activity by ↵ | zotlabs | 2017-03-02 | 6 | -4/+29 |
|/ | | | | author. Still experimental until it can be tested with diaspora xchans, which may require additional urlencoding. | ||||
* | Merge pull request #686 from dawnbreak/markdown | zotlabs | 2017-03-01 | 3 | -87/+86 |
|\ | | | | | Upgrade PHP Markdown library. |