Commit Graph

11714 Commits

Author SHA1 Message Date
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
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
Thomas Müller 01adefaf50 Merge pull request #20181 from owncloud/files-fixdownloadspinner
Fix file action download spinner
2015-11-02 10:13:58 +01:00
Jenkins for ownCloud 2afc14e195 [tx-robot] updated from transifex 2015-11-02 01:55:05 -05:00
Jenkins for ownCloud 2374a0df5d [tx-robot] updated from transifex 2015-11-01 01:54:58 -04:00
Jenkins for ownCloud d7ed353814 [tx-robot] updated from transifex 2015-10-31 01:55:07 -04:00
Thomas Müller d4af369e60 Merge pull request #19940 from owncloud/ldap-server-wizard-tooltip
Add tooltip to ldap server wizard
2015-10-31 00:43:30 +01:00
Arthur Schiwon a2f2ffb8db if a user that is flag as deleted shows up again, remove that flag. Fixes #20090 2015-10-30 19:20:42 +01:00
Arthur Schiwon 16aa339475 add method to count users by loginname and use it for diagnose test, fixes #20151 2015-10-30 18:20:50 +01:00
Thomas Müller 6911d8f0a4 Merge pull request #20175 from owncloud/login-arrow
remove unneeded icons from input fields to not distract from submit button, fix #18940
2015-10-30 15:56:13 +01:00
Thomas Müller 27db39bd03 Merge pull request #20160 from owncloud/share-allowdeleteinshareoverview
Bring back delete permission in share overview
2015-10-30 15:30:05 +01:00
Vincent Petry 80cf4e84e3 Fix file action download spinner 2015-10-30 14:58:53 +01:00
Thomas Müller b7f0524f2f Merge pull request #20167 from owncloud/fix-docker-ip-retrieval
Use proper statement to retrieve the IP of an docker instance
2015-10-30 13:57:03 +01:00
Robin Appelman 3c01386a50 Merge pull request #20156 from owncloud/files-filter-triger-once
dont trigger the scroll event of every single item we filter in the file list
2015-10-30 12:52:04 +01:00
Jan-Christoph Borchardt a05ea0fb1e remove unneeded icons from input fields to not distract from submit button, fix #18940 2015-10-30 11:11:37 +01:00
Morris Jobke a91572b7f3 Use proper statement to retrieve the IP of an docker instance 2015-10-30 09:28:33 +01:00
Jenkins for ownCloud 91b2cdc62b [tx-robot] updated from transifex 2015-10-30 01:55:52 -04:00
Thomas Müller 17dc482e8f Merge pull request #20051 from otetard/feature/newfilemenu_extend
Allow Owncloud apps to add new items to the “new” file menu.
2015-10-29 23:49:57 +01:00
Vincent Petry dcfaf3afdc Bring back delete permission in share overview 2015-10-29 17:56:54 +01:00
Hendrik Leppelsack 1e9abb4964 add tooltip to ldap server wizard 2015-10-29 17:44:46 +01:00
Thomas Müller 73d9699be9 Merge pull request #20135 from owncloud/check-if-null-subadmin
Drop OC_SubAdmin and replace usages
2015-10-29 17:07:45 +01:00
Robin Appelman 860e31a333 dont trigger the scroll event of every single item we filter in the file list 2015-10-29 16:30:56 +01:00
Thomas Müller 774d069ff0 Merge pull request #20122 from owncloud/files-consolidateiconupdate
Fix icon update to be more consistent
2015-10-29 15:40:15 +01:00
Vincent Petry 9c9158e6b7 Fix icon update to be more consistent
Makes the details bar show the same icon as in the list.
2015-10-29 12:59:51 +01:00
Lukas Reschke c6f6a8758b Drop OC_SubAdmin and replace usages 2015-10-29 11:31:18 +01:00
Thomas Müller 7d96f82659 Merge pull request #19000 from UoM-ResPlat-DevOps/swift-squelch-expected-404-errors
Don't log expected Swift 404 responses in files_external
2015-10-29 11:26:24 +01:00
Thomas Müller 911613f711 Merge pull request #19100 from owncloud/ext-tooltip-unavailable
Display external storage status as tooltip
2015-10-29 11:25:52 +01:00
Thomas Müller c7f409713e Merge pull request #20140 from owncloud/provisioning_killappphp
Kill empty app.php in provisioning_api
2015-10-29 11:25:26 +01:00
Joas Schilling 16e3f4de07 Kill empty app.php in provisioning_api 2015-10-29 11:08:39 +01:00
Thomas Müller 5bf476efd0 Merge pull request #20079 from owncloud/filelist-invalidpath
Fix file list reload callback result
2015-10-29 09:21:30 +01:00
Jenkins for ownCloud 527ef76dd6 [tx-robot] updated from transifex 2015-10-29 01:55:45 -04:00
Thomas Müller 92e63a802c Merge pull request #19758 from owncloud/ext-fallback-getmimetype
Fallback to default mimetype detection mechanism
2015-10-28 14:50:19 +01:00
Thomas Müller e54c22eb59 Merge pull request #20089 from owncloud/litmus-test-webdav
Enable DAV app testing on travis
2015-10-28 11:09:12 +01:00
Thomas Müller 09fff15021 run litmus scripts only if code in the dav app did change changed 2015-10-28 09:59:09 +01:00
Thomas Müller 0eeee8fdd8 Merge pull request #20093 from owncloud/ldap-fix-quota-and-case
LDAP fix quota and case, fixes #20043
2015-10-28 09:31:04 +01:00
Jenkins for ownCloud d74811fcc8 [tx-robot] updated from transifex 2015-10-28 01:55:29 -04:00
Thomas Müller b753e7631b Enable DAV app testing on travis 2015-10-27 23:00:04 +01:00
Arthur Schiwon f96e552164 fix attribute casing to ensure array keys work 2015-10-27 19:10:38 +01:00
Arthur Schiwon e1d61284f8 fix update quota with known value 2015-10-27 18:07:40 +01:00
Robin Appelman c309193039 Merge pull request #17104 from owncloud/chunked-upload-locking
locking for chunked dav upload
2015-10-27 16:58:00 +01:00
Bjoern Schiessle 5fad45b230 make encryption configurable for home storage 2015-10-27 14:24:20 +01:00
Vincent Petry f24386c491 Fix file list reload callback result
All reloadCallback must return either true for success or false in case
of failure / non-existing folder.

Some file lists only have a root folder (favorite, shares), so restrict
the path to that to avoid having a wrong path in the breadcrumbs.
2015-10-27 11:51:54 +01:00
Thomas Müller d7d5a3bab5 Merge pull request #20066 from owncloud/list-principaly-in-debug-mode
as soon as debug mode is enabled we allow listing of principals
2015-10-27 10:29:50 +01:00