Commit Graph

27143 Commits

Author SHA1 Message Date
Thomas Müller 6f5f1c4f14 Merge pull request #19139 from owncloud/ext-revert-permissions
Improve deprecated external storage backend handling
2015-09-23 16:03:02 +02:00
Morris Jobke 1c052d554b Merge pull request #19308 from owncloud/fix-title
Show 'Apps' in the browser title when app management is open
2015-09-23 15:37:07 +02:00
Thomas Müller 2ea2ec0004 Show 'Apps' in the browser title when app management is open 2015-09-23 15:00:58 +02:00
Jörn Friedrich Dreyer d54d9a573f Revert "use correct variable"
This reverts commit 52cbaff061.
2015-09-23 14:09:52 +02:00
Thomas Müller 9050adc8f0 Merge pull request #19295 from owncloud/share-fixintparsing
Fix parsing int attributes from share.php response
2015-09-23 14:06:42 +02:00
Jörn Friedrich Dreyer 52cbaff061 use correct variable
wow ... just wow ...
2015-09-23 13:59:37 +02:00
Vincent Petry 6ea27e2b03 Fix parsing int attributes from share.php response
Sometimes the attributes returned by share.php are integers but packaged
as strings.

This fix makes sure that such attributes are parsed as integers
2015-09-23 12:16:47 +02:00
Robin McCorkell 634c1c497c Mark SMB_OC and SFTP_Key as deprecated backends 2015-09-23 12:10:02 +02:00
Robin McCorkell 2bef3ef34b Hide deprecated backends in external storage GUI
Selecting/deselecting the deprecate-to backends in the user mountable
storages selection will also change the corresponding deprecated
backend.
2015-09-23 12:10:02 +02:00
Robin McCorkell 060d169615 Add deprecation mechanic to IdentifierTrait
Deprecation allows a backend/auth mechanism to designate an object that
it deprecates to, allowing clean transitions to updated codebases.
2015-09-23 12:10:02 +02:00
Robin McCorkell 38a260e963 Revert "Implement more fine-grained external storage permissions model"
This reverts commit 0b97a05e7b.
This reverts commit d2e3c17c00.
This reverts commit cc88c5f4b8.
2015-09-23 12:10:02 +02:00
Thomas Müller ee649d58c5 Merge pull request #19289 from owncloud/fix-type-hint-errors-container
Fix type hint errors in the container and the interface
2015-09-23 11:42:03 +02:00
Thomas Müller 0c283dc020 Merge pull request #19220 from individual-it/fix_19164
re initialize OC.Share.currentShares OC.Share.itemShares
2015-09-23 11:41:20 +02:00
Thomas Müller bcdb3c26da Merge pull request #19236 from owncloud/call_dot_directories_function
Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir
2015-09-23 11:34:23 +02:00
Thomas Müller 4c62d71db7 Merge pull request #19277 from owncloud/files-plusbuttonfix
Only render the plus button when it makes sense
2015-09-23 11:31:52 +02:00
Thomas Müller 53a167eae9 Merge pull request #19279 from owncloud/share-fixbogusentry
Fix bogus entry that appears when switching with arrow keys
2015-09-23 11:30:50 +02:00
Thomas Müller ad71d92acf Merge pull request #19247 from owncloud/fix_locking_copy_operation
locking: handle exceptions correctly during copy operation
2015-09-23 11:28:27 +02:00
Morris Jobke 56a795ad37 Merge branch 'master' into fix-type-hint-errors-container 2015-09-23 11:01:59 +02:00
Thomas Müller f3d60df56d Merge pull request #19267 from owncloud/individual-it-reduce_db_calls_for_filelocks
[jenkins] Individual it reduce db calls for filelocks
2015-09-23 10:59:58 +02:00
Thomas Müller c22b98b05e Merge pull request #19169 from owncloud/3rdpartyhint
add example for 3rdparty configuration
2015-09-23 10:59:14 +02:00
Thomas Müller d0b17ec8d6 Merge pull request #19285 from owncloud/fix-strengthify-tipsy
Implement builder pattern in tipsy shim
2015-09-23 10:55:48 +02:00
Carla Schroder 4410ca5035 add example for 3rdparty configuration 2015-09-23 10:38:46 +02:00
Joas Schilling ee75f9f594 Fix type hint errors in the container and the interface 2015-09-23 10:13:41 +02:00
Hendrik Leppelsack 3f0a870908 implement builder pattern in tipsy shim 2015-09-23 09:27:44 +02:00
Thomas Müller 9fbd3fa6c1 Merge pull request #19270 from owncloud/files-sidebar-fixfortrashandco
Properly show sidebar for trash and sharing sections
2015-09-22 23:53:15 +02:00
Hendrik Leppelsack 3bce50f64b Merge pull request #19282 from owncloud/disabled-checkboxes
Add style for disabled checkboxes
2015-09-22 19:50:38 +02:00
Hendrik Leppelsack 7b19b99e82 add style for disabled checkboxes 2015-09-22 19:13:43 +02:00
Hendrik Leppelsack f8c286a7b6 Merge pull request #19275 from owncloud/fix-19158
Left align checkboxes in group dropdown
2015-09-22 18:31:57 +02:00
Martin 491250320a Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used. 2015-09-22 17:53:15 +02:00
Hendrik Leppelsack bea164274a left align checkboxes in group dropdown 2015-09-22 17:41:32 +02:00
Lukas Reschke 7222e5fb4d Merge pull request #18893 from owncloud/move-static-data
Move static data from config to resources/config/
2015-09-22 17:37:56 +02:00
Vincent Petry 03ca76f54f Fix bogus entry that appears when switching with arrow keys 2015-09-22 17:16:20 +02:00
Vincent Petry a7d84287ad Only render the plus button when it makes sense 2015-09-22 16:47:52 +02:00
Lukas Reschke 4201f59402 Update mimetypes 2015-09-22 16:43:29 +02:00
Lukas Reschke 63b2bc136a Move mimetype files into /resources/config/ 2015-09-22 16:43:28 +02:00
Lukas Reschke a8e8a9dfb9 Move certificate bundle into resources/config/ 2015-09-22 16:43:28 +02:00
Robin Appelman 498e8f712c Merge pull request #19268 from owncloud/revert-18911
Revert "Show cached previews directly"
2015-09-22 16:05:38 +02:00
Thomas Müller 0c93de5a65 Merge pull request #19266 from owncloud/fileactions-translate-details
Properly translate file actions
2015-09-22 15:56:04 +02:00
Thomas Müller 8b086156b1 Merge pull request #19177 from owncloud/docker-check-state
Connect to database to verify if it is running
2015-09-22 15:54:46 +02:00
Frank Karlitschek ce359b3a8c Merge pull request #19257 from owncloud/fix-floating-in-sidebar
remove float from file/folder name in sidebar, fix #19243
2015-09-22 09:51:14 -04:00
Roeland Douma 9fd50c0bbf Merge pull request #19262 from owncloud/fix_18970
Respect disabled sharing API settings
2015-09-22 15:28:58 +02:00
Vincent Petry fa725fba73 Properly show sidebar for trash and sharing sections 2015-09-22 15:28:48 +02:00
Roeland Jago Douma 4dba046712 Respect disabled sharing API settings
If the sharing API setting is disabled that sharing check middle ware
should block the request. Thus making link shares unavailable.
Fixes #18970

* Unit test added
* Unit tests updated
2015-09-22 15:12:16 +02:00
Individual IT Services 5f11049852 reduce amount of db calls needed for file-locks
return result of insertIfNotExist()

reducing initLockField, throwing exeption in releaseLock

don't throw exception in releaseLock()

cleaning up whitespaces
2015-09-22 15:04:15 +02:00
Robin Appelman d9db959331 Revert "Show cached previews directly"
This reverts commit 1b708e26ef.
2015-09-22 15:01:31 +02:00
Vincent Petry 762e7c3dd9 Merge pull request #19233 from owncloud/remove-dummy-backend
Move dummy backend to Tests namespace
2015-09-22 14:54:58 +02:00
Vincent Petry a35144e961 Properly translate file actions 2015-09-22 14:52:52 +02:00
Jan-Christoph Borchardt f6aeb023cf remove float from file/folder name in sidebar, fix #19243 2015-09-22 14:13:56 +02:00
Bjoern Schiessle 17a64360e5 catch excexptions during the copy operation and make sure that we free the lock correctly 2015-09-22 11:32:10 +02:00
Lukas Reschke 36ce254ffd Move dummy backend to Tests namespace 2015-09-22 11:01:11 +02:00