Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | photos_album_exists() requires an observer to work correctly; provide it. | zotlabs | 2017-03-21 | 2 | -4/+4 |
| | |||||
* | use the same host macro for sender address as for reply_to address | zotlabs | 2017-03-21 | 1 | -2/+2 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-21 | 1 | -8/+49 |
|\ | |||||
| * | Merge pull request #705 from dawnbreak/dev | Klaus | 2017-03-22 | 1 | -8/+49 |
| |\ | | | | | | | :white_check_mark: Some more tests for purify_html(). | ||||
| | * | :white_check_mark: Some more tests for purify_html(). | Klaus Weidenbach | 2017-03-22 | 1 | -8/+49 |
| |/ | | | | | | | | | Add some generic HTML, JS, CSS expectations for purify_html(). Also cover our own configuration for HTMLPurifier. | ||||
* | | begin the process of using the relevant attach directory/path for photo ↵ | zotlabs | 2017-03-21 | 4 | -48/+62 |
| | | | | | | | | 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 | ||||
* | | update license | zotlabs | 2017-03-21 | 1 | -17/+2 |
| | | |||||
* | | more markdown purification | zotlabs | 2017-03-21 | 2 | -7/+6 |
| | | |||||
* | | perform attach_upgrade() | zotlabs | 2017-03-20 | 2 | -0/+26 |
| | | |||||
* | | after all of this, I would be very hesitant to use any multi-user system ↵ | zotlabs | 2017-03-20 | 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-20 | 4 | -3/+4 |
| | | | | | | | | the wiki | ||||
* | | create channel_store_lowlevel() and remove more diaspora stuff from core. | zotlabs | 2017-03-20 | 3 | -45/+55 |
| | | |||||
* | | remove redundant and non-functional/broken check for successfully cloned ↵ | zotlabs | 2017-03-20 | 1 | -6/+0 |
| | | | | | | | | channel record which was left over from an earlier method of creating the table; which was deprecated a few months back. | ||||
* | | add function attach_syspaths to calculate the contents of os_path and ↵ | zotlabs | 2017-03-19 | 1 | -2/+42 |
| | | | | | | | | display_path; add this to the rename function. We will also need it to populate existing file/photo structures as an upgrade task. | ||||
* | | attach_folder_rpaths() providing incorrect results | zotlabs | 2017-03-19 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-19 | 9 | -44/+865 |
|\| | |||||
| * | Merge pull request #703 from dawnbreak/oauth2 | zotlabs | 2017-03-20 | 128 | -6/+15850 |
| |\ | | | | | | | :arrow_up: Update bshaffer/oauth2-server-php library. | ||||
| | * | :arrow_up: Update bshaffer/oauth2-server-php library. | Klaus Weidenbach | 2017-03-20 | 128 | -6/+15850 |
| | | | | | | | | | | | | | | | Manage oauth2-server-php library with composer. Folder ./library/oauth2/ can be removed and includes removed with autoloading. | ||||
| * | | Merge pull request #702 from dawnbreak/dev | zotlabs | 2017-03-20 | 2 | -33/+37 |
| |\ \ | | |/ | |/| | :white_check_mark: Add unit test for purify_html(). | ||||
| | * | :white_check_mark: Add unit test for purify_html(). | Klaus Weidenbach | 2017-03-19 | 2 | -33/+37 |
| |/ | | | | | | | | | | | In preparation to update HTMLPurifier library add a unit test. Please add more HTML that you need to have working and we can check against regressions. | ||||
* | | 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 |
| |\ | |||||
| | * | Merge pull request #698 from dawnbreak/dev | Klaus | 2017-03-18 | 1 | -2/+1 |
| | |\ | | | | | | | | | Missed one old Markdown() | ||||
| | | * | Missed one old Markdown() | Klaus | 2017-03-18 | 1 | -2/+1 |
| | |/ | |||||
| * | | issue #699 | zotlabs | 2017-03-18 | 49 | -1651/+0 |
| | | | |||||
* | | | issue #699 | zotlabs | 2017-03-18 | 49 | -1651/+0 |
| | | | |||||
* | | | various input filter fixes | zotlabs | 2017-03-18 | 13 | -2183/+1861 |
| | | | |||||
* | | | remove include/widgets.php | zotlabs | 2017-03-16 | 7 | -26/+2 |
| | | | |||||
* | | | simplify the message signing spaghetti | zotlabs | 2017-03-16 | 2 | -47/+29 |
| | | | |||||
* | | | the rest of the standard widgets converted | zotlabs | 2017-03-16 | 21 | -762/+861 |
| | | | |||||
* | | | namespace error | zotlabs | 2017-03-16 | 2 | -4/+2 |
| | | | |||||
* | | | input filter issue | zotlabs | 2017-03-15 | 1 | -0/+2 |
| | | | |||||
* | | | widgets cont. | zotlabs | 2017-03-15 | 10 | -208/+274 |
| | | | |||||
* | | | widgets cont. | zotlabs | 2017-03-15 | 10 | -345/+411 |
| | | | |||||
* | | | more widget migrations | zotlabs | 2017-03-15 | 5 | -73/+102 |
| | | | |||||
* | | | more widgets | zotlabs | 2017-03-15 | 4 | -83/+106 |
| | | | |||||
* | | | filename issue | zotlabs | 2017-03-15 | 1 | -0/+0 |
| | | | |||||
* | | | more widgets | zotlabs | 2017-03-15 | 5 | -173/+172 |
| | | | |||||
* | | | convert more widgets to classes | zotlabs | 2017-03-15 | 6 | -133/+166 |
| | | | |||||
* | | | Merge branch 'red' of https://github.com/zotlabs/hubzilla into red | zotlabs | 2017-03-15 | 225 | -1684/+5210 |
|\ \ \ | |||||
| * | | | new composer.lock for red | zotlabs | 2017-03-16 | 225 | -1684/+5210 |
| | | | | |||||
* | | | | use absolute namespace | zotlabs | 2017-03-15 | 1 | -1/+2 |
|/ / / | |||||
* | | | Comanche: allow widgets to be class based and stored appropriately in Zotlabs | zotlabs | 2017-03-15 | 3 | -16/+37 |
| | | | |||||
* | | | could not fix the merge conflicts in composer.lock so it will need to be ↵ | zotlabs | 2017-03-15 | 15 | -750/+1077 |
|\| | | | | | | | | | | | | | | | | | | | | | | | regenerated in the red tree. also the autoload_classmap is a disgrace. We provide autoload functions so that we can dynamically change the file tree without needing to regenerate a bunch of runtime stuff every time we add a file. Merge branch 'dev' into red | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-15 | 15 | -234/+758 |
| |\| | |||||
| | * | Merge pull request #569 from dawnbreak/QA_testing | zotlabs | 2017-03-16 | 15 | -234/+758 |
| | |\ | | | | | | | | | [FEATURE] Extend Travis CI integration. | ||||
| | | * | :construction_worker: Add Travis' GitHub deployment steps. | Klaus Weidenbach | 2017-03-14 | 2 | -50/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed API documentation deployment to gh_pages to Travis's GitHub Pages deployment. Also add Travis GitHub Release Deployment step to offer API documentation. Both steps are optional and need to be activated in Travis by setting GH_TOKEN. | ||||
| | | * | :construction_worker: :arrow_up: :heavy_plus_sign: Update PHPUnit to current ↵ | Klaus Weidenbach | 2017-03-14 | 8 | -224/+372 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | stable 6. Update requirements to PHP7 for dev. Add php-mock-phpunit to mock and stub global functions in a better way. |