Commit graph

11655 commits

Author SHA1 Message Date
Thomas Müller
e4900c6c4c Merge pull request #20195 from owncloud/add-caldavtester
Add CalDAVTester to travis
2015-11-10 16:11:49 +01:00
Robin Appelman
bbe2f5c2d5 Merge pull request #20224 from owncloud/fileinfo-owner
Add getOwner to FileInfo
2015-11-10 14:36:15 +01:00
Thomas Müller
f77c6dbbed Merge pull request #20431 from owncloud/carddav-enforce-displayname
When creating addressbooks, make sure the displayname is set
2015-11-10 14:32:39 +01:00
Thomas Müller
d7232557d9 Merge pull request #20422 from owncloud/fix-20421-master
Ensure the user folder exists
2015-11-10 11:58:33 +01:00
Arthur Schiwon
06d1685e75 When creating addressbooks, make sure the displayname is set 2015-11-10 11:41:27 +01:00
Thomas Müller
bdd396aa3d Merge pull request #20415 from owncloud/fix-addressbook-home-set
Adding CardDAV plugin to provide addressbook-home-set property
2015-11-10 11:27:52 +01:00
Robin Appelman
20cad09f7f Add tests for FileInfo owner 2015-11-10 11:06:48 +01:00
Thomas Müller
a394c1887f Ensure the user folder exists 2015-11-10 10:07:46 +01:00
Thomas Müller
af94c880b3 Add CalDAVTester to travis 2015-11-10 09:48:05 +01:00
Jenkins for ownCloud
f09db6451e [tx-robot] updated from transifex 2015-11-10 01:55:11 -05:00
Thomas Müller
e0f2b86177 Adding CardDAV plugin to provide addressbook-home-set property 2015-11-10 07:27:34 +01:00
Thomas Müller
baacb2cd30 Merge pull request #20333 from owncloud/fix-18956
[LDAP Wizard] make all the buttons beautiful
2015-11-10 00:27:54 +01:00
Thomas Müller
836173289f Register DAVACL plugin to provide current-user-principal 2015-11-09 13:27:19 +01:00
Thomas Müller
77335ca403 Merge pull request #20360 from owncloud/extstorage-gdrive-forceapproval
Force approval in GDrive oauth to get refresh_token
2015-11-09 11:11:13 +01:00
Jenkins for ownCloud
113f9f80f3 [tx-robot] updated from transifex 2015-11-09 01:55:05 -05:00
Jenkins for ownCloud
f8637b6082 [tx-robot] updated from transifex 2015-11-08 01:55:13 -05:00
Jenkins for ownCloud
49122e66dd [tx-robot] updated from transifex 2015-11-07 01:55:11 -05:00
Thomas Müller
71b8916f0f adding individual phpunit.xml and bootstrap.php 2015-11-06 19:11:29 +01:00
Thomas Müller
20e37bd38f Adding occ command to create an addressbook 2015-11-06 15:26:51 +01:00
Thomas Müller
d8e965e59a Introducing CardDAV into core 2015-11-06 15:26:51 +01:00
Vincent Petry
26b01c7fff Force approval in GDrive oauth to get refresh_token
Forcing the approval of app permissions makes sure that the GDrive API
will always return a refresh_token.

In the case of apps that were already authorized for the current user/domain,
the API doesn't return the refresh_token which causes expiration issues.
2015-11-06 13:56:37 +01:00
Thomas Müller
75ff6c34ca Merge pull request #20358 from owncloud/extstorage-properlythrowexception
Properly throw exception in OC_Mount_Config::getBackendStatus
2015-11-06 13:36:26 +01:00
Vincent Petry
51d7527595 Properly throw exception in OC_Mount_Config::getBackendStatus 2015-11-06 12:29:24 +01:00
Thomas Müller
dc96aa3849 Merge pull request #20340 from owncloud/fix-ocs-error-code
Revert OCS error code change from #20135
2015-11-06 11:56:34 +01:00
Thomas Müller
bf941032a3 Merge pull request #20271 from owncloud/fix-18701
LDAP: attempt to connect to backup server again, if main server is no…
2015-11-06 10:01:06 +01:00
Jenkins for ownCloud
f2b19333b9 [tx-robot] updated from transifex 2015-11-06 01:55:09 -05:00
Joas Schilling
960c9f386d Revert OCS error code change from #20135 2015-11-05 17:01:47 +01:00
Arthur Schiwon
d9d8f7e569 make all the buttons beautiful 2015-11-05 16:32:07 +01:00
Roeland Jago Douma
0c566698a1 Use the old code for remote shares for now 2015-11-05 15:59:09 +01:00
Roeland Jago Douma
6624fa212a The new sharing code now handles deletion
OCS -> ShareManager -> DefaultShareProvider
2015-11-05 15:59:09 +01:00
Roeland Jago Douma
8b5179459a Prepare OCS Share endpoint 2015-11-05 15:59:09 +01:00
Thomas Müller
8bffc84766 Merge pull request #20301 from owncloud/fix-files_external-empty-user-mounting
[files_external] fix empty user mounts setting
2015-11-05 11:36:36 +01:00
Jenkins for ownCloud
2f4fa5b49c [tx-robot] updated from transifex 2015-11-05 01:55:14 -05:00
Thomas Müller
ba02a3771b Merge pull request #20053 from owncloud/getfileinfo-locking
Don't lock if we're only reading cache metadata
2015-11-04 22:40:17 +01:00
Morris Jobke
2a35ecb9ba [files_external] fix empty user mounts setting
* fixes #19858
* if no backend is allowed to be mounted also the user mount setting should be disabled
2015-11-04 15:47:03 +01:00
Arthur Schiwon
8eeaf11d41 add port to host only, if an URL is used instead of a plain hostname 2015-11-04 12:34:30 +01:00
Arthur Schiwon
253e4bcf63 integration tests 2015-11-04 12:26:21 +01:00
Thomas Müller
ed0da94d3b Merge pull request #20272 from owncloud/phil-davis-setEncryptHomeStorage
Correct the description of function setEncryptHomeStorage
2015-11-04 10:27:54 +01:00
Jenkins for ownCloud
7fe047425f [tx-robot] updated from transifex 2015-11-04 01:55:44 -05:00
Robin Appelman
0397871f7e Split checkUpdate 2015-11-03 18:23:22 +01:00
Phil Davis
46261b5ff1 Correct the description of function setEncryptHomeStorage 2015-11-03 22:47:55 +05:45
Arthur Schiwon
6b866fa917 LDAP: attempt to connect to backup server again, if main server is not available. Fixes #18701 2015-11-03 17:17:00 +01:00
Thomas Müller
a8daef4280 Merge pull request #20223 from owncloud/fix-apply-webdav-tags
Fix TagList namespace in property map
2015-11-03 14:22:49 +01:00
Jan-Christoph Borchardt
fa5a15be2b fix external storage wording detail, ref #19858 2015-11-03 08:56:15 +01:00
Jenkins for ownCloud
82f3590fd0 [tx-robot] updated from transifex 2015-11-03 01:58:43 -05:00
Vincent Petry
52e213f026 Fix TagList namespace in property map 2015-11-02 14:19:01 +01:00
blizzz
83d3c94590 Merge branch 'master' into fix-20151 2015-11-02 13:32:24 +01:00
Thomas Müller
a8641fdc95 Merge pull request #20192 from owncloud/fix-20090
if a user that is flag as deleted shows up again, remove that flag. F…
2015-11-02 11:28:28 +01:00
Thomas Müller
c5caebbd1f Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibn
Fix scrollto= parameter in trashbin view
2015-11-02 11:27:49 +01:00
Joas Schilling
a378dc5a7b Fix scrollto= parameter in trashbin view 2015-11-02 10:31:06 +01:00