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
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
d16b8c03e9
fix button text l10n
2014-09-22 09:32:03 +02:00
9fd23d2edf
files_sharing: add route for ajax/publicpreview
2014-09-21 18:21:42 +02:00
a1c39f74b7
[tx-robot] updated from transifex
2014-09-21 01:54:29 -04:00
e55c4bb807
[tx-robot] updated from transifex
2014-09-20 01:54:34 -04:00
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
01808c8c84
fix typo
2014-09-19 18:22:09 +02:00
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
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
e94ec409ae
Merge pull request #11171 from owncloud/fix-route
...
Match more URL fragments
2014-09-19 16:04:29 +02:00
a280859bf8
make sure that we really catch the files folder only
2014-09-19 11:47:18 +02:00
2ee14c4734
create backup from all keys before recovery
2014-09-19 11:47:18 +02:00
786312d0e8
[tx-robot] updated from transifex
2014-09-19 01:55:44 -04:00
7956765c12
Match more URL fragments
...
Fixes https://github.com/owncloud/core/pull/11009#issuecomment-56103341
2014-09-18 23:18:07 +02:00
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
112e570989
Merge pull request #11141 from owncloud/update_encrytionlink
...
update encryption doc link
2014-09-18 18:19:53 +02:00
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
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
dd6b0b1319
[tx-robot] updated from transifex
2014-09-18 01:54:39 -04:00
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
14571d4103
force loading of encryption app
2014-09-17 17:13:25 +02:00
2f22e67570
Also check if the file itself is updatable
2014-09-17 11:35:16 +02:00
d25a9a118f
Check if a folder is deletable before we try to recursively delete it
2014-09-17 11:35:16 +02:00
2a89bc7b51
[tx-robot] updated from transifex
2014-09-17 01:55:27 -04:00
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
21afcb3e94
Merge pull request #10902 from owncloud/fix-ellepsis
...
Adding link to ellipsis and fixing styling
2014-09-16 21:09:47 +02:00
368391e401
Merge pull request #11009 from owncloud/tobiasKaminsky-route
...
REST API for thumbnails
2014-09-16 19:31:51 +02:00
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
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
7e2bff8545
adding unit test to truncate the table
2014-09-16 16:17:25 +02:00
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
140c89f1c3
Adding link to ellipsis and fixing styling
2014-09-16 09:18:01 -04:00
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
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
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
1e6ac31bde
[tx-robot] updated from transifex
2014-09-16 01:54:33 -04:00
627252fe81
Merge pull request #11060 from owncloud/rmobslang
...
remove obsolete language files
2014-09-15 17:31:10 +02:00
f23116ce50
also expire file if timestamp = limit, happens if trashbin_retention_obligation is set to zero
2014-09-15 13:00:04 +02:00
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
8d647fa267
[tx-robot] updated from transifex
2014-09-15 01:54:26 -04:00
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
d8c7a52979
[tx-robot] updated from transifex
2014-09-14 01:54:35 -04:00
5d1fa60e0d
remove obsolete language files
2014-09-13 15:29:11 +02:00
518ed10c77
[tx-robot] updated from transifex
2014-09-13 05:17:34 -04:00
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
d6834b6389
[tx-robot] updated from transifex
2014-09-12 03:28:56 -04:00
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
99e9e762d1
Do not double decode values
...
Fixes https://github.com/owncloud/core/issues/11012
2014-09-11 15:34:57 +02:00
e6af67d5ea
Merge pull request #9698 from owncloud/fix-9666
...
Load apps in tests, fixes #9666
2014-09-11 08:05:00 +02:00
Vincent Petry
Morris Jobke
Volkan Gezer
Georg Ehrke
Jenkins for ownCloud
Volkan Gezer
Lukas Reschke
Bjoern Schiessle
Robin Appelman
Thomas Müller
Clark Tomlinson
tobiasKaminsky
Andreas Fischer
Robin McCorkell