]>
source.dussan.org Git - nextcloud-server.git/log
Lukas Reschke [Fri, 19 Sep 2014 11:35:21 +0000 (13:35 +0200)]
Add a configuration switch for enabled preview mimetypes
Morris Jobke [Mon, 22 Sep 2014 12:04:20 +0000 (14:04 +0200)]
Merge pull request #11210 from owncloud/issue/11209
Also match routes without trailing slash for files app
Morris Jobke [Mon, 22 Sep 2014 11:03:43 +0000 (13:03 +0200)]
update 3rdparty submodule to its master commit
blizzz [Mon, 22 Sep 2014 10:13:15 +0000 (12:13 +0200)]
Merge pull request #9225 from voxsim/fix_displayNamesInGroup
fix in displayNamesInGroup
Joas Schilling [Mon, 22 Sep 2014 08:59:12 +0000 (10:59 +0200)]
Also match routes without trailing slash
Fix #11209
Thomas Müller [Mon, 22 Sep 2014 08:04:02 +0000 (10:04 +0200)]
Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard
Append port to trusted domain in case it's not 80 or 443
Thomas Müller [Mon, 22 Sep 2014 08:02:03 +0000 (10:02 +0200)]
Merge pull request #10499 from owncloud/mkcol-headers-afterbind
Use afterBind to send fileId header for files and directories
Volkan Gezer [Sun, 21 Sep 2014 15:32:37 +0000 (17:32 +0200)]
fix button text l10n
Jenkins for ownCloud [Mon, 22 Sep 2014 05:54:36 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Sun, 21 Sep 2014 21:07:17 +0000 (23:07 +0200)]
Merge pull request #11203 from owncloud/fix_broken_previews_on_public_page
files_sharing: add route for ajax/publicpreview
Morris Jobke [Sun, 21 Sep 2014 20:48:21 +0000 (22:48 +0200)]
Merge pull request #11199 from owncloud/delete_bogus_previews
Delete bogus cached previews while updating
Morris Jobke [Sun, 21 Sep 2014 20:44:07 +0000 (22:44 +0200)]
Merge pull request #11200 from owncloud/preview_better_errorhandling
make sure preview prop is instanceof OC_Image before using it in showPreview
Georg Ehrke [Sun, 21 Sep 2014 16:21:42 +0000 (18:21 +0200)]
files_sharing: add route for ajax/publicpreview
Georg Ehrke [Sun, 21 Sep 2014 15:30:29 +0000 (17:30 +0200)]
make sure preview prop is instanceof OC_Image before using it in showPreview
Georg Ehrke [Sun, 21 Sep 2014 15:16:21 +0000 (17:16 +0200)]
delete old previews
Morris Jobke [Sun, 21 Sep 2014 09:13:58 +0000 (11:13 +0200)]
Merge pull request #11196 from owncloud/sqlite-migration-smallint-master
adding 'smallint unsigned' to type mapping for sqlite
Jenkins for ownCloud [Sun, 21 Sep 2014 05:54:29 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Sat, 20 Sep 2014 18:06:44 +0000 (20:06 +0200)]
adding 'smallint unsigned' to type mapping for sqlite
Jenkins for ownCloud [Sat, 20 Sep 2014 05:54:34 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Fri, 19 Sep 2014 19:39:30 +0000 (21:39 +0200)]
Merge pull request #11178 from owncloud/throw-error-on-preview-instead-in-the-contructor
Throw error in showPreview instead the constructor
Morris Jobke [Fri, 19 Sep 2014 19:39:03 +0000 (21:39 +0200)]
Merge pull request #11184 from owncloud/typo
fix typo. closes #11132
Volkan Gezer [Fri, 19 Sep 2014 16:22:09 +0000 (18:22 +0200)]
fix typo
Vincent Petry [Fri, 19 Sep 2014 15:24:12 +0000 (17:24 +0200)]
Add myself as author
Lukas Reschke [Fri, 19 Sep 2014 14:50:56 +0000 (16:50 +0200)]
Merge pull request #10968 from owncloud/admin-groupsselect2
Use select2 for the groups excluded from sharing in admin page
Lukas Reschke [Fri, 19 Sep 2014 14:40:19 +0000 (16:40 +0200)]
Merge pull request #11104 from owncloud/enc_create_backup_on_recovery
[encryption] create backup from all keys before recovery
Lukas Reschke [Fri, 19 Sep 2014 14:04:29 +0000 (16:04 +0200)]
Merge pull request #11171 from owncloud/fix-route
Match more URL fragments
Lukas Reschke [Fri, 19 Sep 2014 11:39:13 +0000 (13:39 +0200)]
Merge pull request #11158 from owncloud/fix_basic_auth
Move BasicAuth check to isLoggedIn
Lukas Reschke [Fri, 19 Sep 2014 11:26:41 +0000 (13:26 +0200)]
Throw error in showPreview instead the constructor
This function is also used in a way such as:
```
$preview = new \OC\Preview(\OC_User::getUser(), 'files');
$info = \OC\Files\Filesystem::getFileInfo($file);
if (!$always and !$preview->isAvailable($info)) {
\OC_Response::setStatus(404);
} else {
$preview->setFile($file);
$preview->setMaxX($maxX);
$preview->setMaxY($maxY);
$preview->setScalingUp($scalingUp);
$preview->setKeepAspect($keepAspect);
}
```
Which won't work anymore since `setFile` is used instead of passing the file in the constructor. Fixes a regression in master.
Lukas Reschke [Fri, 19 Sep 2014 11:02:22 +0000 (13:02 +0200)]
Merge pull request #11142 from owncloud/fix-windows
Resolves cache tests failing if the directory length is longer than 64
Vincent Petry [Fri, 19 Sep 2014 10:23:42 +0000 (12:23 +0200)]
Merge pull request #11119 from owncloud/removeOldUpgradeRoutines
Remove old upgrade routines
Vincent Petry [Fri, 19 Sep 2014 10:20:22 +0000 (12:20 +0200)]
Merge pull request #11163 from owncloud/check-for-updates-between-major-versions
Prevent updates between multiple major versions
Robin Appelman [Fri, 19 Sep 2014 10:07:56 +0000 (12:07 +0200)]
Merge pull request #10958 from owncloud/db-ilike
Introduce cross-db ILIKE
Bjoern Schiessle [Wed, 17 Sep 2014 08:40:41 +0000 (10:40 +0200)]
make sure that we really catch the files folder only
Bjoern Schiessle [Tue, 16 Sep 2014 13:16:27 +0000 (15:16 +0200)]
create backup from all keys before recovery
Jenkins for ownCloud [Fri, 19 Sep 2014 05:55:44 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Lukas Reschke [Thu, 18 Sep 2014 21:18:07 +0000 (23:18 +0200)]
Match more URL fragments
Fixes https://github.com/owncloud/core/pull/11009#issuecomment-
56103341
Morris Jobke [Thu, 18 Sep 2014 16:19:53 +0000 (18:19 +0200)]
Merge pull request #11141 from owncloud/update_encrytionlink
update encryption doc link
Volkan Gezer [Wed, 17 Sep 2014 18:53:19 +0000 (20:53 +0200)]
update encryption doc link
I don't know how we missed to update this :/
update ldap doc link
Lukas Reschke [Thu, 18 Sep 2014 15:45:30 +0000 (17:45 +0200)]
Prevent updates between multiple major versions
Ref https://github.com/owncloud/core/issues/11078
voxsim [Thu, 18 Sep 2014 15:50:19 +0000 (17:50 +0200)]
1. remove sizeof($filteredUsers) > 0 as condition
2. use count instead of sizeof. Latter is an alias to first one, practically we stick to count everywhere. Having it consistent helps with readability.
3. move whitespace so we have $groupUsers[] = $filteredUser; instead of $groupUsers []= $filteredUser;
Lukas Reschke [Thu, 18 Sep 2014 14:02:18 +0000 (16:02 +0200)]
Move BasicAuth check to "isLoggedIn()"
Ensures that Basic Auth works properly for APIs and removes the need for some even uglier lines of code.
Lukas Reschke [Thu, 18 Sep 2014 13:42:36 +0000 (15:42 +0200)]
Merge pull request #11151 from owncloud/removeOverflowingFunction
Remove unused and overflowing function
Robin Appelman [Thu, 18 Sep 2014 13:09:57 +0000 (15:09 +0200)]
Fix ILIKE without wildcards for oracle
Lukas Reschke [Thu, 18 Sep 2014 12:40:42 +0000 (14:40 +0200)]
Merge pull request #11130 from owncloud/moveBasicAuthCheck
Move basic auth check
Lukas Reschke [Thu, 18 Sep 2014 08:21:28 +0000 (10:21 +0200)]
Remove unused and overflowing function
Resolves https://github.com/owncloud/core/issues/10991 failure 4
Morris Jobke [Thu, 18 Sep 2014 07:10:16 +0000 (09:10 +0200)]
Merge pull request #11143 from owncloud/improve-404
Make 404 page easier to understand
Morris Jobke [Thu, 18 Sep 2014 07:04:53 +0000 (09:04 +0200)]
Merge pull request #9541 from owncloud/force_loading_of_encryption_app
force loading of encryption app to show correct error
Jenkins for ownCloud [Thu, 18 Sep 2014 05:54:39 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 17 Sep 2014 21:55:53 +0000 (23:55 +0200)]
Merge pull request #11136 from owncloud/fix_body_id
Error needs to push body-id for new guest layout
Lukas Reschke [Wed, 17 Sep 2014 20:49:37 +0000 (22:49 +0200)]
Make 404 page easier to understand
Fixes https://github.com/owncloud/core/issues/11133
Clark Tomlinson [Wed, 17 Sep 2014 20:24:43 +0000 (16:24 -0400)]
Resolves cache tests failing if the directory length is longer than 64
Lukas Reschke [Wed, 17 Sep 2014 16:10:49 +0000 (18:10 +0200)]
Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfix
Tentative fix for legacy file actions unit test side effect
Remco Brenninkmeijer [Wed, 17 Sep 2014 16:02:18 +0000 (18:02 +0200)]
Error needs to push body-id for new guest layout
Lukas Reschke [Wed, 17 Sep 2014 15:12:06 +0000 (17:12 +0200)]
force loading of encryption app
Lukas Reschke [Wed, 17 Sep 2014 15:05:47 +0000 (17:05 +0200)]
Merge pull request #9554 from owncloud/fix_preview_orientation
fix orientation in image-backend, not in preview system itself
Robin Appelman [Wed, 17 Sep 2014 14:12:54 +0000 (16:12 +0200)]
Use ILIKE in cache search
Lukas Reschke [Wed, 17 Sep 2014 14:04:12 +0000 (16:04 +0200)]
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
Lukas Reschke [Wed, 17 Sep 2014 13:36:41 +0000 (15:36 +0200)]
Merge pull request #10622 from owncloud/recursive-delete-forbidden
Fix isDeletable
Robin Appelman [Wed, 17 Sep 2014 11:47:55 +0000 (13:47 +0200)]
Implement ILIKE for sqlite
Robin Appelman [Wed, 17 Sep 2014 11:47:33 +0000 (13:47 +0200)]
Make sqlite LIKE case sensitive on default
Morris Jobke [Wed, 17 Sep 2014 11:05:26 +0000 (13:05 +0200)]
Merge pull request #10932 from owncloud/issue/10926
Add a method to get the absolute url for a route
Lukas Reschke [Wed, 17 Sep 2014 09:36:08 +0000 (11:36 +0200)]
Fix mapping of relative paths
Robin Appelman [Mon, 25 Aug 2014 12:28:35 +0000 (14:28 +0200)]
Also check if the file itself is updatable
Robin Appelman [Mon, 25 Aug 2014 12:06:48 +0000 (14:06 +0200)]
Check if a folder is deletable before we try to recursively delete it
Robin Appelman [Mon, 25 Aug 2014 12:06:27 +0000 (14:06 +0200)]
Check if the parent is writable to check if a file is deletable
Lukas Reschke [Wed, 17 Sep 2014 08:35:50 +0000 (10:35 +0200)]
Merge pull request #11092 from owncloud/conceal_sabredav_version
Conceal or display SabreDAV version number.
Jenkins for ownCloud [Wed, 17 Sep 2014 05:55:27 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Lukas Reschke [Tue, 16 Sep 2014 21:56:20 +0000 (23:56 +0200)]
Merge pull request #10745 from owncloud/fix-10708-doctrine
Use Doctrine Platform to generate SQL query for table truncation.
Lukas Reschke [Tue, 16 Sep 2014 19:09:47 +0000 (21:09 +0200)]
Merge pull request #10902 from owncloud/fix-ellepsis
Adding link to ellipsis and fixing styling
Robin Appelman [Tue, 16 Sep 2014 19:03:03 +0000 (21:03 +0200)]
add test case for ILIKE with wildcard
Lukas Reschke [Tue, 16 Sep 2014 18:27:52 +0000 (20:27 +0200)]
Remove old upgrade routines
We do not support updates from 6 to 8 directly, therefore we can remove those upgrade routines.
Lukas Reschke [Tue, 16 Sep 2014 17:31:51 +0000 (19:31 +0200)]
Merge pull request #11009 from owncloud/tobiasKaminsky-route
REST API for thumbnails
Lukas Reschke [Tue, 16 Sep 2014 16:54:37 +0000 (18:54 +0200)]
Merge pull request #11102 from owncloud/visit1985-issue_108
mysql setup: if dbuser exists try a different one (owncloud/core#108)
Morris Jobke [Tue, 16 Sep 2014 16:28:39 +0000 (18:28 +0200)]
Merge pull request #10896 from owncloud/undo-nav-entry
Add delete undo styles
Bernhard Posselt [Fri, 5 Sep 2014 15:49:17 +0000 (17:49 +0200)]
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
Lukas Reschke [Tue, 16 Sep 2014 15:29:03 +0000 (17:29 +0200)]
Merge pull request #7254 from owncloud/core-sortalgo
Fixed JS sort comparator to be consistent between JS and PHP
Lukas Reschke [Tue, 16 Sep 2014 14:34:16 +0000 (16:34 +0200)]
Merge pull request #10680 from helmutschneider/aws-2.6.15
Update AWS sdk to 2.6.15
Thomas Müller [Tue, 16 Sep 2014 14:33:02 +0000 (16:33 +0200)]
Merge pull request #11082 from owncloud/deduplicateDependencyCheck
Deduplicate dependency checks
Thomas Müller [Tue, 16 Sep 2014 14:17:25 +0000 (16:17 +0200)]
adding unit test to truncate the table
Lukas Reschke [Tue, 16 Sep 2014 14:00:58 +0000 (16:00 +0200)]
Merge pull request #11108 from owncloud/add-proper-descr
Reword the description
Lukas Reschke [Tue, 16 Sep 2014 13:51:48 +0000 (15:51 +0200)]
Reword the description
The old one was just horrible wrong.
Lukas Reschke [Tue, 16 Sep 2014 13:48:19 +0000 (15:48 +0200)]
Merge pull request #10754 from cetra3/master
Refactor internal session handler to write directly to $_SESSION
Thomas Müller [Tue, 16 Sep 2014 13:44:21 +0000 (15:44 +0200)]
adding ILIKE to AdapterSQLSrv
Vincent Petry [Tue, 16 Sep 2014 13:30:56 +0000 (15:30 +0200)]
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.
Robin Appelman [Tue, 9 Sep 2014 11:57:02 +0000 (13:57 +0200)]
Introduce cross-db ILIKE
Clark Tomlinson [Fri, 5 Sep 2014 18:54:53 +0000 (14:54 -0400)]
Adding link to ellipsis and fixing styling
tobiasKaminsky [Sat, 9 Aug 2014 08:39:12 +0000 (10:39 +0200)]
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
Thomas Müller [Tue, 16 Sep 2014 12:49:50 +0000 (14:49 +0200)]
Merge pull request #11055 from owncloud/replaceprodname
replace ownCloud with placeholder
Lukas Reschke [Tue, 16 Sep 2014 12:00:24 +0000 (14:00 +0200)]
Merge pull request #11084 from owncloud/no-migration-for-mssql-master
Disable database migrations for MSSQL - scripts have to be applied manua...
Lukas Reschke [Tue, 16 Sep 2014 11:58:12 +0000 (13:58 +0200)]
Merge pull request #11081 from owncloud/trash_fix_expire
also expire file if timestamp = limit, happens if trashbin_retention_obl...
scolebrook [Mon, 15 Sep 2014 16:38:01 +0000 (12:38 -0400)]
Conceal or display SabreDAV version number in browser and http response headers.
Lukas Reschke [Mon, 15 Sep 2014 11:46:43 +0000 (13:46 +0200)]
Deduplicate dependency checks
Some code that I also used for https://github.com/owncloud/administration/pull/11
Morris Jobke [Tue, 16 Sep 2014 10:49:17 +0000 (12:49 +0200)]
Merge pull request #10663 from owncloud/files_trashbin_original_path
Show original path information in trashbin and for shares
Michael Göhler [Tue, 29 Jul 2014 08:52:51 +0000 (10:52 +0200)]
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
Vincent Petry [Tue, 16 Sep 2014 09:22:54 +0000 (11:22 +0200)]
Revert "improve logo flexibility to fix wide custom logo alignment, fix #9339"
This reverts commit
064e6951e1ef792422ff6cf24fce79c2320d4d5e .
Reverting due to regression that breaks styles in error page, setup
page and others.
Fixes #10967
Morris Jobke [Tue, 16 Sep 2014 08:29:01 +0000 (10:29 +0200)]
Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdoc
Fix unexisting class and PHPDoc
Morris Jobke [Tue, 16 Sep 2014 06:45:28 +0000 (08:45 +0200)]
patch tipsy in style.css - don't patch 3rdparty libraries
Morris Jobke [Tue, 16 Sep 2014 06:36:33 +0000 (08:36 +0200)]
Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect
add y to with-aspect naming schema
Morris Jobke [Tue, 16 Sep 2014 06:33:56 +0000 (08:33 +0200)]
Merge pull request #10362 from owncloud/preserve_transparency_on_fileload
Preserve transparency when loading from a file
Jenkins for ownCloud [Tue, 16 Sep 2014 05:54:33 +0000 (01:54 -0400)]
[tx-robot] updated from transifex