aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* create channel_store_lowlevel() and remove more diaspora stuff from core.zotlabs2017-03-203-45/+55
* remove redundant and non-functional/broken check for successfully cloned chan...zotlabs2017-03-201-6/+0
* add function attach_syspaths to calculate the contents of os_path and display...zotlabs2017-03-191-2/+42
* attach_folder_rpaths() providing incorrect resultszotlabs2017-03-191-3/+3
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-199-44/+865
|\
| * Merge pull request #703 from dawnbreak/oauth2zotlabs2017-03-20128-6/+15850
| |\
| | * :arrow_up: Update bshaffer/oauth2-server-php library.Klaus Weidenbach2017-03-20128-6/+15850
| * | Merge pull request #702 from dawnbreak/devzotlabs2017-03-202-33/+37
| |\ \ | | |/ | |/|
| | * :white_check_mark: Add unit test for purify_html().Klaus Weidenbach2017-03-192-33/+37
| |/
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-191-1/+1
|\|
| * fix php warning and remove loggingMario Vavti2017-03-191-4/+2
* | Merge branch 'dev' into mergezotlabs2017-03-181-0/+1
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-181-2/+1
| |\
| | * Merge pull request #698 from dawnbreak/devKlaus2017-03-181-2/+1
| | |\
| | | * Missed one old Markdown()Klaus2017-03-181-2/+1
| | |/
| * | issue #699zotlabs2017-03-1849-1651/+0
* | | issue #699zotlabs2017-03-1849-1651/+0
* | | various input filter fixeszotlabs2017-03-1813-2183/+1861
* | | remove include/widgets.phpzotlabs2017-03-167-26/+2
* | | simplify the message signing spaghettizotlabs2017-03-162-47/+29
* | | the rest of the standard widgets convertedzotlabs2017-03-1621-762/+861
* | | namespace errorzotlabs2017-03-162-4/+2
* | | input filter issuezotlabs2017-03-151-0/+2
* | | widgets cont.zotlabs2017-03-1510-208/+274
* | | widgets cont.zotlabs2017-03-1510-345/+411
* | | more widget migrationszotlabs2017-03-155-73/+102
* | | more widgetszotlabs2017-03-154-83/+106
* | | filename issuezotlabs2017-03-151-0/+0
* | | more widgetszotlabs2017-03-155-173/+172
* | | convert more widgets to classeszotlabs2017-03-156-133/+166
* | | Merge branch 'red' of https://github.com/zotlabs/hubzilla into redzotlabs2017-03-15225-1684/+5210
|\ \ \
| * | | new composer.lock for redzotlabs2017-03-16225-1684/+5210
* | | | use absolute namespacezotlabs2017-03-151-1/+2
|/ / /
* | | Comanche: allow widgets to be class based and stored appropriately in Zotlabszotlabs2017-03-153-16/+37
* | | could not fix the merge conflicts in composer.lock so it will need to be rege...zotlabs2017-03-1515-750/+1077
|\| |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-1515-234/+758
| |\|
| | * Merge pull request #569 from dawnbreak/QA_testingzotlabs2017-03-1615-234/+758
| | |\
| | | * :construction_worker: Add Travis' GitHub deployment steps.Klaus Weidenbach2017-03-142-50/+27
| | | * :construction_worker: :arrow_up: :heavy_plus_sign: Update PHPUnit to current ...Klaus Weidenbach2017-03-148-224/+372
| | | * :construction_worker: Add old MySQL 5.5 to Travis CI again.Klaus Weidenbach2017-03-143-4/+13
| | | * :construction_worker: use PHP7.1 and add PostgreSQL9.6Klaus Weidenbach2017-03-143-28/+39
| | | * :green_heart: Update Travis CI's Doxygen.Klaus Weidenbach2017-03-143-14/+42
| | | * [FEATURE] :construction_worker: Extend Travis CI integration.Klaus Weidenbach2017-03-1410-27/+378
* | | | Merge branch 'dev' into redzotlabs2017-03-150-0/+0
|\| | |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-152-18/+6
| |\| |
| | * | better handling of mimetype securityMario Vavti2017-03-152-18/+6
| | |/
* | | ensure z_input_filter is called exactly once, since we now depend on the numb...zotlabs2017-03-152-22/+55
* | | more work related to attach/photo and os_path, display_path and general code ...zotlabs2017-03-152-36/+40
* | | add os_path and display_path to photos, fix some issues with multiple path se...zotlabs2017-03-143-96/+12
* | | store os_path and display_path with fileszotlabs2017-03-141-2/+3