Commit graph

28608 commits

Author SHA1 Message Date
Joas Schilling
6816b36cdb Add backticks inside function to escape the column 2015-11-30 10:07:00 +01:00
Thomas Müller
de02cde70c Merge pull request #20821 from owncloud/revert-20792-autoloader-absolute-paths
Revert "Dont bother with stream_resolve_include_path if the path is already absolute"
2015-11-30 08:06:45 +01:00
Jenkins for ownCloud
5a9b892b2e [tx-robot] updated from transifex 2015-11-30 01:55:24 -05:00
Vincent Petry
17ce120736 Revert "Dont bother with stream_resolve_include_path if the path is already absolute" 2015-11-29 10:54:29 +01:00
Jenkins for ownCloud
188b72a9f3 [tx-robot] updated from transifex 2015-11-29 01:55:05 -05:00
Robin McCorkell
d75dc9e9c2 Merge pull request #20811 from owncloud/fix-php-doc-for-external
Fix some PHPDocs
2015-11-28 16:46:16 +00:00
Robin Appelman
6b7e748245 cache resized avatars 2015-11-28 17:33:16 +01:00
Lukas Reschke
6614ea91c3 Fix some PHPDocs
Some classes included via `use` did not even exist anymore.
2015-11-28 13:17:34 +01:00
Lukas Reschke
f3e9106864 Don't trust update server
In case the update server may deliver malicious content this would allow an adversary to inject arbitrary HTML into the response. So very bad stuff.

While signing the response would be better and something we can also do in the future (considering the code signing work), this is already a good first start.
2015-11-28 12:21:53 +01:00
Jenkins for ownCloud
d305412a35 [tx-robot] updated from transifex 2015-11-28 01:55:16 -05:00
Thomas Müller
c4a79746ea Merge pull request #20799 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-11-28 01:16:02 +01:00
Robin Appelman
4c4331982c Merge pull request #20789 from owncloud/scanner-skip-not-available
Skip unavailable storages in scanner
2015-11-27 22:57:47 +01:00
Vincent Petry
b666367a79 Added system tags data structure and PHP side managers
Added SystemTagManager and SystemTagObjectMapper
2015-11-27 17:54:29 +01:00
Robin Appelman
aa822f76e2 fix tests 2015-11-27 17:05:58 +01:00
Scrutinizer Auto-Fixer
be4c3a8b56 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-11-27 15:32:44 +00:00
Thomas Müller
99c28a6ce6 Merge pull request #20790 from owncloud/deduplicate-trashbin-jobs
Deduplicate queued trashbin expire jobs
2015-11-27 16:04:03 +01:00
Thomas Müller
2b316eaa83 Merge pull request #20792 from owncloud/autoloader-absolute-paths
Dont bother with stream_resolve_include_path if the path is already absolute
2015-11-27 16:03:39 +01:00
Roeland Jago Douma
53e93cfd24 [3rdparty] bump jeremeamia/superclosure to 2.1.0 2015-11-27 14:55:45 +01:00
Thomas Müller
a92a354c22 Merge pull request #20793 from owncloud/add-app-to-shiplist
Add Workflow app to shipped list
2015-11-27 14:47:41 +01:00
Morris Jobke
7aa07bcf1c Deduplicate queued trashbin expire jobs
* fixes #20425
* this removes the argument trashbin size from the expire job - it is now
  calculated in the expire job
* the queue now detects properly that the job is already queue and doesn't
  add it again
2015-11-27 14:40:31 +01:00
Robin Appelman
b05c8faba8 Dont die when we're missing a route 2015-11-27 14:29:06 +01:00
Robin Appelman
816cd66b4b also log exception 2015-11-27 14:28:15 +01:00
Joas Schilling
67a83d8fd6 Add Workflow app to shipped list 2015-11-27 14:26:39 +01:00
Thomas Müller
bdbefe17d6 Merge pull request #20782 from mitar/better-https
Also allow empty value for no-HTTPS
2015-11-27 14:24:23 +01:00
Robin Appelman
50474c6041 Dont bother with stream_resolve_include_path if the path is already absolute 2015-11-27 14:12:14 +01:00
Robin Appelman
ae71f80f4a Skip unavailable storages in scanner 2015-11-27 14:02:50 +01:00
Thomas Müller
df4bd322b2 Merge pull request #20770 from owncloud/add-servercontainer-alias
Add full interface of server container as alias
2015-11-27 13:16:28 +01:00
Thomas Müller
1d30f0fcdb Merge pull request #20760 from owncloud/webdav-authredirectfix
Only reject ajax auth if user is really logged out
2015-11-27 13:16:01 +01:00
Thomas Müller
d0059da7f3 Merge pull request #20772 from owncloud/symfony_console-2.7.7
[3rdparty] bump symfony/console to 2.7.7
2015-11-27 11:51:45 +01:00
Mitar
e0e51fd79f Added tests. 2015-11-27 02:45:49 -08:00
Roeland Jago Douma
7e624ed241 [3rdparty] bump symfony/console to 2.7.7 2015-11-27 11:11:57 +01:00
Mitar
59511d97ee Also allow empty value for no-HTTPS.
This makes it work better with old version of Nginx.
2015-11-27 01:01:56 -08:00
Thomas Müller
9722935043 Merge pull request #20765 from owncloud/punic-1.6.3
[3rdparty] Bump punic to 1.6.3
2015-11-27 09:20:05 +01:00
Jenkins for ownCloud
39fb320bae [tx-robot] updated from transifex 2015-11-27 01:55:14 -05:00
Thomas Müller
06aeeb3366 Merge pull request #20706 from owncloud/federation-integration-tests
Split contexts and start of federation tests
2015-11-26 20:48:10 +01:00
Roeland Jago Douma
df8c1791ee [3rdparty] Bump punic to 1.6.3 2015-11-26 20:38:38 +01:00
Morris Jobke
7aed592957 Add full interface of server container as alias 2015-11-26 18:20:25 +01:00
Vincent Petry
d02e0eaaf1 Only reject ajax auth if user is really logged out 2015-11-26 17:04:21 +01:00
Sergio Bertolin
9d44576819 Restructured FeatureContext to reuse some parts and run two servers in parallel 2015-11-26 17:03:17 +01:00
Thomas Müller
8fe878afe9 Merge pull request #20602 from owncloud/fix-installed-apps
Always installed apps includes the hardcoded ones from shipped.json
2015-11-26 16:50:05 +01:00
Thomas Müller
80c43ffc6c Merge pull request #20702 from owncloud/move-user-principal-into-subfolder
Users are available under it's own principal resource named 'principa…
2015-11-26 16:49:49 +01:00
Thomas Müller
100d9e7457 Merge pull request #20752 from owncloud/assetic-1.3.2
[3rdparty] Bump assetic to 1.3.2
2015-11-26 16:47:35 +01:00
Thomas Müller
19d5059109 Merge pull request #20393 from owncloud/querybuilder-select-with-alias
Add a method to select a field or value with alias
2015-11-26 16:19:20 +01:00
Roeland Jago Douma
dbcee0449f [3rdparty] Bump assetic to 1.3.2 2015-11-26 15:47:51 +01:00
Thomas Müller
49b76114be Merge pull request #20742 from owncloud/symfony_routing-2.7.7
[3rdparty] Bump symfony/routing to 2.7.7
2015-11-26 15:46:14 +01:00
Thomas Müller
97ebc6d80c Merge pull request #20746 from owncloud/untangle-linkToDocs
Untangle the linkToDocs method in OC_Helper
2015-11-26 15:08:28 +01:00
Thomas Müller
95896411fb Merge pull request #20755 from owncloud/integration_test_not_sharee_requesting
Added test case about a user without a share requesting it
2015-11-26 15:07:01 +01:00
Thomas Müller
4d22c75d49 Merge pull request #20562 from owncloud/comments-interfaces
public interfaces for Comments
2015-11-26 15:06:35 +01:00
Sergio Bertolin
094a1bc7cb Added test case about a user without a share requesting it 2015-11-26 13:19:49 +00:00
Morris Jobke
675417a75c Untangle the linkToDocs method in OC_Helper
* now uses the proper URLGenerator interface
* add comment about DI problems
2015-11-26 13:58:43 +01:00