Commit Graph

11677 Commits

Author SHA1 Message Date
Thomas Müller 5fc414abfd Add internal locking plugin - fixes #20502 2015-11-16 16:09:04 +01:00
Thomas Müller 28ed2d8072 Merge pull request #20447 from owncloud/heading-styles
standardize sizes for headings
2015-11-16 15:01:00 +01:00
Thomas Müller 2cb94cd4eb Merge pull request #20356 from owncloud/share2.0_getShare
[Share2.0] OCS Share API getShare uses new code
2015-11-16 15:00:30 +01:00
Thomas Müller 10d2b68f8f Merge pull request #18605 from owncloud/api-adduser-for-subadmins
enable api addUser for subadmins
2015-11-16 14:57:27 +01:00
Jan-Christoph Borchardt 5b72d9026f standardize sizes for headings 2015-11-16 14:42:10 +01:00
Roeland Jago Douma 1e9fc33212 [Share2.0] OCS Share API getShare uses new code 2015-11-16 13:32:28 +01:00
Thomas Müller 5e3d29b661 Merge pull request #20505 from owncloud/fakelocking-for-mac
Add fake locker plugin for WebDAVFS
2015-11-16 13:15:40 +01:00
Jenkins for ownCloud ae58409f22 [tx-robot] updated from transifex 2015-11-16 01:54:50 -05:00
Jenkins for ownCloud 19d0884b56 [tx-robot] updated from transifex 2015-11-15 01:55:08 -05:00
Jenkins for ownCloud 1b409228ab [tx-robot] updated from transifex 2015-11-14 01:55:13 -05:00
Lukas Reschke a3fc40921b Add fake locker plugin for WebDAVFS
WebDAVFS as used by Finder requires a Class 2 compatible WebDAV server. This change introduces a fake locking provider which will simply advertise Locking support when a request originates from WebDAVFS. It will also return successful LOCK and UNLOCK responses.
2015-11-13 23:31:08 +01:00
Jenkins for ownCloud 1e9203cdef [tx-robot] updated from transifex 2015-11-13 01:57:12 -05:00
Roeland Jago Douma fc1f0233ff Added unit test for new functionality 2015-11-12 22:31:17 +01:00
michag86 3b88c469c7 enable api addUser for subadmins
* Fix existing unit tests
2015-11-12 22:31:17 +01:00
Thomas Müller 3fb440ecf3 Merge pull request #20469 from seal20/seal20-fix-one-string-in-user_ldap
changed 1.000 to 1,000
2015-11-12 13:48:55 +01:00
Thomas Müller e967d88dd7 Merge pull request #20460 from owncloud/file-handling-wording
fix layout and wording for file handling admin setting
2015-11-12 11:31:39 +01:00
Jenkins for ownCloud 9145aa607a [tx-robot] updated from transifex 2015-11-12 01:55:09 -05:00
sylvain ff17deecd2 changed 1.000 to 1,000
The string "More than 1,000 directory entries available." would mean only 1 entry, in english it should be 1,000 . Found it while translating
2015-11-12 15:39:57 +09:00
Jan-Christoph Borchardt 0de225e6a6 fix layout and wording for file handling admin setting 2015-11-11 16:45:40 +01:00
Jenkins for ownCloud 5dd59b4bd2 [tx-robot] updated from transifex 2015-11-11 01:55:47 -05:00
C. Montero Luque 98d3111c2d Merge pull request #20124 from owncloud/postscriptum-20093
remove uselessly used parameter, read all user attributes also when l…
2015-11-10 18:54:28 +01:00
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
Arthur Schiwon 133e3fe89d remove uselessly used parameter, read all user attributes also when looking up users in groups 2015-11-06 15:21:56 +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