Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-30 | 3 | -59/+66 |
|\| | |||||
| * | 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 |
| | | |||||
* | | circular logic - we need the mailbox to find the last message so move the ↵ | zotlabs | 2017-03-29 | 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-29 | 1 | -2/+9 |
| | | | | | | | | that message instead of the most recent. | ||||
* | | get rid of get_app() | zotlabs | 2017-03-28 | 1 | -2/+0 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-27 | 1 | -111/+115 |
|\| | |||||
| * | 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. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-25 | 11 | -21/+29 |
|\| | |||||
| * | 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 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 |
| |\ \ | |||||
| * | | | 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 |
| |\ \ \ | |||||
| * | | | | many dropdown and class fixes. still a long way to go... | Mario Vavti | 2017-03-12 | 1 | -11/+11 |
| | | | | | |||||
* | | | | | get rid of 'davguest' and allow for project specific DB updates (currently ↵ | zotlabs | 2017-03-25 | 2 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | db updates are common between all possible projects/subprojects/forks). | ||||
* | | | | | allow setting the system email name/address/reply | zotlabs | 2017-03-22 | 1 | -0/+15 |
| | | | | | |||||
* | | | | | some more photo issues | zotlabs | 2017-03-22 | 1 | -24/+22 |
| | | | | | |||||
* | | | | | fix photo prvnxt after all the changes yesterday | zotlabs | 2017-03-22 | 1 | -6/+5 |
| | | | | | |||||
* | | | | | more work on the photo album mess | zotlabs | 2017-03-21 | 1 | -92/+65 |
| | | | | | |||||
* | | | | | photos_album_exists() requires an observer to work correctly; provide it. | zotlabs | 2017-03-21 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | begin the process of using the relevant attach directory/path for photo ↵ | zotlabs | 2017-03-21 | 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-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | the wiki | ||||
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-19 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | fix php warning and remove logging | Mario Vavti | 2017-03-19 | 1 | -4/+2 |
| | | | | | |||||
* | | | | | Merge branch 'dev' into merge | zotlabs | 2017-03-18 | 1 | -0/+1 |
|\| | | | | |||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-18 | 1 | -2/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Missed one old Markdown() | Klaus | 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 |
| |\| | | |||||
| | * | | better handling of mimetype security | Mario Vavti | 2017-03-15 | 2 | -18/+6 |
| | |/ | |||||
* | | | various input filter fixes | zotlabs | 2017-03-18 | 7 | -18/+34 |
| | | | |||||
* | | | remove include/widgets.php | zotlabs | 2017-03-16 | 4 | -11/+1 |
| | | |