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
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
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
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
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
Jenkins for ownCloud
479e4410c5
[tx-robot] updated from transifex
2014-09-23 02:05:45 -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
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
Bjoern Schiessle
9105e17307
unit tests for grouping of shares pointing to the same source
2014-09-22 17:54:47 +02:00
Bjoern Schiessle
89c3b650e6
group shares and combine permissions
2014-09-22 17:25:15 +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
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
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
Volkan Gezer
d16b8c03e9
fix button text l10n
2014-09-22 09:32:03 +02:00
Georg Ehrke
9fd23d2edf
files_sharing: add route for ajax/publicpreview
2014-09-21 18:21:42 +02:00
Jenkins for ownCloud
a1c39f74b7
[tx-robot] updated from transifex
2014-09-21 01:54:29 -04:00
Jenkins for ownCloud
e55c4bb807
[tx-robot] updated from transifex
2014-09-20 01:54:34 -04:00
Vincent Petry
8aca127e52
Added extra check to avoid deleting key folders
...
Whenever a delete operation is called twice in a row, it could happen
that the first call already deleted the file.
The second call would return an empty $ownerPath because the file does
not exist. That empty $ownerPath would run the key deletion operation on
the wrong path.
This fix adds checks in many places to make sure we don't use $ownerPath
when it's empty or null.
2014-09-19 19:01:02 +02:00
Volkan Gezer
01808c8c84
fix typo
2014-09-19 18:22:09 +02:00
Lukas Reschke
fed8100177
Merge pull request #10968 from owncloud/admin-groupsselect2
...
Use select2 for the groups excluded from sharing in admin page
2014-09-19 16:50:56 +02:00
Lukas Reschke
fb033cce98
Merge pull request #11104 from owncloud/enc_create_backup_on_recovery
...
[encryption] create backup from all keys before recovery
2014-09-19 16:40:19 +02:00
Lukas Reschke
e94ec409ae
Merge pull request #11171 from owncloud/fix-route
...
Match more URL fragments
2014-09-19 16:04:29 +02:00
Bjoern Schiessle
a280859bf8
make sure that we really catch the files folder only
2014-09-19 11:47:18 +02:00
Bjoern Schiessle
2ee14c4734
create backup from all keys before recovery
2014-09-19 11:47:18 +02:00
Jenkins for ownCloud
786312d0e8
[tx-robot] updated from transifex
2014-09-19 01:55:44 -04:00
Lukas Reschke
7956765c12
Match more URL fragments
...
Fixes https://github.com/owncloud/core/pull/11009#issuecomment-56103341
2014-09-18 23:18:07 +02:00
Vincent Petry
f2a01dddbc
Reenable file proxy when renaming between mount points
...
When moving a folder into another mount point, $renamedFiles is empty
because that goes over a different mechanism.
In such case, this fix makes sure that the file proxy is reenable to
avoid breaking the subsequent files that are being moved.
2014-09-18 19:21:04 +02:00
Morris Jobke
112e570989
Merge pull request #11141 from owncloud/update_encrytionlink
...
update encryption doc link
2014-09-18 18:19:53 +02:00
Volkan Gezer
ccaea93d6b
update encryption doc link
...
I don't know how we missed to update this :/
update ldap doc link
2014-09-18 18:14:51 +02:00
Morris Jobke
338db48c0b
Merge pull request #9541 from owncloud/force_loading_of_encryption_app
...
force loading of encryption app to show correct error
2014-09-18 09:04:53 +02:00
Jenkins for ownCloud
dd6b0b1319
[tx-robot] updated from transifex
2014-09-18 01:54:39 -04:00
Lukas Reschke
7db0d55129
Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfix
...
Tentative fix for legacy file actions unit test side effect
2014-09-17 18:10:49 +02:00
Lukas Reschke
14571d4103
force loading of encryption app
2014-09-17 17:13:25 +02:00
Robin Appelman
6d60630f08
Skip test for unsuported feature for amazon s3
2014-09-17 15:52:00 +02:00
Robin Appelman
11ac9ce28b
Fix copy overwrite for amazon s3
2014-09-17 15:52:00 +02:00
Robin Appelman
3b08b3fad4
Fix amazon s3 rename overwrite
2014-09-17 15:51:57 +02:00
Robin Appelman
6e12d830d5
Fix AmazonS3 rmdir on the root
2014-09-17 15:50:27 +02:00
Robin Appelman
2f22e67570
Also check if the file itself is updatable
2014-09-17 11:35:16 +02:00
Robin Appelman
d25a9a118f
Check if a folder is deletable before we try to recursively delete it
2014-09-17 11:35:16 +02:00
Jenkins for ownCloud
2a89bc7b51
[tx-robot] updated from transifex
2014-09-17 01:55:27 -04:00
Lukas Reschke
45b17207cc
Merge pull request #10745 from owncloud/fix-10708-doctrine
...
Use Doctrine Platform to generate SQL query for table truncation.
2014-09-16 23:56:20 +02:00
Lukas Reschke
21afcb3e94
Merge pull request #10902 from owncloud/fix-ellepsis
...
Adding link to ellipsis and fixing styling
2014-09-16 21:09:47 +02:00
Lukas Reschke
368391e401
Merge pull request #11009 from owncloud/tobiasKaminsky-route
...
REST API for thumbnails
2014-09-16 19:31:51 +02:00
Lukas Reschke
d2743e6ad6
Merge pull request #7254 from owncloud/core-sortalgo
...
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
Nicolas Stamm
a2a1f5da6a
DragnDrop Upload text style
...
The 8px margin was uggly.
2014-09-16 16:51:48 +02:00
Lukas Reschke
4669ea3835
Merge pull request #10680 from helmutschneider/aws-2.6.15
...
Update AWS sdk to 2.6.15
2014-09-16 16:34:16 +02:00
Thomas Müller
7e2bff8545
adding unit test to truncate the table
2014-09-16 16:17:25 +02:00
Vincent Petry
05cf940983
Tentative fix for legacy file actions unit test side effect
...
Sometimes the JS unit test with legacy file actions fail.
This fix runs the legacy file actions tests on a dummy instead of the
real one.
2014-09-16 15:38:44 +02:00
Clark Tomlinson
140c89f1c3
Adding link to ellipsis and fixing styling
2014-09-16 09:18:01 -04:00
tobiasKaminsky
e62d5b7e55
Route for thumbnail generation
...
Thumbnail generation
Removed Log
Added requested changes
Added requested changes.
- Fix code style
- Add exception if file does not exist
- Switch route styling
Replaces https://github.com/owncloud/core/pull/10805
Fix codestyle
Fix codestyle
Migrate to appframework
Fix typo
2014-09-16 15:00:58 +02:00
Lukas Reschke
ba5d3fb96b
Merge pull request #11081 from owncloud/trash_fix_expire
...
also expire file if timestamp = limit, happens if trashbin_retention_obl...
2014-09-16 13:58:12 +02:00
Morris Jobke
61b040cbe8
Merge pull request #10663 from owncloud/files_trashbin_original_path
...
Show original path information in trashbin and for shares
2014-09-16 12:49:17 +02:00
Jenkins for ownCloud
1e6ac31bde
[tx-robot] updated from transifex
2014-09-16 01:54:33 -04:00
Lukas Reschke
627252fe81
Merge pull request #11060 from owncloud/rmobslang
...
remove obsolete language files
2014-09-15 17:31:10 +02:00
Bjoern Schiessle
f23116ce50
also expire file if timestamp = limit, happens if trashbin_retention_obligation is set to zero
2014-09-15 13:00:04 +02:00
Andreas Fischer
31898aa635
Merge pull request #11021 from owncloud/do-not-double-decode
...
Do not double decode values
* owncloud/do-not-double-decode:
Do not double decode values
2014-09-15 07:58:45 +02:00
Jenkins for ownCloud
8d647fa267
[tx-robot] updated from transifex
2014-09-15 01:54:26 -04:00
Lukas Reschke
90e91a9d10
Merge pull request #11050 from owncloud/enc-flockfix
...
Remove passing by reference to allow for proper GC
2014-09-15 00:31:10 +02:00
Jenkins for ownCloud
d8c7a52979
[tx-robot] updated from transifex
2014-09-14 01:54:35 -04:00
Volkan Gezer
5d1fa60e0d
remove obsolete language files
2014-09-13 15:29:11 +02:00
Jenkins for ownCloud
518ed10c77
[tx-robot] updated from transifex
2014-09-13 05:17:34 -04:00
Vincent Petry
da9f9ae9b3
Remove passing by reference to allow for proper GC
...
The garbage collector in PHP 5.3.10 does not properly release the file
handle when calling fclose() due to the fact that it is passed by
reference.
This has the side-effect of preventing file locks to be released as well
when the files_locking app is enabled.
This fix removes the useless passing by reference and now the file
handle and file lock are freed properly.
2014-09-12 19:51:47 +02:00
Jenkins for ownCloud
d6834b6389
[tx-robot] updated from transifex
2014-09-12 03:28:56 -04:00
Robin McCorkell
99d41bec5d
Show original path information in trashbin and sharing views
...
Path will only be shown if in subdirectory, not in root.
2014-09-11 15:45:42 +01:00
Lukas Reschke
99e9e762d1
Do not double decode values
...
Fixes https://github.com/owncloud/core/issues/11012
2014-09-11 15:34:57 +02:00
Thomas Müller
e6af67d5ea
Merge pull request #9698 from owncloud/fix-9666
...
Load apps in tests, fixes #9666
2014-09-11 08:05:00 +02:00
Jenkins for ownCloud
0dcd8079dc
[tx-robot] updated from transifex
2014-09-11 01:54:41 -04:00
Robin McCorkell
08e38a1072
Fix mkdir error in mountconfig.php
2014-09-10 17:28:25 +02:00
Robin McCorkell
b754a8261a
Load apps in test situations
2014-09-10 17:28:25 +02:00
Jenkins for ownCloud
c119a9fd32
[tx-robot] updated from transifex
2014-09-10 01:54:54 -04:00
Lukas Reschke
c3d90b96c8
Merge pull request #10922 from owncloud/explicit-scan-transactions
...
Use bigger transactions when doing explicit file system scans
2014-09-09 23:32:32 +02:00
Vincent Petry
412da87e65
Move select2 from files_external to core
2014-09-09 18:03:05 +02:00
Jenkins for ownCloud
317e6d03b4
[tx-robot] updated from transifex
2014-09-09 01:55:47 -04:00
Lukas Reschke
70abce0482
Merge pull request #10739 from owncloud/eventsource-public
...
Add EventSource to the public API
2014-09-08 18:46:27 +02:00
Lukas Reschke
0ec9c2ccf8
Merge pull request #10885 from owncloud/swift-hasupdated
...
Fix hasUpdated for folders in openstack swift
2014-09-08 18:19:59 +02:00
Lukas Reschke
c79c894dbb
Merge pull request #10755 from owncloud/shorter_sharing_links
...
Shorter sharing links
2014-09-08 17:26:20 +02:00
Lukas Reschke
2d847934ed
Merge pull request #10938 from owncloud/useSecureMimetype
...
Use secure mimetype for content delivery
2014-09-08 17:13:54 +02:00
Lukas Reschke
bca57b4b28
Merge pull request #10890 from owncloud/fix-10888
...
if only one attribute is requested, the returned array has 0 as key inst...
2014-09-08 16:39:48 +02:00
Lukas Reschke
312ed18d15
Use secure mimetype for content delivery
...
Adds some hardening against potential CSP bypassed.
2014-09-08 15:57:39 +02:00
Vincent Petry
bd63f475bc
Merge pull request #10891 from owncloud/files-moveoperationcatchexception
...
Catch exceptions when moving files
2014-09-08 15:09:02 +02:00
Robin Appelman
644755df66
Use bigger transactions when doing explicit file system scans
2014-09-08 14:15:41 +02:00
Jenkins for ownCloud
9fc45016f9
[tx-robot] updated from transifex
2014-09-07 01:54:42 -04:00
Jenkins for ownCloud
6ca2ba6fde
[tx-robot] updated from transifex
2014-09-06 01:55:03 -04:00
Clark Tomlinson
50993c1a05
Merge pull request #10860 from owncloud/scrolltofix
...
Scroll to file on search or add
2014-09-05 10:35:59 -04:00
Vincent Petry
e43c9b84c4
Catch exceptions when moving files
...
When moving files on storages that don't expose permissions, the storage
itself might throw an exception when the permission is denied.
This fix ensures that exceptions are caught and forwarded to the client
instead of just hanging.
2014-09-05 14:54:06 +02:00
Arthur Schiwon
3c9668f605
if only one attribute is requested, the returned array has 0 as key instead of attribute name. fixes #10888
2014-09-05 14:05:37 +02:00
Robin Appelman
a1f4a0601b
Fix hasUpdated for folders in swift backend
2014-09-05 13:23:10 +02:00
Robin Appelman
3d7aff84e5
Fix configuration of rackspace
2014-09-05 13:22:35 +02:00
Vincent Petry
5913a694de
Merge pull request #10870 from owncloud/dnd-droponreadonlyfolderfix
...
Added permission check for drag and drop
2014-09-05 12:20:48 +02:00
Jenkins for ownCloud
0736a6695e
[tx-robot] updated from transifex
2014-09-05 01:54:39 -04:00
Vincent Petry
f1bfe35cda
Added permission check for drag and drop
...
When dropping files onto a read-only folder, a notification
is now shown instead of attempting to upload.
This for both the drag for upload and drag from inside the file list
cases.
2014-09-04 20:18:24 +02:00
kondou
2a4c51389c
Use a route instead of s.php and convert tokens asap
2014-09-04 15:23:55 +02:00
Robin Appelman
fa3393674c
Better phpdoc and method naming
2014-09-04 13:26:51 +02:00
Vincent Petry
6ca9e27438
Scroll to new file/folder after adding
...
When creating a new file from the menu, the list now scrolls to that
file.
2014-09-04 12:34:17 +02:00
Vincent Petry
9ae000676c
Fixed scrollto for search results
...
Now passing the "scrollto" URL argument to the file list class which
will also automatically scroll and highlight the matching element.
This code is triggered by the search box when in a different folder and
also by the activity app.
2014-09-04 12:20:11 +02:00