Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | 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(). | Klaus Weidenbach | 2017-03-22 | 1 | -8/+49 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | begin the process of using the relevant attach directory/path for photo album... | zotlabs | 2017-03-21 | 4 | -48/+62 | |
* | | | | | | | | | 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 whic... | zotlabs | 2017-03-20 | 1 | -1/+1 | |
* | | | | | | | | | even more fine tuning of the markdown purifier - especially when used with th... | zotlabs | 2017-03-20 | 4 | -3/+4 | |
* | | | | | | | | | 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 chan... | zotlabs | 2017-03-20 | 1 | -6/+0 | |
* | | | | | | | | | add function attach_syspaths to calculate the contents of os_path and display... | zotlabs | 2017-03-19 | 1 | -2/+42 | |
* | | | | | | | | | 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. | Klaus Weidenbach | 2017-03-20 | 128 | -6/+15850 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #702 from dawnbreak/dev | zotlabs | 2017-03-20 | 2 | -33/+37 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | :white_check_mark: Add unit test for purify_html(). | Klaus Weidenbach | 2017-03-19 | 2 | -33/+37 | |
| |/ / / / / / / | ||||||
* | | | | | | | | 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() | 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 rege... | zotlabs | 2017-03-15 | 15 | -750/+1077 | |
|\| | | | | | | ||||||
| * | | | | | | 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 | |
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
| | | * | | | | :construction_worker: Add Travis' GitHub deployment steps. | Klaus Weidenbach | 2017-03-14 | 2 | -50/+27 | |
| | | * | | | | :construction_worker: :arrow_up: :heavy_plus_sign: Update PHPUnit to current ... | Klaus Weidenbach | 2017-03-14 | 8 | -224/+372 | |
| | | * | | | | :construction_worker: Add old MySQL 5.5 to Travis CI again. | Klaus Weidenbach | 2017-03-14 | 3 | -4/+13 | |
| | | * | | | | :construction_worker: use PHP7.1 and add PostgreSQL9.6 | Klaus Weidenbach | 2017-03-14 | 3 | -28/+39 |