Commit graph

27108 commits

Author SHA1 Message Date
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
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
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
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
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
Lukas Reschke
36ce254ffd Move dummy backend to Tests namespace 2015-09-22 11:01:11 +02:00
Thomas Müller
67231ed9a7 Merge pull request #19231 from phil-davis/r1
Minor text typos
2015-09-21 23:35:30 +02:00
Thomas Müller
5226ec1d4a Merge pull request #19229 from owncloud/webdavauth-in-user-external
Move WebDAVAuth to User_External
2015-09-21 23:27:11 +02:00
Phil Davis
a165710e99 Minor text typos
that I noticed while looking at some code.
2015-09-21 23:04:25 +05:45
Thomas Müller
b1f05ef1f3 Move WebDAVAuth to User_External 2015-09-21 17:59:48 +02:00
Björn Schießle
283216e9a0 Merge pull request #19223 from owncloud/improve_description_decrypt_encrypt_all
Improve description of the encrypt-all and decrypt-all command line tool
2015-09-21 17:34:47 +02:00
Bjoern Schiessle
daf5d1ff2e fix small typo 2015-09-21 16:48:15 +02:00
Bjoern Schiessle
03e05d5dbc improve description and help output for the encrypt-all and decrypt-all command 2015-09-21 16:48:14 +02:00
Thomas Müller
8b83c6d5a4 Merge pull request #18934 from owncloud/bump-3rdparty
Update 3rdparty reference
2015-09-21 16:14:42 +02:00
Thomas Müller
1d2f4aa540 Merge pull request #19215 from owncloud/fix_trashbin_previews
fix trashbin previews for text files
2015-09-21 16:12:10 +02:00
Thomas Müller
fd6b4de2d4 Merge pull request #18481 from owncloud/fix-apache-login-master
Repeated calls to loginWithApache() should not not try to set user in…
2015-09-21 16:09:33 +02:00
Thomas Müller
ac8da41ccd Merge pull request #18709 from owncloud/cleanup-login-semantics
Pushes input inside the bottom group - login.
2015-09-21 16:08:48 +02:00
Thomas Müller
d8901cf7cd Merge pull request #19221 from owncloud/improved_error_messages
decrypt-all: improved error message if user doesn't exists
2015-09-21 16:06:43 +02:00
Robin Appelman
b23a5e6886 Merge pull request #17347 from owncloud/dav-fopen-overwrite
dont download the existing file for webdav if we're going to overwrite it
2015-09-21 14:13:04 +02:00
Robin Appelman
b520a1e520 Merge pull request #19081 from owncloud/prevent0bytedownloads
prevent 0 byte downloads when storage returns false
2015-09-21 13:50:35 +02:00
Robin Appelman
4ecf710dcd dont download the existing file for webdav if we're going to overwrite it 2015-09-21 13:45:25 +02:00
Hendrik Leppelsack
2762f29acf Merge pull request #19189 from owncloud/fix-19135
Fix missing checkboxes in file comparator
2015-09-21 13:36:49 +02:00
Bjoern Schiessle
d2e90b6050 improved error message if user doesn't exists 2015-09-21 13:19:35 +02:00
Hendrik Leppelsack
964cfc8e08 fix missing checkboxes in file comparator 2015-09-21 12:57:34 +02:00
Bjoern Schiessle
a174ba5a36 make sure to add the correct file size to the file info, otherwise we will not show the preview for every filetype 2015-09-21 12:41:19 +02:00
Thomas Müller
0f2865abb2 Repeated calls to loginWithApache() should not not try to set user information in the session again 2015-09-21 11:55:41 +02:00
Thomas Müller
6006a03ef1 Merge pull request #19122 from owncloud/discardexpirationdatefornonlinkshares
Discard expiration date from result for non-link shares
2015-09-21 11:47:37 +02:00
Thomas Müller
d7d3e8d802 Merge pull request #19176 from owncloud/fix-19118
Fix checkboxes in files_external
2015-09-21 11:22:22 +02:00
Lukas Reschke
f2a1e5bd2b Bump 3rdparty reference 2015-09-21 11:15:02 +02:00
Thomas Müller
c5f0ad49b0 Merge pull request #19197 from radarhere/patch-1
Fixed typo
2015-09-21 10:41:18 +02:00
Thomas Müller
8a07cb4a74 Merge pull request #19183 from owncloud/oparoz-sharejs-typo
Typo
2015-09-21 10:30:59 +02:00
Thomas Müller
d2e701d74f Merge pull request #19148 from owncloud/issue-19113-stop-setting-single-user-in-constructor
Do not set single user in constructor of encryption occ commands
2015-09-21 09:58:38 +02:00
Jenkins for ownCloud
7b483dfcbe [tx-robot] updated from transifex 2015-09-21 01:54:41 -04:00
Andrew Murray
62a0a7fab5 Fixed typo 2015-09-21 00:07:02 +10:00
Jenkins for ownCloud
bbd1e99605 [tx-robot] updated from transifex 2015-09-20 01:54:48 -04:00
Hendrik Leppelsack
624f5de67a fix checkboxes in files_external 2015-09-19 10:36:38 +02:00
Olivier Paroz
9776d60b57 Typo 2015-09-19 10:34:19 +02:00
Jenkins for ownCloud
c433d48d8e [tx-robot] updated from transifex 2015-09-19 01:55:22 -04:00
C Montero-Luque
9d1885a535 8.2 beta1 2015-09-18 14:01:46 -04:00
Lukas Reschke
5470d0edae Connect to database to verify if it is running
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.
2015-09-18 19:43:34 +02:00