Commit Graph

13962 Commits

Author SHA1 Message Date
Vincent Chan 6214420974 restrict dropZone to app-content div 2016-06-15 09:45:36 +02:00
Jenkins for ownCloud be4a29d75f [tx-robot] updated from transifex 2016-06-15 05:54:49 +00:00
Vincent Chan 203a07e7f3 change folder icon when dragging over a directory 2016-06-15 01:03:59 +02:00
Vincent Petry e325209291
Convert Dropbox Forbidden exception to StorageNotAvailableException 2016-06-14 17:38:32 +02:00
Robin Appelman 4f02bd1dff disable cleanFolder for the federated share storage 2016-06-14 17:29:09 +02:00
Vincent Chan 937d21ed29 properly fix folder upload to use delegatedEvent 2016-06-14 11:51:03 +02:00
Vincent Chan 864c3a8fbb fixes direct upload to folder 2016-06-14 09:58:03 +02:00
Jenkins for ownCloud 5887afbb37 [tx-robot] updated from transifex 2016-06-14 08:02:15 +02:00
Arthur Schiwon ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 2016-06-14 01:06:25 +02:00
Vincent Chan 433cea30c3 adds visual indication for file drag and drop 2016-06-13 23:00:56 +02:00
Vincent Chan 2abd663419 update jQuery File Upload Plugin (9.12.5) to support dragleave 2016-06-13 22:26:49 +02:00
Christoph Wurst 465807490d
create session token only for clients that support cookies 2016-06-13 19:44:05 +02:00
Thomas Müller 990ac34aaa Use proper namespaces - fixes #25078 (#25079) 2016-06-13 19:32:54 +02:00
Christoph Wurst 331d88bcab
create session token on all APIs 2016-06-13 15:38:34 +02:00
Jenkins for ownCloud 3840466f9a [tx-robot] updated from transifex 2016-06-13 12:21:11 +00:00
Lukas Reschke 01f8434a75 Merge pull request #57 from nextcloud/fdrop-template
smaller files drop fixes
2016-06-13 00:14:34 +02:00
Arthur Schiwon 42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 2016-06-11 15:34:43 +02:00
Arthur Schiwon ca43c49709
smaller files drop fixes
* fix infinite spinner on blacklisted files
* move HTML to template
* indentation
2016-06-11 15:15:37 +02:00
Lukas Reschke 842cc2a788 Merge pull request #19 from nextcloud/files-drop
add "hide file list" option
2016-06-10 18:29:09 +02:00
Vincent Petry 14fde6650c Merge pull request #25003 from owncloud/fix_ocs_path_response
Fix OCS Share API path response
2016-06-10 16:49:50 +02:00
Bjoern Schiessle e991b23d9d
log events from versions app 2016-06-10 15:39:04 +02:00
Bjoern Schiessle 86f12cc3e7
listen to trash bin and group manager hooks 2016-06-10 15:38:57 +02:00
Lukas Reschke aa831252b3
Add basic audit component to logger
Logs already:
- Share events
- Authentication events
- User management events
- File action events
2016-06-10 15:38:25 +02:00
Vincent Petry c51bdd1809
Fix GDrive test rename overwrite folder 2016-06-10 14:53:37 +02:00
Lukas Reschke 54e2ac5713
Add text about uploaded files 2016-06-10 14:47:40 +02:00
Vincent Petry 57b999fde7 Merge pull request #24990 from owncloud/fix_24868
Wrap publicwebdav in sharePermission mask
2016-06-10 14:33:06 +02:00
Vincent Petry 68c3b23e04 Merge pull request #24080 from owncloud/support-calendar-class-property
Extract CLASS property from calendar object and store it in the database
2016-06-10 11:22:11 +02:00
Vincent Petry 1abe5b0408 Merge pull request #25024 from owncloud/ldap-cachedgroupsbymember
Use array_merge when reading cached groups members
2016-06-10 11:06:41 +02:00
Vincent Petry 67c3a97401 Merge pull request #25046 from owncloud/fix-the-realm
Use the correct realm for basic authentication
2016-06-10 10:41:46 +02:00
Vincent Petry 543545505d Merge pull request #25043 from owncloud/webdav-download-mimetype
DAV now returns file name with Content-Disposition header
2016-06-10 09:55:59 +02:00
Jenkins for ownCloud e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Lukas Reschke c49402d266
Add some error handling 2016-06-09 21:44:54 +02:00
Arthur Schiwon a636e4ff28
Downstream 2016-06-09
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
2016-06-09 18:45:12 +02:00
Lukas Reschke c268ad1597
Add PHP unit test 2016-06-09 18:29:13 +02:00
Lukas Reschke e878e786e0
Fix public upload for normal shares 2016-06-09 18:12:58 +02:00
Vincent Petry 059778bef0
Add unit test for LDAP multi group caching 2016-06-09 17:57:07 +02:00
Lukas Reschke 6e99b0f59d
Make uploading possible via select and cleanup CSS 2016-06-09 17:55:26 +02:00
Lukas Reschke 5fdde426eb
Add fancy layout 2016-06-09 17:55:26 +02:00
blizzz 51fd2602a7 Revert "Downstream 2016-06-08" 2016-06-09 17:41:57 +02:00
Vincent Petry 6ba18934e6 Merge pull request #25000 from owncloud/fix-email-login-dav
Allow login by email address via webdav as well
2016-06-09 16:28:06 +02:00
Vincent Petry ac163426ef Merge pull request #25008 from owncloud/externals_test_with_origin
Add support to know where the storage test comes from
2016-06-09 16:21:05 +02:00
Vincent Petry 1399e87d57
DAV now returns file name with Content-Disposition header
Fixes issue where Chrome would append ".txt" to XML files when
downloaded in the web UI
2016-06-09 15:51:41 +02:00
Lukas Reschke 53ba111e21
Fix XSS 2016-06-09 15:15:17 +02:00
Lukas Reschke 075bf73c80
Prevent access to shareinfo if share if read-only 2016-06-09 15:15:17 +02:00
Bjoern Schiessle 66d853680c
block webdav access if share is not readable 2016-06-09 15:15:17 +02:00
Bjoern Schiessle bb54ab0db8
add hide file list option 2016-06-09 15:15:17 +02:00
Joas Schilling 6ec2d1244c
Adjust test to work with phpunit < 5.2 2016-06-09 14:00:02 +02:00
Roeland Jago Douma b0dd0634e3
Bring back sharedstorage hooks 2016-06-09 14:00:02 +02:00
Jenkins for ownCloud 6aab7d7232
[tx-robot] updated from transifex 2016-06-09 14:00:02 +02:00
Vincent Petry 8c7a32ccb9
Fix GDrive upload file which name might match the one of a folder
Whenever a file is uploaded to GDrive, there is a check for that file
with and without extension, due to Google Docs files having no
extension. This logic now only kicks in whenever the detected
extensionless file is really a Google Doc file, not a folder.

This makes it possible again to upload a file "test.txt" in a folder
that also has a folder called "test"
2016-06-09 14:00:01 +02:00
Robin Appelman 9b5fd515ef
Better handling of forbidden files in dav 2016-06-09 14:00:01 +02:00
Joas Schilling a6134a6d2f
Improve the UX for "not found" perma links 2016-06-09 14:00:00 +02:00
Jenkins for ownCloud d72d8c1fcb
[tx-robot] updated from transifex 2016-06-09 13:59:59 +02:00
Robin Appelman e7a55c4fef
handle path not being set in shared cache (#24993) 2016-06-09 13:59:59 +02:00
Thomas Müller c4b80b86db
Fix checkMove() implementation for dav v2 - fixes #24776 (#24971) 2016-06-09 13:59:59 +02:00
Robin Appelman 16559e4a8a
add test for deleting ghost files over dav 2016-06-09 13:59:58 +02:00
Thomas Müller cf06b17df1
Use the correct realm for basic authentication - fixes #23427 2016-06-09 13:53:32 +02:00
Thomas Müller f20c617154
Allow login by email address via webdav as well - fixes #24791 2016-06-09 12:08:49 +02:00
Thomas Müller bfcd1dc49c
Filter confidential calendar objects in shared calendars
Filter private calendar objects in shared calendars
2016-06-09 11:09:14 +02:00
Thomas Müller 082f456b8b
Added unit testing for the migration step 2016-06-09 11:09:14 +02:00
Thomas Müller 369c3b5d7e
Implement classification migration as repair step 2016-06-09 11:09:14 +02:00
Thomas Müller 287e41732c
Bump dav app version and fix variable rename 2016-06-09 11:09:14 +02:00
Thomas Müller f013cfc530
Add migration step 2016-06-09 11:09:13 +02:00
Thomas Müller fbdec59f22
Extract CLASS property from calendar object and store it in the database 2016-06-09 11:09:13 +02:00
Jenkins for ownCloud 355f50bd6c [tx-robot] updated from transifex 2016-06-09 06:16:41 +00:00
Vincent Petry 6de406ae51 Merge pull request #25023 from owncloud/fix-22127-trusted-servers
Fixed problem about removing trusted servers accidentally
2016-06-08 17:41:16 +02:00
Jan-Christoph Borchardt 81145ee57c THIS IS NEXTCLOUD! adjusting the design 2016-06-08 17:02:18 +02:00
Vincent Petry 56215513e1 Merge pull request #25012 from owncloud/gdrive-fixfilesizewithmimetypemismatch
Fix GDrive file size when mime type doesn't match contents
2016-06-08 16:24:14 +02:00
Sergio Bertolín 6bc7e3f92f Removed old html 2016-06-08 11:11:30 +00:00
Juan Pablo Villafáñez 7d85bed1fc Change the default value to true instead of null 2016-06-08 12:48:33 +02:00
Sergio Bertolín b8493629ae Improve readability 2016-06-08 10:19:18 +00:00
Arthur Schiwon 499f56e2b4
implement specific rename handling for SMB 2016-06-08 12:15:09 +02:00
Vincent Petry c5a6c8b70b
Use array_merge when reading cached groups members 2016-06-08 11:22:01 +02:00
Sergio Bertolín e0aaa21bd8 Fixed problem about removing trusted servers accidentally 2016-06-08 09:02:05 +00:00
Vincent Petry b3592ab806 Merge pull request #25019 from owncloud/fix_24937
Bring back sharedstorage hooks
2016-06-08 10:22:16 +02:00
Vincent Petry 8d0948977e Merge pull request #24899 from owncloud/local-storage-symlinks
dissalow symlinks in local storages that point outside the datadir
2016-06-08 10:19:24 +02:00
Vincent Petry 652b4961f2 Merge pull request #25001 from owncloud/issue-24939-better-ux-on-invalid-perma-link
Improve the UX for "not found" perma links
2016-06-08 09:56:24 +02:00
Vincent Petry fa9c96ac4f
Fix GDrive file size when mime type doesn't match contents
Uploading a txt file with XML contents makes GDrive return the XML mime
type.

This fix makes sure the logic that returns "SPACE_UNKNOWN" for the size
properly rely on the Google Docs mime types.
2016-06-08 09:46:49 +02:00
Vincent Petry 4fd55c255f Merge pull request #25007 from owncloud/gdrive-fixuploadsamenameasfolder
Fix GDrive upload file which name might match the one of a folder
2016-06-08 09:46:15 +02:00
Joas Schilling 68a7aed27b
Adjust test to work with phpunit < 5.2 2016-06-08 09:24:00 +02:00
Roeland Jago Douma 4a3c67fdb4
Bring back sharedstorage hooks 2016-06-08 08:19:32 +02:00
Jenkins for ownCloud bbd61cd98a [tx-robot] updated from transifex 2016-06-08 01:54:57 -04:00
Juan Pablo Villafáñez a2b00582bc Fix test 2016-06-07 18:27:10 +02:00
Juan Pablo Villafáñez 110edd3d3c Rename variable 2016-06-07 18:25:17 +02:00
Juan Pablo Villafáñez 8526bbb347 Add support to know where the storage test comes from 2016-06-07 16:53:16 +02:00
Vincent Petry 15fffb2b10
Fix GDrive upload file which name might match the one of a folder
Whenever a file is uploaded to GDrive, there is a check for that file
with and without extension, due to Google Docs files having no
extension. This logic now only kicks in whenever the detected
extensionless file is really a Google Doc file, not a folder.

This makes it possible again to upload a file "test.txt" in a folder
that also has a folder called "test"
2016-06-07 16:29:23 +02:00
Roeland Jago Douma 72c5535492
Extend unit tests 2016-06-07 15:09:26 +02:00
Roeland Jago Douma 2e2ece753f
Fix unit tests 2016-06-07 15:09:25 +02:00
Roeland Jago Douma 7c040c0bf9
Show the path relative to the requesting user
A share can only be requested by 3 'types' of people

* owner
* initiator
* recipient

So we have to get the path as the current user. Since that is the only
path that has any meaning to the user.
2016-06-07 15:09:19 +02:00
Robin Appelman f119769c26 Better handling of forbidden files in dav 2016-06-07 14:01:55 +02:00
Joas Schilling 77db6d3dbd
Improve the UX for "not found" perma links 2016-06-07 13:53:16 +02:00
Vincent Petry 46fe2ddf2e Merge pull request #23845 from owncloud/smb-rename
implement specific rename handling for SMB
2016-06-07 12:32:51 +02:00
Vincent Petry bf917d7063 Merge pull request #24813 from owncloud/delete-ghost-files
allow deleting "ghost files" trough the View and Node api
2016-06-07 09:34:16 +02:00
Jenkins for ownCloud f28f6ad2df [tx-robot] updated from transifex 2016-06-07 01:55:08 -04:00
Robin Appelman 7a0254b15b handle path not being set in shared cache (#24993) 2016-06-06 17:01:55 +02:00
Thomas Müller 371a07e3ab Fix checkMove() implementation for dav v2 - fixes #24776 (#24971) 2016-06-06 17:01:27 +02:00
Roeland Jago Douma 1b5368bbaf
Wrap publicwebdav in sharePermission mask
Fixes #24868

The writable mask was a bit misleading. We should wrap with the
sharepermissions (as they are used everywhere else). The
PERMISSIONS_SHARE are added since that is required for the public link
check plugin.
2016-06-06 14:39:02 +02:00
Jenkins for ownCloud fb5fb6a9b5 [tx-robot] updated from transifex 2016-06-06 06:51:58 -04:00
Vincent Petry 2867d7a0f8 Merge pull request #24964 from owncloud/issue-24961-public-upload-unlimited
Allow public upload when the quota is unlimited
2016-06-06 11:28:52 +02:00
Jenkins for ownCloud 4234892a60 [tx-robot] updated from transifex 2016-06-04 02:01:18 -04:00
Robin Appelman 3bd5073251 add test for deleting ghost files over dav 2016-06-03 13:37:52 +02:00
Vincent Petry f2064232ef Merge pull request #24673 from owncloud/construct-path
Construct path to the version file from the current directory and fil…
2016-06-03 10:50:35 +02:00
Jenkins for ownCloud 63132483ca [tx-robot] updated from transifex 2016-06-03 02:19:30 -04:00
Victor Dubiniuk d82df7e490
Construct path to the version file from the current directory and filename. Fixes #22450 2016-06-02 15:47:12 +02:00
Vincent Petry 3ff2bec5fa Merge pull request #24935 from owncloud/2fa-block-dav
block DAV if 2FA challenge needs to be solved first
2016-06-02 15:31:18 +02:00
Joas Schilling 5c8e0596e6
Allow public upload when the quota is unlimited 2016-06-02 15:27:16 +02:00
Vincent Petry f584d5f03e Merge pull request #24949 from owncloud/ee-1325-internal-server-error-in-sync-client-on-forbidden-directurl
Catch the ForbiddenException to make sure it gets handled
2016-06-02 10:39:43 +02:00
Jenkins for ownCloud f9f8fb7bf2 [tx-robot] updated from transifex 2016-06-02 01:55:16 -04:00
Joas Schilling 942e946f06
Catch the ForbiddenException to make sure it gets handled 2016-06-01 16:17:57 +02:00
Christoph Wurst da03a85c3c
block DAV if 2FA challenge needs to be solved first 2016-06-01 10:42:38 +02:00
Vincent Petry 0f2017c7da Merge pull request #24869 from owncloud/ldap_capped_cache
Use a capped memory cache for the user/group cache
2016-06-01 10:35:04 +02:00
Jenkins for ownCloud a9f666f36e [tx-robot] updated from transifex 2016-06-01 01:56:03 -04:00
Arthur Schiwon c9132261c8 implement specific rename handling for SMB 2016-05-31 13:32:11 +02:00
Vincent Petry c6183f167c Merge pull request #24904 from owncloud/ext-fix-smb
Fix SMB backend registration
2016-05-31 10:50:29 +02:00
Vincent Petry 9a9c1b9439 Merge pull request #24822 from owncloud/fix-download-spinner
fixes size of the download spinner
2016-05-31 10:42:13 +02:00
Vincent Petry 3361cdf0cc Merge pull request #16688 from owncloud/tests-dockerapachewebdav
Add morrisjobke/webdav docker container for external storage tests
2016-05-31 09:55:06 +02:00
Jenkins for ownCloud b2e524b936 [tx-robot] updated from transifex 2016-05-31 01:54:58 -04:00
Torben Dannhauer 718f0757e4 Fix for #23066 (#24689) 2016-05-31 06:53:28 +02:00
Robin McCorkell 4ea7a349d2 Fix SMB backend registration 2016-05-30 21:25:10 +01:00
Vincent Petry d201ffe13d
Fix webdav test env scripts to also work on CI 2016-05-30 16:10:30 +02:00
Vincent Petry a76498f245
Add morrisjobke/webdav docker container for external storage tests 2016-05-30 16:10:30 +02:00
Vincent Petry 76c0bc29fe Merge pull request #20150 from pellaeon/pr-droppable-hover-visual-cue
Add visual cue when moving draggable item over droppable item,
2016-05-30 16:03:36 +02:00
Vincent Chan 3538e90ba1
fixes size of the download spinner 2016-05-30 11:23:54 +02:00
Joas Schilling 12b482b976 [testing] Allow to lock a file without the lock being killed at the end of the request (#22823)
* Allow to lock a file without the lock being killed at the end of the request

* Make DB locking detectable
2016-05-30 11:16:14 +02:00
Roeland Jago Douma dc4fd43f39
Use a capped memory cache for the user/group cache
For #24403
When upgrading huge installations this can lead to memory problems as
the cache will only grow and grow.

Capping this memory will make sure we don't run out while during normal
operation still basically cache everything.
2016-05-30 10:57:14 +02:00
Jenkins for ownCloud 985063a7e2 [tx-robot] updated from transifex 2016-05-30 01:57:01 -04:00
Jenkins for ownCloud c870e77546 [tx-robot] updated from transifex 2016-05-29 01:55:25 -04:00
Jenkins for ownCloud c778fa062c [tx-robot] updated from transifex 2016-05-28 01:55:21 -04:00
Jenkins for ownCloud a95275d27b [tx-robot] updated from transifex 2016-05-27 01:55:35 -04:00
Lukas Reschke aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Jenkins for ownCloud 567381e361 [tx-robot] updated from transifex 2016-05-26 01:56:23 -04:00
Vincent Petry fa5fd68d75 Merge pull request #24844 from owncloud/dav-test-psr4
Move DAV Tests to PSR-4
2016-05-25 17:26:32 +02:00
Vincent Petry 379f8a1e45 Merge pull request #24604 from owncloud/user_ldap-psr4
Move user_ldap to PSR-4
2016-05-25 17:11:10 +02:00
Joas Schilling 2c0743c46b
Fix the tests again 2016-05-25 16:51:02 +02:00
Vincent Petry 299954c03d Merge pull request #24840 from owncloud/fix-missing-ext-str-import
Fix missing use statements in ext. str. tests
2016-05-25 16:31:32 +02:00
Joas Schilling 5882e21b3b
Update DAV unit tests to PSR-4 2016-05-25 16:09:18 +02:00
Joas Schilling 42ba61db04
Fix local execution 2016-05-25 16:09:18 +02:00
Joas Schilling b9a26bca3b
Fix throws docs 2016-05-25 16:06:09 +02:00
Joas Schilling a4980a3de4
Last instances of lowercase user_ldap 2016-05-25 16:06:09 +02:00
Joas Schilling 3ef8c95b37
Move tests/ to PSR-4 2016-05-25 16:06:09 +02:00
Joas Schilling b616318327
Fix several minor issues 2016-05-25 16:06:08 +02:00
Joas Schilling db2e9df5f0
Move Job to a better class name 2016-05-25 16:06:06 +02:00
Joas Schilling c807a26bd8
Move Access to PSR-4 2016-05-25 16:04:59 +02:00
Joas Schilling 02d5b75fb4
Move BackendUtility to PSR-4 2016-05-25 16:04:59 +02:00
Joas Schilling aa7b600383
Move Configuration to PSR-4 2016-05-25 16:04:59 +02:00
Joas Schilling af0a6961b1
Move Connection to PSR-4 2016-05-25 16:04:59 +02:00
Joas Schilling 387019a212
Move FilesystemHelper to PSR-4 2016-05-25 16:04:58 +02:00
Joas Schilling 7db6b487f5
Move Helper to PSR-4 2016-05-25 16:04:58 +02:00
Joas Schilling 391531851c
Move interface to PSR-4 2016-05-25 16:04:58 +02:00
Joas Schilling 3690ce1b36
Move LDAP to PSR-4 2016-05-25 16:04:58 +02:00
Joas Schilling 5b3087d375
Move LDAP Utility to PSR-4 2016-05-25 16:04:57 +02:00
Joas Schilling 6feccccbd5
Move LogWrapper to PSR-4 2016-05-25 16:04:57 +02:00
Joas Schilling e73d811425
Move Proxy to PSR-4 2016-05-25 16:04:57 +02:00
Joas Schilling d16a97a273
lib/user 2016-05-25 16:04:57 +02:00
Joas Schilling d4e828f39e
Move wizard 2016-05-25 16:04:57 +02:00
Joas Schilling 3f5e76162d
Move lib\user to PSR-4 2016-05-25 16:04:56 +02:00
Joas Schilling b7fa527791
Move User_LDAP and User_Proxy to PSR-4 2016-05-25 16:04:56 +02:00
Joas Schilling cbba55a26c
Move Group_LDAP and Group_Proxy to PSR-4 2016-05-25 16:04:56 +02:00
Joas Schilling 4ac283ecd3
Move Command namespace to PSR-4 2016-05-25 16:04:56 +02:00
Joas Schilling 9d61acb27d
Move User_LDAP to PSR-4 2016-05-25 16:04:55 +02:00
Vincent Petry d22aeb749d Merge pull request #24661 from owncloud/files_sharing-psr4
Move Files_Sharing to PSR-4
2016-05-25 15:40:05 +02:00
Vincent Petry e1b89f0957 Merge pull request #24838 from owncloud/fix-failing-updatenotifications-tests
Fix failing update notifications tests
2016-05-25 15:14:29 +02:00
Joas Schilling 9c734dcba7
Fix missing use statements in ext. str. tests 2016-05-25 15:10:27 +02:00
Vincent Petry eddc222369 Merge pull request #24815 from owncloud/fix-autotest-external-psr4
Fix ext storage test class name in test script
2016-05-25 15:09:33 +02:00
Joas Schilling 3f0b2d148d
Move tests to PSR-4 2016-05-25 15:00:00 +02:00
Joas Schilling b72706b450
Move background job to PSR-4 2016-05-25 14:59:59 +02:00
Joas Schilling 3a716ae91c
Move lib/ to PSR-4 2016-05-25 14:59:59 +02:00
Joas Schilling 5001036fd4
Move classes from outside lib/ to PSR-4 2016-05-25 14:59:59 +02:00
Joas Schilling 338106124f
Fix failing update notifications tests 2016-05-25 12:11:51 +02:00
Björn Schießle 0f728b4cd1
don't fail on "bad signature" during login. Most likely this happens because
the login password changed at the user back-end (e.g ldap). Such failures will
be handled after login correctly by allowing the user to adjust the passwords
2016-05-25 11:39:44 +02:00
Joas Schilling 25f3110730 Fix ShareControllerTest (#24824) 2016-05-25 10:21:07 +02:00
Vincent Petry c36cf30ade Merge pull request #24444 from owncloud/update-notifications-for-core-and-apps
Update notifications for core and apps
2016-05-25 09:13:10 +02:00
Vincent Petry ae4ee56997 Merge pull request #24814 from owncloud/fix-psr4-external-maste
Move Stuff to PSR-4 again
2016-05-25 09:12:17 +02:00
Vincent Petry 5f1ddf1f7f Merge pull request #24811 from owncloud/client-login-token-2fa
do not allow client password logins if token auth is enforced or 2FA …
2016-05-25 09:07:39 +02:00
Jenkins for ownCloud 6972f4dc50 [tx-robot] updated from transifex 2016-05-25 02:03:38 -04:00
Jenkins for ownCloud f1f7511c61 [tx-robot] updated from transifex 2016-05-24 15:24:38 -04:00
Christoph Wurst 28ce7dd262
do not allow client password logins if token auth is enforced or 2FA is enabled 2016-05-24 17:54:02 +02:00
Vincent Petry d3fb5d618e Merge pull request #24748 from owncloud/login-explicitly
Log in explicitly, save login name when generating browser/device tokens
2016-05-24 17:51:49 +02:00
Joas Schilling 9382cd1d8e
Fix the names of the tests so the script discovers them again 2016-05-24 16:37:06 +02:00
Vincent Petry e8c3794308 Merge pull request #7897 from owncloud/ext-swiftcaching
Added object cache for Swift ext storage
2016-05-24 16:21:30 +02:00
Joas Schilling 794c566244
Move Stuff to PSR-4 again 2016-05-24 16:10:22 +02:00
Vincent Petry f7d102ccc5 Merge pull request #24799 from owncloud/altyr-117-upstream
Update google-api-php-client to 1.1.7
2016-05-24 14:46:10 +02:00
Vincent Petry 648fc8d916 skip google map files (#24807) 2016-05-24 14:45:29 +02:00
Dmitry Popov 83aa28ed1d My fix for #24272, #23613, File not found when single file in a folder (#24800)
* Fixed group share searching for members of
multiple group. Issue #11808.

* Fixed group share searching, continued.

Avoid searching for empty group list in getItemSharedWithUser().
Broke tests in previous commit, #12030.

* Simler check for group count.

* Fix for https://github.com/owncloud/core/issues/24783 , described there

* Now it's #24272, 24783 was a duplicate. Previous change was also not very good. Now we don't create ZIP with a single file inside.
2016-05-24 14:09:05 +02:00
Robin Appelman 8a40003169 fix phpdoc 2016-05-24 13:58:08 +02:00
Vincent Petry 465cf9fe9b Merge pull request #24346 from lenz1111/fix_24331
Fix: Bugs in shared link with video #24331
2016-05-24 13:49:02 +02:00
Robin Appelman c031eafd84 Fix cert bundle path 2016-05-24 13:44:43 +02:00
Vincent Petry f77a11a876
Added object cache for Swift ext storage
This avoid calling the remote API for repeated calls to is_dir,
filetype, etc
2016-05-24 13:29:29 +02:00
Piotr Filiciak df59c5d1ee bug fix 2016-05-24 12:43:43 +02:00
Piotr Filiciak 11b2e98a30 video poster 2016-05-24 12:34:37 +02:00
Vincent Petry 4635ed7748
Fix autoloading for new google SDK lib 2016-05-24 12:22:30 +02:00
Francesco Rovelli c23bc91198
Add new files 2016-05-24 12:22:30 +02:00
Francesco Rovelli 49bec94959
enable autoload of lib in google storage 2016-05-24 12:22:30 +02:00
Francesco Rovelli c1583f03ab
Update google-api-php-client from 1.0.6-beta to 1.1.7 2016-05-24 12:22:30 +02:00
Joas Schilling 3eba0c479f
Fix import path for 3rdparty dropbox autoloader
We moved the file by one level
2016-05-24 12:15:53 +02:00
Vincent Petry c60ef7deb8 Merge pull request #24619 from owncloud/files_external-psr4
Move files_external to PSR-4
2016-05-24 11:54:12 +02:00
Christoph Wurst ad10485cec
when generating browser/device token, save the login name for later password checks 2016-05-24 11:49:15 +02:00
Vincent Petry f8bbbba306 Merge pull request #24682 from f4bsch/master
dont update search onResize
2016-05-24 11:47:47 +02:00
Joas Schilling a1e872aad6
Add a URL to the notifications 2016-05-24 11:26:54 +02:00
Joas Schilling 12ec0dfe3c
The setting only affects available core updates 2016-05-24 11:26:54 +02:00
Joas Schilling 823e4911c9
Add tests for the Notifier 2016-05-24 11:26:53 +02:00
Joas Schilling 96691138df
Add tests for the background job 2016-05-24 11:26:53 +02:00
Joas Schilling c34788918d
Make the group selectable 2016-05-24 11:26:52 +02:00
Joas Schilling d2553a4f6e
Dismiss the notifications when the update is already installed 2016-05-24 11:26:52 +02:00
Joas Schilling 752ec68e18
Add a notifier that parses the notifications 2016-05-24 11:26:52 +02:00
Joas Schilling aac990eddf
Add a background job that generates notifications when an update is available 2016-05-24 11:26:51 +02:00
Joas Schilling 64538740ec
Fix missing imports 2016-05-24 08:41:22 +02:00
Joas Schilling f14dff680d
Move remaining classes to PSR-4 2016-05-24 08:41:22 +02:00
Joas Schilling 4576891f10
Move Lib\Storage to PSR-4 2016-05-24 08:41:22 +02:00
Joas Schilling b9fd7d4cc7
Move Config to PSR-4 2016-05-24 08:41:21 +02:00
Joas Schilling 6ea54e73e8
Move Lib\Backend to PSR-4 2016-05-24 08:41:21 +02:00
Joas Schilling 6d7a1b9bd4
Move Lib\Auth to PSR-4 2016-05-24 08:41:21 +02:00
Joas Schilling 328b3c47d7
Move stuff from outside lib/ to PSR-4 2016-05-24 08:41:20 +02:00
Vincent Petry adcf942901 Merge pull request #24750 from owncloud/lenz1111-share_download_range_requests_support
Http Range requests support in downloads
2016-05-23 21:01:26 +02:00
Vincent Petry 87fa86a69a Merge pull request #24559 from owncloud/2fa
two factor auth
2016-05-23 20:50:03 +02:00
Vincent Petry c10d8a37f7 Merge pull request #22690 from owncloud/fix-comments-href-remote.php-files
ensure comments-href returns a value also when propfind is done again…
2016-05-23 14:47:03 +02:00
Vincent Petry bd87f67473 Merge pull request #24349 from owncloud/nfd-storagewrapper
Add wrapper for NFD encoding workaround
2016-05-23 13:45:33 +02:00
Christoph Wurst dfb4d426c2
Add two factor auth to core 2016-05-23 11:21:10 +02:00
Vincent Petry 9264674b36 Merge pull request #24514 from owncloud/federation-psr4
Move federation app to PSR-4
2016-05-23 09:52:38 +02:00
Vincent Petry 5ba1add03c Merge pull request #24603 from owncloud/federated_reshare
flat federated re-share
2016-05-23 09:52:13 +02:00
Joas Schilling 54f8822670
Fix unit tests 2016-05-23 09:03:48 +02:00
Joas Schilling c9fda84841
Make the root collection neutral so it does not only work for files 2016-05-23 09:03:48 +02:00
Joas Schilling 3a8e537946
Remove unused UserFolder 2016-05-23 09:03:47 +02:00
Jenkins for ownCloud 357d342467 [tx-robot] updated from transifex 2016-05-23 01:55:10 -04:00
Jenkins for ownCloud 88328000b1 [tx-robot] updated from transifex 2016-05-22 01:56:56 -04:00
Vincent Petry 6934840083 Merge pull request #24307 from owncloud/systemtags-perminterface
Add interface methods for permission check for system tags
2016-05-21 19:06:54 +02:00
Jenkins for ownCloud bca7586574 [tx-robot] updated from transifex 2016-05-21 01:55:53 -04:00
Pellaeon Lin 72ac5dd8a1 Make entire file tr droppable,
so that .canDrop will highlight the entire row when drag hover
2016-05-21 12:54:29 +08:00
Pellaeon Lin d3ff3c589b Add visual cue when moving draggable item over droppable item,
ie. breadcrumb and filenameTd
2016-05-21 12:54:29 +08:00
Björn Schießle 20852fd8c0
remove reshares and the mapping in the federated_reshares table on unshare from self 2016-05-20 21:15:16 +02:00
Björn Schießle bc8f659d06
add missung return value 2016-05-20 21:15:16 +02:00
Björn Schießle 06b6e2bff5
improved error messages 2016-05-20 21:15:16 +02:00
Björn Schießle e25fbaf65d
move motifier from the files_sharing app to the federatedfilessharing app 2016-05-20 21:15:16 +02:00
Björn Schießle 92fa0c7dfd
fall back to old re-sharing behaviour in case the remote server doesn't support flat-reshares 2016-05-20 21:15:16 +02:00
Björn Schießle 2dc26aada7
update share permissions 2016-05-20 21:15:15 +02:00
Björn Schießle 7b25839bd5
use share initiator as fall back to access the file
in case of federated re-shares the owner can be a remote user.
Therefore we can't always use to owner to access the local file
2016-05-20 21:15:15 +02:00
Björn Schießle 81e3787f9c
close cursor after select to avoid db lock 2016-05-20 21:15:11 +02:00
Björn Schießle d23df4cba7
create re-share by owner and propagate unshare and unshare-from self request
correctly accross share owner and share initiator
2016-05-20 21:15:11 +02:00
Björn Schießle 8f87e1104d
use query builder for getShare and add tests 2016-05-20 21:15:11 +02:00
Björn Schießle 5a1641bed2
move request handler for federated shares to the federated sharing app 2016-05-20 21:15:08 +02:00
Piotr Filiciak 9999e05660
Http Range requests support in downloads
Http range requests support is required for video preview
2016-05-20 18:16:44 +02:00
Vincent Petry 66e93561da
Rename "not-assignble" to "restricted" 2016-05-20 17:56:02 +02:00
Vincent Petry 5963128342
Adjust DAV SystemTagPlugin unit tests for groups 2016-05-20 17:56:02 +02:00
Vincent Petry 91d4249ed8
Fix system tags DAV plugin tests 2016-05-20 17:56:02 +02:00
Vincent Petry 10fae3994a
Fix system tag update code 2016-05-20 17:56:02 +02:00
Vincent Petry d7727cdc74
Add admin-only system tag groups property
For setting/getting system tag groups
2016-05-20 17:56:02 +02:00
Vincent Petry 88740f035d
Act on effective system tag canAssign permission
Whenever the server returns true for the can-assign Webdav property of
a system tag, it means the current user is allowed to assign,
regardless of the value of user-assignable.

This commit brings the proper logic to the web UI to make it possible
for users to assign when they have the permission.
2016-05-20 17:56:02 +02:00
Vincent Petry 03d32bc39b
Fix system tags DAV unit tests 2016-05-20 17:56:02 +02:00
Vincent Petry bede872dbc
Bring back admin permissions to change system tag permissions 2016-05-20 17:56:02 +02:00
Vincent Petry 09b3883d9c
Updated canUser* functions in SystemTagManager to accept objects 2016-05-20 17:56:02 +02:00
Vincent Petry 8343cfb64b
Add interface methods for permission check
Instead of checking for admin perm, use interface method
canUserAssignTag and canUserSeeTag to check for permissions.
Allows for more flexible implementation.
2016-05-20 17:56:02 +02:00
Arthur Schiwon 2b30136ae9
ensure comments-href returns a value also when propfind is done against remote.php/files 2016-05-20 16:22:13 +02:00
Vincent Petry 59a85a4c76 Merge pull request #22576 from owncloud/folder_scroll_fix
Add scrolling when dragging files. Fixes #12329
2016-05-20 16:19:01 +02:00
Vincent Petry e8d082208d
Fixes for encoding wrapper
Improved label
Fixed rename/copy/moveFromStorage/copyFromStorage and added tests
Improved findPathToUse algo
2016-05-20 09:33:59 +02:00
Vincent Petry db4c7fe743
Add encoding wrapper as opt-in mount option
The encoding wrapper is now only applied when the mount option is set,
disabled by default.
2016-05-20 09:33:59 +02:00
Vincent Petry 63bbbf29f4
Add wrapper for NFD encoding workaround 2016-05-20 09:33:59 +02:00
Vincent Petry 2ef751b1ec Merge pull request #24702 from owncloud/background-scan-occ
add --unscanned option to files:scan to triger a background scan
2016-05-20 09:29:37 +02:00
Jenkins for ownCloud 67162e636e [tx-robot] updated from transifex 2016-05-20 01:54:52 -04:00
Vincent Petry 4728308a9e Merge pull request #24585 from owncloud/files_external_lazy
Load external storage backends/auth mechanisms lazily
2016-05-19 18:08:17 +02:00
Robin Appelman f313105dbd add "unscanned" option to files:scan to triger a background scan 2016-05-19 14:19:09 +02:00
Joas Schilling 320b1c3abf
Fix more failures 2016-05-19 10:11:42 +02:00
Joas Schilling a6b4ba9ba1
Fix errors in the tests 2016-05-19 09:48:00 +02:00
Joas Schilling da332c134e
Move federation tests to PSR-4 2016-05-19 09:48:00 +02:00
Joas Schilling 0c727f1755
Move federation code to PSR-4 2016-05-19 09:48:00 +02:00
Jenkins for ownCloud 7ca5b35379 [tx-robot] updated from transifex 2016-05-19 01:54:58 -04:00
Joas Schilling 8dc25321d3
Move FederatedFileSharing to PSR-4 2016-05-18 15:28:50 +02:00
Jenkins for ownCloud 765782445a [tx-robot] updated from transifex 2016-05-18 01:54:53 -04:00
blizzz 8ce8a05dab Fixed dynamic group ldap access (#23450)
* Fixed dynamic group ldap access

getUserGroups:
Using $userDN instead of $uid to query LDAP
Converting groupDN to group name using API instead of substring
Removing cache processing at the end of the method

* Fixing group handling

added back the cache processing and fixed

* fixed possible indention problem

spaces -> tab conversion

* formatting, white-space changes only
2016-05-17 23:09:36 +02:00
Fabian 2a7d3dd831 dont update search onResize
this.updateSearch() sets the current file list instance and clears the box. This is unnecessary and makes the search box unsuable on some mobile devices where a keyboard fade-in causes a onResize trigger, which would then clear and blur the box.
2016-05-17 22:57:07 +02:00
Roeland Douma 5c9103287f Group fixup (#24621)
* Move used OC_Group_xx to \OC\Group

* Add (deprecated) legacy wrapper in legacy, OC_Group_xx

* Replace deprecated use of OC_Group_xx with \OC\Group\xx
2016-05-17 16:06:44 +02:00
Vincent Petry 5585fa0a68 Merge pull request #24630 from owncloud/one-shall-adjust-the-path
Use proper path
2016-05-17 10:11:21 +02:00
Jenkins for ownCloud c24a685ab5 [tx-robot] updated from transifex 2016-05-17 01:54:56 -04:00
Jenkins for ownCloud bafa02d312 [tx-robot] updated from transifex 2016-05-16 01:54:58 -04:00
Piotr Filiciak 53437ecced Fix: Bugs in shared link with video #24331 2016-05-15 15:41:02 +02:00
Jenkins for ownCloud 7c28f62e20 [tx-robot] updated from transifex 2016-05-15 01:55:34 -04:00
Jenkins for ownCloud 83cd655675 [tx-robot] updated from transifex 2016-05-14 01:56:45 -04:00
Erik Pellikka 5dbb549bbe
added back the jquery animations 2016-05-13 21:01:13 +02:00
Erik Pellikka 4e5f37a05d
code style fix 2016-05-13 21:01:13 +02:00
Erik Pellikka b94252e479
code style fix 2016-05-13 21:01:13 +02:00
Erik Pellikka 74dfc63b9a
code style fix 2016-05-13 21:01:13 +02:00
Erik Pellikka d3467edb70
added elseif 2016-05-13 21:01:13 +02:00
Erik Pellikka 45ff21e8d5
fixed to work with share links as well 2016-05-13 21:01:13 +02:00
Erik Pellikka e7366213f5
typo fix 2016-05-13 21:01:13 +02:00
Erik Pellikka 18b7b61f06
Tweaking 2016-05-13 21:01:13 +02:00
Morris Jobke 5711e88093
Avoids jumping if window is smaller than 300 pixels in height
* divides the area where the scroll should be triggered by 2
* uses the minimum value of the above and 300
2016-05-13 21:01:13 +02:00
Erik Pellikka e03a09d189
Add scrolling when dragging files 2016-05-13 21:01:13 +02:00
Vincent Petry 88da2966b4 Merge pull request #22341 from owncloud/pellaeon-pr-breadcrumb-filelist-overlap-drop
Handle case when breadcrumb and filelist item overlap and both receive a drop
2016-05-13 17:12:36 +02:00
Vincent Petry ddea34f959 Merge pull request #22214 from owncloud/ext-better-dropbox-gdrive
Direct links to Google Drive/Dropbox configuration pages from external storage config
2016-05-13 17:09:27 +02:00
Vincent Petry 9cba75ea8a Merge pull request #24605 from owncloud/luckydonald-Superduper-Progressbar-branch-thingie
Luckydonald superduper progressbar branch thingie
2016-05-13 10:00:35 +02:00
Jenkins for ownCloud cba4875e4d [tx-robot] updated from transifex 2016-05-13 02:08:45 -04:00
Vincent Petry 5f6fb45704
Merge branch 'Superduper-Progressbar-branch-thingie' of https://github.com/luckydonald/core into luckydonald-Superduper-Progressbar-branch-thingie 2016-05-12 18:15:54 +02:00
Joas Schilling b34bacd071 Move Files app to PSR-4 (#24569)
* Move lib/ of Files app to PSR-4

* Move tests to PSR-4
2016-05-12 12:07:06 +02:00
Joas Schilling eea98f1d74 Background jobs from info.xml (#24582)
* Move background job registration of Federation to info.xml

* Move background registration of Files app to info.xml

* Move background job registration of files_sharing to info.xml

* Move background job registration of files_trashbin to info.xml

* Move background job registration of files_versions to info.xml

* Move background job registration from user_ldap to info.xml
2016-05-12 10:43:43 +02:00
Joas Schilling 1def89b2c5 Move the testing app to PSR-4 (#24580) 2016-05-12 09:49:37 +02:00
Joas Schilling b57f3126eb Move files_versions to PSR-4 (#24571) 2016-05-12 09:49:15 +02:00
Joas Schilling d5dee80580 Move files_trashbin to PSR-4 (#24570) 2016-05-12 09:48:53 +02:00
Joas Schilling dd9ee10bc0 Move dav app to PSR-4 (#24527)
* Move Application to correct namespace and PSR-4 it

* Move dav app to PSR-4
2016-05-12 09:42:40 +02:00
Joas Schilling 4a3311f430 Move Encryption app to PSR-4 (#24524)
* Move Encryption to PSR-4

* Move encryption tests to PSR-4

* Fix the tests
2016-05-12 09:42:19 +02:00
Jenkins for ownCloud c5ae14453a [tx-robot] updated from transifex 2016-05-12 02:08:58 -04:00
Robin McCorkell 8f58b89c3f Add tests for backend/auth mechanism providers 2016-05-11 21:24:53 +01:00
Robin McCorkell 711bc7469a Use backend/auth mechanism providers in files_external 2016-05-11 21:16:31 +01:00
Robin McCorkell af0930fe59 Introduce backend/auth mechanism providers
Direct registration of backends/auth mechanisms is now deprecated
2016-05-11 21:16:26 +01:00
Vincent Petry ceaac03bb5 Make permalinks work for trashed files (#24537)
Opening a permalink that points to a trashed file will now display the
file within the "Deleted Files" section in the files web UI.
2016-05-11 19:41:36 +02:00
Joas Schilling 2a05035339 Move Provisioning api to PSR-4 (#24510)
* Move app to PSR-4

* Fix setUp method

* Fix the tests
2016-05-11 19:38:49 +02:00
Thomas Müller 3333c4c0b9 Merge pull request #24568 from owncloud/fix_24566
Fix etag propegation test race condition
2016-05-11 16:29:00 +02:00
Roeland Jago Douma 8bfa532075
Fix test race condition
E-tag propagation replies on the mtime of the file. Order of events:

1. add file 'foo.txt' with content 'bar'
2. Set mtime to now() - 1
3. Check if etag changed.

Now this goes right often when 1 and 2 happen in the same second.
However imagine

1. add file 'foo.txt' with content 'bar' (at t=0.999)
2. Set mtime to now() - 1 (at t=1.001)

Now the mtime will be set to the same time. Thus not chaning the etag.
2016-05-11 14:07:37 +02:00
Christoph Wurst 0486d750aa
use the UID for creating the session token, not the login name 2016-05-11 13:36:46 +02:00
Christoph Wurst 5e55dfb2d6
create session token for DAV clients (sync clients) 2016-05-11 13:36:46 +02:00
Thomas Müller 9eea062004 Merge pull request #24433 from owncloud/user_psr4
lib/private/user to PSR-4
2016-05-11 11:16:56 +02:00
Thomas Müller 199b447527
Yo-ho-oh - Murder all band 'o pirates 2016-05-11 09:16:17 +02:00
Jenkins for ownCloud 7da5331782 [tx-robot] updated from transifex 2016-05-11 01:55:55 -04:00
Morris Jobke e2748e4cbf
fix usage of legacy class in LDAP 2016-05-10 19:53:36 +02:00
Vincent Petry 510724716d Merge pull request #24401 from owncloud/trash-list-cache
use the cache for trash listing
2016-05-10 17:12:49 +02:00
Lukas Reschke e8e72aa910 Merge pull request #24434 from owncloud/permalinks
Permalinks
2016-05-10 09:44:50 +02:00
Jenkins for ownCloud 1fb7be42e5 [tx-robot] updated from transifex 2016-05-10 03:30:51 -04:00
Morris Jobke fdda980c2f Merge pull request #24466 from owncloud/issue_13936_wording_ldap
wording in LDAP wizard
2016-05-09 08:27:00 +02:00
Jenkins for ownCloud 10e0fc0629 [tx-robot] updated from transifex 2016-05-09 02:08:23 -04:00
Jenkins for ownCloud 5d35844aff [tx-robot] updated from transifex 2016-05-08 01:54:53 -04:00
Jenkins for ownCloud 956c3f2719 [tx-robot] updated from transifex 2016-05-07 01:54:56 -04:00
Vincent Petry 254576e1f7
Do not encode slashes in "dir" URL param in files JS 2016-05-06 17:00:22 +02:00
Vincent Petry 112b703df0
Add anchor icon in sidebar to copy permalink 2016-05-06 16:46:59 +02:00
Vincent Petry fdeafef6a0
Auto-add fileid in URL for currently displayed folder 2016-05-06 16:46:59 +02:00
Vincent Petry 093e9dd422
Add route to resolve fileid to files app URL
The following routes will redirect to the files app and display the
matching folder. If the fileid is a file, it will scroll to it.
- http://localhost/owncloud/index.php/f/$fileid
- http://localhost/owncloud/index.php/files/?dir=somedir&fileid=$fileid
2016-05-06 16:46:59 +02:00
Vincent Petry 47157bcd76 Merge pull request #24400 from owncloud/cache_shareManager
Cache shareManager
2016-05-06 14:25:30 +02:00
Jenkins for ownCloud 6a95af0a4b [tx-robot] updated from transifex 2016-05-06 01:54:56 -04:00
Jenkins for ownCloud 48be0b781a [tx-robot] updated from transifex 2016-05-05 01:55:08 -04:00
davicente 452eeeb344 wording in LDAP wizard 2016-05-04 17:25:44 +01:00
Jenkins for ownCloud cd7f4ed96f [tx-robot] updated from transifex 2016-05-04 02:11:59 -04:00
Roeland Douma 2e4b41550e Merge pull request #24406 from owncloud/psr4-comments-systemtags-updatenotifications
Move comments, systemtags and updatenotifications to PSR-4
2016-05-04 08:03:11 +02:00
blizzz 2fd4f1a775 Merge pull request #24396 from owncloud/ctrlEnter-submit-comment
Adds functionality to submit comment on ctrl+Enter
2016-05-03 22:24:17 +02:00
Thomas Müller 4b2544925f Merge pull request #23844 from owncloud/disable-user
Add occ commands to enable and disable a user + a disabled user can n…
2016-05-03 15:22:41 +02:00
Lukas Reschke 0d8393178b
Use proper path
Fixes https://github.com/owncloud/core/issues/24407
2016-05-03 14:37:50 +02:00
Robin Appelman 435cd31fa6 use the cache for trash listing 2016-05-03 14:36:46 +02:00
Lukas Reschke df2eb96cc4 Merge pull request #24389 from owncloud/login-by-email
Allow login by email address
2016-05-03 13:44:38 +02:00
Robin McCorkell ac27163f68 Move Dropbox/GDrive link to icon 2016-05-03 11:30:02 +01:00
Robin McCorkell a09ef66eea Change colour of input fields instead of printing 'Access granted' 2016-05-03 11:30:02 +01:00
Robin McCorkell 43abe2b648 Add links to load GDrive/Dropbox configuration pages 2016-05-03 11:30:02 +01:00
Robin McCorkell de98a6e54c Allow multiple custom JS files 2016-05-03 11:30:02 +01:00
Vincent Chan 5f2a19e965 fixes indentation 2016-05-03 12:29:43 +02:00
Vincent Chan bc0d136511 adds functionality to submit comments with cmd+Enter 2016-05-03 12:26:05 +02:00
Thomas Müller f8c04a4219 Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xml
Declare cron jobs in info.xml
2016-05-03 12:03:28 +02:00
Joas Schilling 9ad4a89816
Move comments, systemtags and updatenotifications to PSR-4 2016-05-03 10:20:59 +02:00
Morris Jobke 547830d97e Merge pull request #22989 from owncloud/lock_sharing_ops
Add locking to modifying operation of the OCS Share API
2016-05-03 10:15:54 +02:00
Thomas Müller cc1d948c2e
Add background job declaration of dav app to info.xml 2016-05-03 08:58:12 +02:00
Jenkins for ownCloud 1974ae8da7 [tx-robot] updated from transifex 2016-05-03 01:57:34 -04:00
Roeland Douma 3835d94d41 Merge pull request #24394 from owncloud/cleanup_share_classmap
Cleanup Files_Sharing CLASSPATH
2016-05-03 07:40:52 +02:00
Roeland Jago Douma 3c2fee8775
Cache shareManager
There is no need to call \OC::$server->getShareManager for each Node.
We have it available so better pass it around.
2016-05-02 22:27:24 +02:00
Vincent Chan 7ac1cb68f6 Submit comment on ctrl+Enter
closes #24302
2016-05-02 19:52:13 +02:00
Roeland Jago Douma 354329acf2
Cleanup Files_Sharing CLASSPATH
* OC\Files\Cache\SharedScanner
* OC\Files\Cache\Shared_Cache
* OC\Files\Cache\Shared_Permissions
* OC\Files\Cache\Shared_Updater
* OC\Files\Cache\Shared_Watcher
* OCA\Files\Share\Maintainer
* OCA\Files\Share\Proxy
2016-05-02 16:15:40 +02:00
Thomas Müller b10dcfc3b7
Fixing local event delivery for calendar events based on the email address 2016-05-02 14:20:59 +02:00
Joas Schilling 7bfc617b03
Move activity manager to the namespace 2016-05-02 11:57:24 +02:00
Joas Schilling b8650be732 Merge pull request #24238 from owncloud/caldav-test-event-in-far-future
Test an event in the far future
2016-05-02 10:42:47 +02:00
Roeland Douma 5a62c74495 Merge pull request #24376 from owncloud/remove_dead_code
Remove dead code
2016-05-02 09:57:28 +02:00
Morris Jobke 6b12f96b14 Merge pull request #24341 from owncloud/scan-nfd-showwarning
Add files:scan warning when NFD or incompatible encoding found
2016-05-02 09:41:12 +02:00
Thomas Müller 8486926a14
Add provisioning api to enable and disable users 2016-05-02 09:31:22 +02:00
Roeland Jago Douma 45d618a133
Remove dead code
Ancient files_sharing updater code I came across.
2016-05-02 08:20:42 +02:00
Jenkins for ownCloud a323111bd1 [tx-robot] updated from transifex 2016-05-02 02:08:49 -04:00
Jenkins for ownCloud ff8980d59c [tx-robot] updated from transifex 2016-05-01 01:55:00 -04:00
Roeland Jago Douma 8a652d1238
Unlock before all returns 2016-04-30 11:34:06 +02:00
Roeland Jago Douma 420b5273b1
There is no need to do old etag propagation
Etags are calculated differently now and don't require manual updating.
2016-04-30 10:40:45 +02:00
Roeland Jago Douma 62bc53143e
Add locking to modifying operation of the OCS Share API
Fixes #17243

This is done in the OCS Share API instead of the share manager since we
want lazy shares in general. However when doing modifying calls via the
OCS Share API it is fine to force real nodes.

* Updated unit tests to work with logging
2016-04-30 10:32:35 +02:00
Jenkins for ownCloud 023c8b0eac [tx-robot] updated from transifex 2016-04-30 01:55:54 -04:00
Vincent Petry 4326d73ff6
Fix SMB storage to not normalize UTF8
This makes sure that even if a NFD file name exists, it is found by the
storage and will be visible to higher layers. Even though the file will
be discarded anyway there, it gives the scanner a chance to display a
warning at least.
2016-04-29 16:19:53 +02:00
Vincent Petry 61203eee04
Add files:scan warning when NFD or incompatible encoding found 2016-04-29 16:18:59 +02:00
Thomas Müller dda942a917
firstoccurence and lastoccurence have a length now - triggering BIGINT on postgres - refs #24221 2016-04-29 14:57:19 +02:00
Thomas Müller 22ff97256e
Test an event in the far future - refs #24221 2016-04-29 14:57:19 +02:00
Jenkins for ownCloud 1f63e8df61 [tx-robot] updated from transifex 2016-04-29 01:54:56 -04:00
Vincent Petry 6ec835c1da Merge pull request #24287 from owncloud/smb-110
update icewind/streams to 1.1.0
2016-04-28 14:08:51 +02:00
Jenkins for ownCloud ba0099f73a [tx-robot] updated from transifex 2016-04-28 01:55:14 -04:00
Thomas Müller 44709276c0 Merge pull request #22777 from owncloud/encrypt_all_master_key
improved encrypt-all script
2016-04-27 09:48:46 +02:00
Jenkins for ownCloud 2b67f87ea8 [tx-robot] updated from transifex 2016-04-27 01:55:59 -04:00
Robin Appelman 1cc17436f7 update icewind/streams to 1.1.0 2016-04-26 15:43:30 +02:00
Thomas Müller 887045b790 Merge pull request #24027 from owncloud/translate_ocs_share
Translate OCS Share API error messages
2016-04-26 14:42:18 +02:00
Bjoern Schiessle d86f8ba5f8
if we don't have a encrypted file key we can return a empty string right away 2016-04-26 11:06:55 +02:00
Bjoern Schiessle 088ffd05d7
don't create a private-/public-key pair for each user if the master key is enabled 2016-04-26 11:06:55 +02:00
Jenkins for ownCloud 14c3491977 [tx-robot] updated from transifex 2016-04-26 04:50:32 -04:00
Thomas Müller d8f327831e Merge pull request #23726 from owncloud/ldap-wizard-improve-status-indicator
LDAP Wizard: reset connection status indicator when switching LDAP co…
2016-04-25 23:02:23 +02:00
Thomas Müller f6e1b43a38 Merge pull request #22648 from owncloud/propagate-single
do propagation in a single query
2016-04-25 23:01:45 +02:00
Vincent Petry 5e57d3a0b9 Merge pull request #24244 from owncloud/mount-unique
don't get the config for the same mount multiple times
2016-04-25 17:42:20 +02:00
Arthur Schiwon 3e26e1ec16
LDAP Wizard: reset connection status indicator when switching LDAP config 2016-04-25 16:24:44 +02:00
Robin Appelman dbfdc6282a
do propagation in a single query 2016-04-25 16:18:59 +02:00
Thomas Müller 6321596134 Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditions
Fix LDAP race conditions
2016-04-25 14:55:20 +02:00
Thomas Müller 972ce1fe6e Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statement
Add missing use statement
2016-04-25 14:46:29 +02:00
Robin Appelman ca5b189522 add test 2016-04-25 14:28:01 +02:00
Robin Appelman 7e8fd2c639 don't get the config for the same mount multiple times 2016-04-25 14:21:15 +02:00
Joas Schilling 9491d0f65b
Add missing use statement 2016-04-25 13:22:54 +02:00
Lukas Reschke 604b7a49f6 Merge pull request #24230 from owncloud/you-form-of-activities
Translate the current user with "You ..."
2016-04-25 12:57:34 +02:00
Vincent Petry 7a22e3f083 Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-login
on clone Connection, do not take over the existing LDAP resource
2016-04-25 12:38:09 +02:00
Roeland Jago Douma 5e9b618604
Translate OCS Share API error messages
For https://github.com/owncloud/core/issues/22209
2016-04-25 11:08:48 +02:00
Joas Schilling d4c9566cd5
Translate the current user with "You ..." 2016-04-25 10:30:58 +02:00
Björn Schießle 74de72e75e Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app
move federated sharing settings to the federatedfilesharing app
2016-04-25 10:19:46 +02:00
Jenkins for ownCloud dab4633300 [tx-robot] updated from transifex 2016-04-25 01:54:53 -04:00
Jenkins for ownCloud 4dc17e4863 [tx-robot] updated from transifex 2016-04-24 01:55:06 -04:00
Jenkins for ownCloud afce892e9c [tx-robot] updated from transifex 2016-04-23 01:56:02 -04:00
Arthur Schiwon 203b0e9cba
on clone Connection, do not take over the existing LDAP resource
For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
2016-04-22 21:43:41 +02:00
Thomas Müller a3813c55da Merge pull request #24124 from owncloud/encryped-size-progation
dont do optimized size propagation for encrypted files
2016-04-22 15:23:42 +02:00
Björn Schießle e10105474f
move federated sharing settings to the federatedfilesharing app 2016-04-22 14:55:40 +02:00
Björn Schießle 606b756a94 Merge pull request #23918 from owncloud/cruds-for-federated-shares
bring back CRUDS permissions for federated shares
2016-04-22 14:50:42 +02:00
Thomas Müller 3b3cff4f79 Merge pull request #24151 from owncloud/create-personal-calendar
Personal calendar should be generated even if the birthday calendar a…
2016-04-22 11:09:45 +02:00
Jenkins for ownCloud ded84bf571 [tx-robot] updated from transifex 2016-04-22 01:54:58 -04:00