Commit graph

11809 commits

Author SHA1 Message Date
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
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
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
Thomas Müller
ae36c01b95 Adjust sabre changes in core 2015-11-24 15:11:54 +01:00
Robin Appelman
d316802fcf Fix status icon styling for external storages 2015-11-24 13:57:12 +01:00
Robin Appelman
95f2e15f83 Merge pull request #20574 from owncloud/files_external_list_command
Add files_external:list command to list configured external storages
2015-11-24 13:34:59 +01:00
Björn Schießle
9546b21d7e always store server url without a trailing slash 2015-11-24 13:15:55 +01:00
Björn Schießle
964fa1fce3 use hooks to auto add server to the list of trusted servers once a federated share was created 2015-11-24 11:34:38 +01:00
Roeland Jago Douma
8d309767d7 [Sharing 2.0] Use the rootfolder to get the path of a share
We need to use the rootfolder here since we also other people than the
shareOwner can request a share.
2015-11-24 10:26:36 +01:00
Roeland Jago Douma
85976b7293 [Sharing 2.0] Fix phpdoc etc 2015-11-24 10:26:36 +01:00
Roeland Jago Douma
ab02b5c36e [Sharing 2.0] Move authentication to the OCS API 2015-11-24 10:26:36 +01:00
Roeland Jago Douma
a2b8483779 [Sharing 2.0] Default share provider only generic DI
No injection of userfolders etc. Only generic DI components
(IRootFolder) etc should be used to make sure we can also run this from
the cli
2015-11-24 10:26:36 +01:00
Roeland Jago Douma
aeae73b364 [Sharing 2.0] Removed unused DI stuff
The share manager etc should not care about filtering stuff. They should
return what is asked for them.
2015-11-24 10:26:36 +01:00
Jenkins for ownCloud
cb69e6c201 [tx-robot] updated from transifex 2015-11-24 01:56:32 -05:00
Thomas Müller
7062e6636d Merge pull request #20684 from owncloud/more-time
webdav docker tests - wait at least 5 seconds after the full startup
2015-11-23 15:35:51 +01:00
Morris Jobke
4608e7134c webdav docker tests - wait at least 5 seconds after the full startup 2015-11-23 14:49:01 +01:00
Thomas Müller
7e9cf00e34 Merge pull request #20609 from owncloud/dav-donotauththroughajax
Do not authenticate over ajax Webdav
2015-11-23 13:33:08 +01:00
Robin Appelman
74dfc604d1 language fixes 2015-11-23 13:08:53 +01:00
Robin Appelman
ff72eac927 truncate long values on default 2015-11-23 12:29:20 +01:00
Robin Appelman
0795f7d71b hide passwords and secrets on default 2015-11-23 12:24:24 +01:00
Robin Appelman
909b31ea58 use common --output option 2015-11-23 11:36:20 +01:00