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
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
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
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