Joas Schilling
623d34972d
Oracle can not return statements but only values
...
So evaluate the condition directly and return 1 or 0
2015-11-30 17:12:48 +01:00
Thomas Müller
b9faba8857
Merge pull request #20837 from owncloud/fix-mountoptions-dropdown
...
Fix ext storage mount options dropdown
2015-11-30 16:53:26 +01:00
Thomas Müller
fd79511d68
Merge pull request #20688 from owncloud/publiclink-getdownloadurl-webdav
...
Fix public link getDownloadUrl to return Webdav public link
2015-11-30 15:07:36 +01:00
Vincent Petry
dc962a1203
Fix ext storage mount options dropdown
2015-11-30 14:59:06 +01:00
Thomas Müller
318e5e2864
More group DB
2015-11-30 10:55:13 +01:00
Thomas Müller
f9fc254672
Add DB group to some files_external tests
...
Adding group Db to federation tests and ldap tests
Add group DB to Test_UrlGenerator
Adding group DB to trashbin and versions tests
Adding group DB to Test_Util_CheckServer for pg
2015-11-30 10:55:10 +01:00
Thomas Müller
757aa45db7
Adding more DB groups to test suits
...
Adding more DB groups to test suits
2015-11-30 10:55:06 +01:00
Thomas Müller
e265e982bf
External storage tests require DB as well
2015-11-30 10:55:05 +01:00
Thomas Müller
1480964768
Adding more test suites to group DB
2015-11-30 10:55:05 +01:00
Thomas Müller
58cc3000c6
Prevent redefinition warning of PHPUNIT_RUN
2015-11-30 10:55:05 +01:00
Thomas Müller
3bb6dcea64
Apply DB group annotation ...
2015-11-30 10:55:05 +01:00
Jenkins for ownCloud
5a9b892b2e
[tx-robot] updated from transifex
2015-11-30 01:55:24 -05:00
Jenkins for ownCloud
188b72a9f3
[tx-robot] updated from transifex
2015-11-29 01:55:05 -05: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
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
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
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
ae71f80f4a
Skip unavailable storages in scanner
2015-11-27 14:02:50 +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
Jenkins for ownCloud
39fb320bae
[tx-robot] updated from transifex
2015-11-27 01:55:14 -05:00
Vincent Petry
d02e0eaaf1
Only reject ajax auth if user is really logged out
2015-11-26 17:04:21 +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
cc8c38e8ba
Fix principal collection for CavDAVTester
2015-11-26 12:15:11 +01:00
Thomas Müller
ff7d1eb931
Merge pull request #20707 from owncloud/files_external_table_status
...
Fix status icon styling for external storages
2015-11-26 12:01:53 +01:00
Thomas Müller
5a33390a69
Merge pull request #20731 from owncloud/per-storage-updater
...
Make Cache\Updater per storage
2015-11-26 12:01:44 +01:00
Jenkins for ownCloud
dd18ea611b
[tx-robot] updated from transifex
2015-11-26 01:55:22 -05:00
Thomas Müller
b799e42b4e
Introduce \OCP\IUser::getEMailAddress()
2015-11-25 22:23:34 +01:00
Thomas Müller
c25a7cc4da
Users are available under it's own principal resource named 'principals/users' this will allow us to introduce e.g. groups as principals (one day) and system specific principals (needed for federation)
2015-11-25 22:23:34 +01:00
Thomas Müller
b02dea29e6
CardDavBackEnd requires principalBackend on ctor
2015-11-25 21:14:16 +01:00
Thomas Müller
06c85dd1eb
Output owncloud.log to the console
2015-11-25 21:14:15 +01:00
Thomas Müller
d28390a649
Adding sync support - including dav tests
2015-11-25 21:14:15 +01:00
Thomas Müller
6b5460f755
Merge pull request #20733 from owncloud/scan-eventsource-no-paths
...
Dont output paths in scan.php
2015-11-25 20:01:52 +01:00
Vincent Petry
42091cecf9
Fix public link getDownloadUrl to return Webdav public link
...
This is for apps that use getDownloadUrl() to access the Webdav endpoint
for example for streaming.
Also happens when clicking on the download action of a file.
Note that the regular visible download URL is still the same.
2015-11-25 17:39:49 +01:00
Jan-Christoph Borchardt
38abdc1007
add icon for Federation app
2015-11-25 16:06:36 +01:00
Thomas Müller
7c68be6494
Merge pull request #20712 from owncloud/replace-netcat-php
...
Replace shitty netcat use with dedicated PHP script
2015-11-25 15:29:09 +01:00
Thomas Müller
9ec2f8886e
Merge pull request #20691 from owncloud/share2.0_di_fixes
...
[Sharing 2.0] di fixes
2015-11-25 15:25:50 +01:00
Robin Appelman
10df0780ea
Dont output paths in scan.php
2015-11-25 15:21:01 +01:00
Robin Appelman
b025f07fb7
Make Cache\Updater per storage
2015-11-25 14:16:00 +01:00
Thomas Müller
50f6817ce9
Merge pull request #20439 from owncloud/etag-propagate-in-storage
...
Take submount etag into account for folder etags
2015-11-25 12:49:54 +01:00
Jenkins for ownCloud
6e60c0f0c4
[tx-robot] updated from transifex
2015-11-25 01:55:37 -05:00
Robin McCorkell
125b090627
Replace shitty netcat use with dedicated PHP script
2015-11-24 16:05:08 +00:00
Thomas Müller
89b9f5518b
Merge pull request #20636 from owncloud/savre-3.0
...
sabre/dav 3.0 and related
2015-11-24 16:20:48 +01:00
Thomas Müller
4bb346a1e6
Merge pull request #20692 from owncloud/federation_auto_add_servers
...
auto-add ownClouds to the list of trusted servers
2015-11-24 16:19:39 +01:00
Thomas Müller
9a8bdeb7fb
Remove invalid use statement
2015-11-24 16:19:25 +01:00
Thomas Müller
4978a785fa
Merge pull request #18294 from esakol/issue17173
...
Fix RHDS ldap paged search, Issue #17173
2015-11-24 16:04:23 +01:00
Thomas Müller
6ce6e27560
Merge pull request #20595 from owncloud/fix-double-slashes
...
Avoid double slashes in URL when trying to add an remote share
2015-11-24 16:04:03 +01:00
Thomas Müller
9385eef31a
Merge pull request #18999 from owncloud/ext-config-listadmin
...
Improvements to external storages list rendering
2015-11-24 16:03:35 +01:00