a71af58535
Prevent updates between multiple major versions
...
Ref https://github.com/owncloud/core/issues/11078
2014-09-18 17:56:06 +02:00
a543807d85
Merge pull request #11151 from owncloud/removeOverflowingFunction
...
Remove unused and overflowing function
2014-09-18 15:42:36 +02:00
f0bf46b080
Merge pull request #11130 from owncloud/moveBasicAuthCheck
...
Move basic auth check
2014-09-18 14:40:42 +02:00
d07d5915c9
Remove unused and overflowing function
...
Resolves https://github.com/owncloud/core/issues/10991 failure 4
2014-09-18 10:21:28 +02:00
c89c6ed21d
Merge pull request #11143 from owncloud/improve-404
...
Make 404 page easier to understand
2014-09-18 09:10:16 +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
5030f14008
Merge pull request #11136 from owncloud/fix_body_id
...
Error needs to push body-id for new guest layout
2014-09-17 23:55:53 +02:00
8fc1a9f5a9
Make 404 page easier to understand
...
Fixes https://github.com/owncloud/core/issues/11133
2014-09-17 22:57:32 +02: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
f930b356e6
Error needs to push body-id for new guest layout
2014-09-17 18:02:18 +02:00
14571d4103
force loading of encryption app
2014-09-17 17:13:25 +02:00
ef0a0f5f87
Merge pull request #9554 from owncloud/fix_preview_orientation
...
fix orientation in image-backend, not in preview system itself
2014-09-17 17:05:47 +02:00
c19bc1917b
Move basic auth check
...
At the previous point not all apps were initialized. Now the basic auth check happens together at the same location as all others.
Fixes https://github.com/owncloud/core/issues/11129
2014-09-17 16:04:12 +02:00
c88d517e88
Merge pull request #10622 from owncloud/recursive-delete-forbidden
...
Fix isDeletable
2014-09-17 15:36:41 +02:00
b644e8a5e7
Merge pull request #10932 from owncloud/issue/10926
...
Add a method to get the absolute url for a route
2014-09-17 13:05:26 +02:00
33c0d2f743
Fix mapping of relative paths
2014-09-17 11:38:10 +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
ab79caf29b
Check if the parent is writable to check if a file is deletable
2014-09-17 11:35:16 +02:00
0d37e16499
Merge pull request #11092 from owncloud/conceal_sabredav_version
...
Conceal or display SabreDAV version number.
2014-09-17 10:35:50 +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
4ebc11aa8d
Merge pull request #11102 from owncloud/visit1985-issue_108
...
mysql setup: if dbuser exists try a different one (owncloud/core#108 )
2014-09-16 18:54:37 +02:00
129e2d3c32
Merge pull request #10896 from owncloud/undo-nav-entry
...
Add delete undo styles
2014-09-16 18:28:39 +02:00
ef028fcd9a
add delete undo styles
...
use less right padding
better styling, fix padding issues
no special color for undo nav entry
fix fallback width
use class for button
2014-09-16 18:02:41 +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
ba445e85b2
Merge pull request #11082 from owncloud/deduplicateDependencyCheck
...
Deduplicate dependency checks
2014-09-16 16:33:02 +02:00
7e2bff8545
adding unit test to truncate the table
2014-09-16 16:17:25 +02:00
64653223fc
Merge pull request #11108 from owncloud/add-proper-descr
...
Reword the description
2014-09-16 16:00:58 +02:00
b31b6db4de
Reword the description
...
The old one was just horrible wrong.
2014-09-16 15:51:48 +02:00
2f10b60c9e
Merge pull request #10754 from cetra3/master
...
Refactor internal session handler to write directly to $_SESSION
2014-09-16 15:48:19 +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
1978d3d6a2
Merge pull request #11055 from owncloud/replaceprodname
...
replace ownCloud with placeholder
2014-09-16 14:49:50 +02:00
261d07c95c
Merge pull request #11084 from owncloud/no-migration-for-mssql-master
...
Disable database migrations for MSSQL - scripts have to be applied manua...
2014-09-16 14:00:24 +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
f31e4066de
Conceal or display SabreDAV version number in browser and http response headers.
2014-09-16 13:25:44 +02:00
5813cf32dc
Deduplicate dependency checks
...
Some code that I also used for https://github.com/owncloud/administration/pull/11
2014-09-16 13:07:47 +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
e6609d0970
simplify mysql user creation flow
...
if dbuser exists try a different one, owncloud/core#108
changed outdated comment
corrected length calculation
changed indentation for else clauses
2014-09-16 11:53:54 +02:00
e2b504e61d
Revert "improve logo flexibility to fix wide custom logo alignment, fix #9339"
...
This reverts commit 064e6951e1Fixes #10967
2014-09-16 11:22:54 +02:00
dd70d1b88c
Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdoc
...
Fix unexisting class and PHPDoc
2014-09-16 10:29:01 +02:00
ea2022661d
patch tipsy in style.css - don't patch 3rdparty libraries
2014-09-16 08:45:28 +02:00
af52ffc5d5
Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect
...
add y to with-aspect naming schema
2014-09-16 08:36:33 +02:00
245a0e2ad8
Merge pull request #10362 from owncloud/preserve_transparency_on_fileload
...
Preserve transparency when loading from a file
2014-09-16 08:33:56 +02:00
Lukas Reschke
Morris Jobke
Jenkins for ownCloud
Remco Brenninkmeijer
Robin Appelman
Bernhard Posselt
Thomas Müller
Vincent Petry
Clark Tomlinson
tobiasKaminsky
scolebrook
Michael Göhler