summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Delay listening to owner changes untill we use a share for that ownerRobin Appelman2015-09-232-2/+16
|
* Merge pull request #19139 from owncloud/ext-revert-permissionsThomas Müller2015-09-2319-243/+253
|\ | | | | Improve deprecated external storage backend handling
| * Mark SMB_OC and SFTP_Key as deprecated backendsRobin McCorkell2015-09-232-4/+8
| |
| * Hide deprecated backends in external storage GUIRobin McCorkell2015-09-232-3/+19
| | | | | | | | | | | | Selecting/deselecting the deprecate-to backends in the user mountable storages selection will also change the corresponding deprecated backend.
| * Add deprecation mechanic to IdentifierTraitRobin McCorkell2015-09-233-0/+37
| | | | | | | | | | Deprecation allows a backend/auth mechanism to designate an object that it deprecates to, allowing clean transitions to updated codebases.
| * Revert "Implement more fine-grained external storage permissions model"Robin McCorkell2015-09-2317-237/+190
| | | | | | | | | | | | This reverts commit 0b97a05e7bd631d66de1c2aee115113ada8a5f63. This reverts commit d2e3c17c0000bc0020f1ff641190452f370434de. This reverts commit cc88c5f4b84da57c425cbdb7dc8b391b1942b503.
* | Merge pull request #19308 from owncloud/fix-titleMorris Jobke2015-09-232-3/+8
|\ \ | | | | | | Show 'Apps' in the browser title when app management is open
| * | Show 'Apps' in the browser title when app management is openThomas Müller2015-09-232-3/+8
|/ /
* | Revert "use correct variable"Jörn Friedrich Dreyer2015-09-231-1/+1
| | | | | | | | This reverts commit 52cbaff061b93cb1a5e81623e58e14867c818810.
* | Merge pull request #19295 from owncloud/share-fixintparsingThomas Müller2015-09-232-7/+70
|\ \ | | | | | | Fix parsing int attributes from share.php response
| * | Fix parsing int attributes from share.php responseVincent Petry2015-09-232-7/+70
| |/ | | | | | | | | | | | | Sometimes the attributes returned by share.php are integers but packaged as strings. This fix makes sure that such attributes are parsed as integers
* / use correct variableJörn Friedrich Dreyer2015-09-231-1/+1
|/ | | wow ... just wow ...
* Merge pull request #19289 from owncloud/fix-type-hint-errors-containerThomas Müller2015-09-232-2/+3
|\ | | | | Fix type hint errors in the container and the interface
| * Merge branch 'master' into fix-type-hint-errors-containerMorris Jobke2015-09-233-13/+28
| |\
| * | Fix type hint errors in the container and the interfaceJoas Schilling2015-09-232-2/+3
| | |
* | | Merge pull request #19220 from individual-it/fix_19164Thomas Müller2015-09-231-0/+2
|\ \ \ | | | | | | | | re initialize OC.Share.currentShares OC.Share.itemShares
| * | | re initialize OC.Share.currentShares OC.Share.itemShares Individual IT Services2015-09-211-0/+2
| | | | | | | | | | | | | | | | otherwise old values are kept. fix for #19164
* | | | Merge pull request #19236 from owncloud/call_dot_directories_functionThomas Müller2015-09-2310-12/+12
|\ \ \ \ | | | | | | | | | | Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir
| * | | | Replaces if ($file === '.' || $file === '..') by ↵Martin2015-09-2210-12/+12
| | | | | | | | | | | | | | | | | | | | if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used.
* | | | | Merge pull request #19277 from owncloud/files-plusbuttonfixThomas Müller2015-09-231-3/+4
|\ \ \ \ \ | | | | | | | | | | | | Only render the plus button when it makes sense
| * | | | | Only render the plus button when it makes senseVincent Petry2015-09-221-3/+4
| | | | | |
* | | | | | Merge pull request #19279 from owncloud/share-fixbogusentryThomas Müller2015-09-231-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix bogus entry that appears when switching with arrow keys
| * | | | | | Fix bogus entry that appears when switching with arrow keysVincent Petry2015-09-221-0/+3
| |/ / / / /
* | | | | | Merge pull request #19247 from owncloud/fix_locking_copy_operationThomas Müller2015-09-232-42/+98
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | locking: handle exceptions correctly during copy operation
| * | | | | catch excexptions during the copy operation and make sure that we free the ↵Bjoern Schiessle2015-09-222-42/+98
| | | | | | | | | | | | | | | | | | | | | | | | lock correctly
* | | | | | Merge pull request #19267 from ↵Thomas Müller2015-09-231-12/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/individual-it-reduce_db_calls_for_filelocks [jenkins] Individual it reduce db calls for filelocks
| * | | | | | reduce amount of db calls needed for file-locksIndividual IT Services2015-09-221-12/+24
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return result of insertIfNotExist() reducing initLockField, throwing exeption in releaseLock don't throw exception in releaseLock() cleaning up whitespaces
* | | | | | Merge pull request #19169 from owncloud/3rdpartyhintThomas Müller2015-09-231-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | add example for 3rdparty configuration
| * | | | | | add example for 3rdparty configurationCarla Schroder2015-09-231-1/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #19285 from owncloud/fix-strengthify-tipsyThomas Müller2015-09-231-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Implement builder pattern in tipsy shim
| * | | | | implement builder pattern in tipsy shimHendrik Leppelsack2015-09-231-0/+1
|/ / / / /
* | | | | Merge pull request #19270 from owncloud/files-sidebar-fixfortrashandcoThomas Müller2015-09-222-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Properly show sidebar for trash and sharing sections
| * | | | | Properly show sidebar for trash and sharing sectionsVincent Petry2015-09-222-3/+3
| | | | | |
* | | | | | Merge pull request #19282 from owncloud/disabled-checkboxesHendrik Leppelsack2015-09-221-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add style for disabled checkboxes
| * | | | | | add style for disabled checkboxesHendrik Leppelsack2015-09-221-0/+2
|/ / / / / /
* | | | | | Merge pull request #19275 from owncloud/fix-19158Hendrik Leppelsack2015-09-221-3/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Left align checkboxes in group dropdown
| * | | | | left align checkboxes in group dropdownHendrik Leppelsack2015-09-221-3/+2
|/ / / / /
* | | | | Merge pull request #18893 from owncloud/move-static-dataLukas Reschke2015-09-2210-90/+87
|\ \ \ \ \ | |_|_|/ / |/| | | | Move static data from config to resources/config/
| * | | | Update mimetypesLukas Reschke2015-09-221-34/+23
| | | | |
| * | | | Move mimetype files into /resources/config/Lukas Reschke2015-09-225-47/+62
| | | | |
| * | | | Move certificate bundle into resources/config/Lukas Reschke2015-09-224-9/+2
|/ / / /
* | | | Merge pull request #19268 from owncloud/revert-18911Robin Appelman2015-09-221-6/+0
|\ \ \ \ | | | | | | | | | | Revert "Show cached previews directly"
| * | | | Revert "Show cached previews directly"Robin Appelman2015-09-221-6/+0
| | |/ / | |/| | | | | | | | | | This reverts commit 1b708e26efbcb4052becad3d7b6618064c2605a6.
* | | | Merge pull request #19266 from owncloud/fileactions-translate-detailsThomas Müller2015-09-224-1/+5
|\ \ \ \ | | | | | | | | | | Properly translate file actions
| * | | | Properly translate file actionsVincent Petry2015-09-224-1/+5
| |/ / /
* | | | Merge pull request #19177 from owncloud/docker-check-stateThomas Müller2015-09-221-2/+8
|\ \ \ \ | | | | | | | | | | Connect to database to verify if it is running
| * | | | Connect to database to verify if it is runningLukas Reschke2015-09-181-2/+8
| | | | | | | | | | | | | | | | | | | | Try to connect to the OCI host via sqlplus to ensure that the connection is already running. Required by the new OCI configuration on CI.
* | | | | Merge pull request #19257 from owncloud/fix-floating-in-sidebarFrank Karlitschek2015-09-221-4/+1
|\ \ \ \ \ | | | | | | | | | | | | remove float from file/folder name in sidebar, fix #19243
| * | | | | remove float from file/folder name in sidebar, fix #19243Jan-Christoph Borchardt2015-09-221-4/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #19262 from owncloud/fix_18970Roeland Douma2015-09-222-3/+37
|\ \ \ \ \ | |_|_|/ / |/| | | | Respect disabled sharing API settings
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 02:43:56 +0000