Lukas Reschke
3da6b3b533
Merge pull request #11229 from kofemann/for-upstream
...
user/backed: use pow of two for backed action constants
2014-09-24 15:19:11 +02:00
Morris Jobke
74f6e04b17
Merge pull request #11275 from owncloud/drop-if-e
...
Drop only if exists
2014-09-24 14:44:46 +02:00
Lukas Reschke
05ac044e28
Drop only if exists
2014-09-24 12:37:00 +02:00
Thomas Müller
75b8488ab9
autotest.sh shall not terminate if mysql db could not be dropped
2014-09-24 11:39:51 +02:00
Jenkins for ownCloud
5ff5b7386f
[tx-robot] updated from transifex
2014-09-24 01:56:46 -04:00
Morris Jobke
66a17cac31
Merge pull request #11265 from owncloud/fix-11264
...
Check for blacklisted characters
2014-09-24 00:37:42 +02:00
Volkan Gezer
e5793e8e0c
Merge pull request #11254 from owncloud/fix-filepicker-home-icon
...
fix filepicker home icon being partly hidden, fix #10169
2014-09-23 19:49:49 +02:00
Lukas Reschke
aeb516c3c9
Check for blacklisted characters
...
Fixes https://github.com/owncloud/core/issues/11264
(This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-))
2014-09-23 19:30:32 +02:00
Lukas Reschke
75e45ac786
Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser
...
Do not show exception to the end-user - use a proper error page instead
2014-09-23 18:36:40 +02:00
Vincent Petry
89e02e89d4
Merge pull request #7051 from owncloud/postsetupajaxcheck
...
Moved WebDAV check to client side JS
2014-09-23 16:55:16 +02:00
Tigran Mkrtchyan
276f50a1ba
user/backed: use pow of two for backed action constants
...
the current implementation limits number of possible backed actions
to 8 as it uses pow of 16 for constants. This change introduces pow
of two and allows up-to 32 actions to be defined.
The old values are preserved for backward compatibility.
2014-09-23 15:18:01 +02:00
Jan-Christoph Borchardt
722865c82a
fix filepicker home icon being partly hidden, fix #10169
2014-09-23 14:28:51 +02:00
Jan-Christoph Borchardt
1e915cc145
Merge pull request #11109 from owncloud/nstamm-patch-1
...
DragnDrop Upload text style
2014-09-23 14:03:08 +02:00
Thomas Müller
c587a4aaa2
Merge pull request #11222 from owncloud/store-users-timezone-master
...
send browsers timezone back tp the server on login
2014-09-23 13:45:21 +02:00
Jan-Christoph Borchardt
8c33a8e6fd
adjust text size and opacity of drag'n'drop upload text style
2014-09-23 13:36:47 +02:00
Jan-Christoph Borchardt
a062db4fd0
Merge pull request #11234 from owncloud/fix-icon-classes
...
Fix icon classes, disappeared delete icon
2014-09-23 12:39:06 +02:00
Vincent Petry
75593f87d5
Merge pull request #11137 from owncloud/enc-pregfix
...
Fix share key pattern matching
2014-09-23 12:36:34 +02:00
Vincent Petry
1e631754d7
Fix share key finding algorithm in various cases
...
Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.
This covers the following cases:
- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin
2014-09-23 12:33:07 +02:00
Thomas Müller
42fe0b9e08
Merge pull request #11241 from owncloud/use-lower-case
...
Use only lower-case letters
2014-09-23 12:16:58 +02:00
Lukas Reschke
5d977f97b0
Merge pull request #11032 from owncloud/harden-redirect
...
Do only follow HTTP and HTTPS redirects
2014-09-23 11:34:44 +02:00
Vincent Petry
e65ceb08fc
Moved WebDAV and internet checks to client side JS
...
- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
server
2014-09-23 11:16:14 +02:00
Vincent Petry
fc42a64e6c
Merge pull request #11226 from owncloud/kill-postsetupcheck-master
...
remove post setup check
2014-09-23 10:33:50 +02:00
Lukas Reschke
ff6c5331e9
Merge pull request #11224 from owncloud/fix_recovery_admin_user
...
first check if a private key exists, if not it is always a recovery szenario
2014-09-23 10:13:58 +02:00
Lukas Reschke
4c39139bd2
Merge pull request #11242 from owncloud/fix-10284
...
Use non-empty defaults for preview cmd line
2014-09-23 10:13:03 +02:00
Jenkins for ownCloud
479e4410c5
[tx-robot] updated from transifex
2014-09-23 02:05:45 -04:00
Thomas Müller
37a5bff155
Merge pull request #11227 from owncloud/fix-windows-path
...
fixing directory seperators
2014-09-23 07:38:23 +02:00
Thomas Müller
b3f1216ae0
Merge pull request #11221 from owncloud/fix-autotest
...
Fix autotest.sh for whitespace in paths
2014-09-23 07:04:26 +02:00
Morris Jobke
f970c81b1e
Merge pull request #11215 from owncloud/dav-throwwhendeletefailed
...
WebDAV now throws 403 when deletion did not work
2014-09-23 00:49:30 +02:00
Morris Jobke
051ed93e24
Merge pull request #11211 from owncloud/previewProviderSwitch
...
Add a configuration switch for enabled preview mimetypes
2014-09-23 00:45:59 +02:00
Victor Dubiniuk
7d22f4b634
Use non-empty defaults
2014-09-22 23:27:41 +03:00
Lukas Reschke
1565d82b81
Use only lower-case letters
...
Fixes https://github.com/owncloud/core/issues/11239
2014-09-22 21:29:03 +02:00
Clark Tomlinson
59a5df6a4b
ignoring writedata test in windows.
2014-09-22 14:13:30 -04:00
Lukas Reschke
6eeb905871
Do only follow HTTP and HTTPS redirects
...
We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)
Get final redirect manually using get_headers()
Migrate to HTTPHelper class and add unit tests
2014-09-22 20:02:32 +02:00
Thomas Müller
21412559df
remove post setup check
2014-09-22 19:43:55 +02:00
Clark Tomlinson
7b6aa3cd3d
fixing cache routes
2014-09-22 13:38:46 -04:00
Jan-Christoph Borchardt
1583ae1ed6
force show the loading icon in list for deletion, not only on hover
2014-09-22 18:24:52 +02:00
Jan-Christoph Borchardt
2ac953e6a8
correct progress-icon to icon-loading-small
2014-09-22 18:24:32 +02:00
Jan-Christoph Borchardt
91d9d45c6c
correct delete-icon to icon-delete, fix #11128
2014-09-22 18:17:33 +02:00
Morris Jobke
3c5ac21122
Merge pull request #11228 from owncloud/drop-travis
...
Revert "Travis support"
2014-09-22 17:27:54 +02:00
Lukas Reschke
cede9fd7ef
Remove unneeded unit tests
2014-09-22 16:50:08 +02:00
Vincent Petry
828ae65681
Merge pull request #11186 from owncloud/trash-fixdoubledeleteracecondition
...
Added extra check to avoid deleting key folders
2014-09-22 16:36:23 +02:00
Morris Jobke
55b4c0ac07
Revert "Travis support"
...
This reverts commit 472d896ce9
.
Conflicts:
.travis.yml
2014-09-22 16:34:50 +02:00
Morris Jobke
70937dabcd
Merge pull request #11167 from owncloud/env-movetomountreenableproxy
...
Reenable file proxy when renaming between mount points
2014-09-22 16:30:19 +02:00
Morris Jobke
9e8d2907e2
Merge pull request #11204 from owncloud/fix_oc_stream_seek
...
Fix oc stream seek
2014-09-22 16:25:07 +02:00
Morris Jobke
da20d71174
Merge pull request #11212 from owncloud/occ-catching-errors
...
Occ catching errors
2014-09-22 16:23:27 +02:00
Clark Tomlinson
db72270acc
fixing directory seperators
2014-09-22 10:13:46 -04:00
Lukas Reschke
ca3447fcde
Add a configuration switch for enabled preview mimetypes
2014-09-22 16:09:08 +02:00
Bjoern Schiessle
744110905b
first check if a private key exists, if not it is always a recovery szenario
2014-09-22 15:05:03 +02:00
Thomas Müller
814114ab8e
enhance formatDate function to accept an optional argument containing the time zone
2014-09-22 15:03:28 +02:00
Thomas Müller
f4eae03f20
date printed in the admin section regarding last execution time is already displayed in the users timezone - no need to append UTC
2014-09-22 14:06:51 +02:00