Commit Graph

18843 Commits

Author SHA1 Message Date
zotlabs a7bf4366ce use the same host macro for sender address as for reply_to address 2017-03-21 21:00:48 -07:00
zotlabs 066ab8c1fc Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-03-21 20:59:26 -07:00
zotlabs bedc393425 begin the process of using the relevant attach directory/path for photo 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 2017-03-21 20:11:48 -07:00
zotlabs c1cc7bfc94 update license 2017-03-21 17:14:58 -07:00
Klaus caae956f6e Merge pull request #705 from dawnbreak/dev
 Some more tests for purify_html().
2017-03-22 00:59:09 +01:00
Klaus Weidenbach 30a3339653 Some more tests for purify_html().
Add some generic HTML, JS, CSS expectations for purify_html().
Also cover our own configuration for HTMLPurifier.
2017-03-22 00:50:49 +01:00
zotlabs 82631c3413 more markdown purification 2017-03-21 00:40:19 -07:00
zotlabs b153c651b4 perform attach_upgrade() 2017-03-20 21:53:39 -07:00
zotlabs 8821986d87 after all of this, I would be very hesitant to use any multi-user system which uses markdown and which doesn't have a large security budget. 2017-03-20 19:50:09 -07:00
zotlabs 35fc7328de even more fine tuning of the markdown purifier - especially when used with the wiki 2017-03-20 19:41:03 -07:00
zotlabs 7a611c6d47 create channel_store_lowlevel() and remove more diaspora stuff from core. 2017-03-20 18:14:50 -07:00
zotlabs da823125b9 remove redundant and non-functional/broken check for successfully cloned channel record which was left over from an earlier method of creating the table; which was deprecated a few months back. 2017-03-20 15:24:47 -07:00
zotlabs 78aeb50ce5 add function attach_syspaths to calculate the contents of os_path and display_path; add this to the rename function. We will also need it to populate existing file/photo structures as an upgrade task. 2017-03-19 21:39:28 -07:00
zotlabs a12a614e7e attach_folder_rpaths() providing incorrect results 2017-03-19 19:43:00 -07:00
zotlabs f746418fda Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-03-19 17:13:26 -07:00
zotlabs 1bdab6e633 Merge pull request #703 from dawnbreak/oauth2
⬆️ Update bshaffer/oauth2-server-php library.
2017-03-20 11:05:46 +11:00
zotlabs 1bf2a9d47b Merge pull request #702 from dawnbreak/dev
 Add unit test for purify_html().
2017-03-20 11:05:20 +11:00
Klaus Weidenbach 8b4b135036 ⬆️ Update bshaffer/oauth2-server-php library.
Manage oauth2-server-php library with composer.
Folder ./library/oauth2/ can be removed and includes removed with autoloading.
2017-03-20 00:43:09 +01:00
zotlabs be10bf2ceb Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-19 15:44:59 -07:00
Klaus Weidenbach d4bd4ca000 Add unit test for purify_html().
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.
2017-03-19 23:07:16 +01:00
Mario Vavti d2c971eda9 fix php warning and remove logging 2017-03-19 13:33:02 +01:00
zotlabs b0b96daec0 Merge branch 'dev' into merge 2017-03-18 17:00:09 -07:00
zotlabs 8764cdf16a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-18 16:56:37 -07:00
zotlabs a45dd09fc0 issue #699 2017-03-18 16:56:18 -07:00
zotlabs 320c32fd0f issue #699 2017-03-18 16:55:10 -07:00
zotlabs 4afeefb5ce various input filter fixes 2017-03-18 16:41:43 -07:00
Klaus 7b06cb6682 Merge pull request #698 from dawnbreak/dev
Missed one old Markdown()
2017-03-18 14:19:47 +01:00
Klaus cbd401c3e8 Missed one old Markdown() 2017-03-18 14:15:02 +01:00
zotlabs d903758940 remove include/widgets.php 2017-03-16 18:36:58 -07:00
zotlabs cf11ba1147 simplify the message signing spaghetti 2017-03-16 18:19:03 -07:00
zotlabs 446b5550a2 the rest of the standard widgets converted 2017-03-16 17:11:48 -07:00
zotlabs 051759580d namespace error 2017-03-16 01:16:29 -07:00
zotlabs fb3f63bf59 input filter issue 2017-03-15 21:49:27 -07:00
zotlabs f6b643e84e widgets cont. 2017-03-15 21:26:28 -07:00
zotlabs 16d750d1f6 widgets cont. 2017-03-15 20:56:12 -07:00
zotlabs dfd626548f more widget migrations 2017-03-15 20:11:28 -07:00
zotlabs 92d7c32f61 more widgets 2017-03-15 19:30:57 -07:00
zotlabs 0ee48f6a58 filename issue 2017-03-15 19:13:16 -07:00
zotlabs 664c762b35 more widgets 2017-03-15 18:48:27 -07:00
zotlabs 9cb9608209 convert more widgets to classes 2017-03-15 18:31:34 -07:00
zotlabs b20062efa6 Merge branch 'red' of https://github.com/zotlabs/hubzilla into red 2017-03-15 17:44:21 -07:00
zotlabs 8d4744d115 new composer.lock for red 2017-03-16 11:42:06 +11:00
zotlabs 14f16a7ef0 use absolute namespace 2017-03-15 17:05:16 -07:00
zotlabs df6c07aaad Comanche: allow widgets to be class based and stored appropriately in Zotlabs 2017-03-15 16:55:47 -07:00
zotlabs c95e9b9ba5 could not fix the merge conflicts in composer.lock so it will need to be 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
2017-03-15 16:09:08 -07:00
zotlabs 472a824a1e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-15 16:02:45 -07:00
zotlabs 16df1c1ad4 Merge pull request #569 from dawnbreak/QA_testing
[FEATURE] Extend Travis CI integration.
2017-03-16 10:02:17 +11:00
zotlabs e1fe637dcd Merge branch 'dev' into red 2017-03-15 15:57:37 -07:00
zotlabs 2dce86d38e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-15 15:55:33 -07:00
zotlabs bcd02edd80 ensure z_input_filter is called exactly once, since we now depend on the number of htmlspecialchars operations for
markdown content. Also ensure that the content is escaped the correct number of times on imported items.
2017-03-15 15:53:03 -07:00