]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Tue, 11 Nov 2014 11:15:30 +0000 (12:15 +0100)]
Fix infinite loop if count and limit is 0
* otherwise it will always think it hits the limit and need another round to fetch additional results
Arthur Schiwon [Mon, 27 Oct 2014 14:58:23 +0000 (15:58 +0100)]
dont fail with 500 if configured display name attribute is not set
Frank Karlitschek [Mon, 10 Nov 2014 16:09:50 +0000 (17:09 +0100)]
updating 7.0.3
Thomas Müller [Mon, 10 Nov 2014 16:01:53 +0000 (17:01 +0100)]
Merge pull request #12083 from owncloud/fix-occ-upgrade
Ensure there is a connection object within \OC_DB::enableCaching()
Thomas Müller [Mon, 10 Nov 2014 15:17:08 +0000 (16:17 +0100)]
Ensure there is a connection object within \OC_DB::enableCaching()
Morris Jobke [Mon, 10 Nov 2014 09:52:47 +0000 (10:52 +0100)]
Login Name -> Username in user management
Lukas Reschke [Sat, 8 Nov 2014 13:27:20 +0000 (14:27 +0100)]
Use proper array key
Fixes https://github.com/owncloud/core/issues/12047
Frank Karlitschek [Fri, 7 Nov 2014 19:26:18 +0000 (20:26 +0100)]
7.0.3
Craig Morrissey [Fri, 7 Nov 2014 17:44:18 +0000 (12:44 -0500)]
logging changes
Vincent Petry [Fri, 7 Nov 2014 15:25:27 +0000 (16:25 +0100)]
Merge pull request #11994 from owncloud/stable7-sabre-convertstoragenotavailableexception
[stable7] Convert StorageNotAvailableException to SabreDAV exception
Morris Jobke [Tue, 4 Nov 2014 09:37:16 +0000 (10:37 +0100)]
JS unit tests fix - use toBeUndefined() instead of toEqual(null)
Frank Karlitschek [Thu, 6 Nov 2014 13:45:41 +0000 (14:45 +0100)]
7.0.3 RC3
Bjoern Schiessle [Thu, 6 Nov 2014 10:11:46 +0000 (11:11 +0100)]
check if the provided password is really the current log-in password
Vincent Petry [Thu, 6 Nov 2014 09:59:36 +0000 (10:59 +0100)]
Convert StorageNotAvailableException to SabreDAV exception
Convert \OCP\Files\StorageNotAvailableException to
\Sabre\DAV\Exception\ServiceUnavailable for every file/directory
operation happening inside of SabreDAV.
This is necessary to avoid having the exception bubble up to remote.php
which would return an exception page instead of an appropriate response.
Conflicts:
lib/private/connector/sabre/directory.php
lib/private/connector/sabre/file.php
Morris Jobke [Thu, 6 Nov 2014 08:49:30 +0000 (09:49 +0100)]
Merge pull request #11964 from canepan/patch-1
Fixed a typo in translation
Bernhard Posselt [Wed, 5 Nov 2014 11:04:56 +0000 (12:04 +0100)]
fix typo in content type
Lukas Reschke [Mon, 3 Nov 2014 20:13:07 +0000 (21:13 +0100)]
Support HTML in logo claim
Thomas Müller [Wed, 5 Nov 2014 12:50:19 +0000 (13:50 +0100)]
Merge pull request #11944 from owncloud/stable7backportl10n
backport some strings to stable7
Thomas Müller [Wed, 5 Nov 2014 10:08:17 +0000 (11:08 +0100)]
adjust strings - fixed #11930
canepan [Wed, 5 Nov 2014 10:51:37 +0000 (11:51 +0100)]
Fixed a typo in translation
Vincent Petry [Tue, 4 Nov 2014 19:52:41 +0000 (20:52 +0100)]
Merge pull request #11950 from owncloud/stable7-s2s-fixcertcheckwhennocertfile
[stable7] Check for cert bundle existence before using it
Vincent Petry [Tue, 4 Nov 2014 16:37:15 +0000 (17:37 +0100)]
Store curl error message directly
Vincent Petry [Tue, 4 Nov 2014 15:49:25 +0000 (16:49 +0100)]
Check for cert bundle existence before using it
Volkan Gezer [Tue, 4 Nov 2014 13:36:44 +0000 (14:36 +0100)]
backport some strings to stable7
Vincent Petry [Tue, 4 Nov 2014 11:29:42 +0000 (12:29 +0100)]
Only rescan trash folder when checking deleted versions
This fix prevents the file scanner to rescan the WHOLE storage and reset
the etags by mistake.
Backport of
97a51c46eddf4c1e8c691eea96dd762425ce17ca from master
Morris Jobke [Tue, 4 Nov 2014 08:23:38 +0000 (09:23 +0100)]
fix config.sample.php linebreak
Vincent Petry [Mon, 3 Nov 2014 14:41:40 +0000 (15:41 +0100)]
Capitalize Checks in admin page
Jörn Friedrich Dreyer [Mon, 27 Oct 2014 13:43:31 +0000 (14:43 +0100)]
add driver options to config samples
Jörn Friedrich Dreyer [Mon, 27 Oct 2014 11:30:29 +0000 (12:30 +0100)]
allow passing driver options, fixes #11718
Bjoern Schiessle [Fri, 31 Oct 2014 15:42:54 +0000 (16:42 +0100)]
don't move versions if only the mount point was renamed
Lukas Reschke [Tue, 28 Oct 2014 22:32:57 +0000 (23:32 +0100)]
Fix typo
Bjoern Schiessle [Tue, 28 Oct 2014 14:57:08 +0000 (15:57 +0100)]
get the source path and owner in a pre hook and the target path and owner in a
post hook
Lukas Reschke [Fri, 31 Oct 2014 09:22:20 +0000 (10:22 +0100)]
Merge pull request #11614 from owncloud/fix_files_external_s3_storage_id_migration
fix files_external storage id migration
Arthur Schiwon [Wed, 29 Oct 2014 17:52:55 +0000 (18:52 +0100)]
on xp'ed mode and switching configurations: save raw mode instead of toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848
Backport of
8a48b088ed22f23f961da3c0eb9591989f8cc98a from master
Lukas Reschke [Thu, 30 Oct 2014 09:37:59 +0000 (10:37 +0100)]
Fix stupid copy paste fail
...
Morris Jobke [Thu, 30 Oct 2014 12:44:43 +0000 (13:44 +0100)]
update 3rdparty to match it's stable7 branch
Morris Jobke [Thu, 30 Oct 2014 12:39:45 +0000 (13:39 +0100)]
Merge pull request #11865 from owncloud/stable7-fix-enc-sharingtests
Properly register sharing hooks and proxies
Vincent Petry [Thu, 30 Oct 2014 11:05:15 +0000 (12:05 +0100)]
Properly register sharing hooks and proxies
This will fix failing tests when shares weren't cleant up on delete due
to missing hooks.
Added login for user1 in setUp().
Morris Jobke [Wed, 29 Oct 2014 19:38:46 +0000 (20:38 +0100)]
fix style of generated documentation
Jörn Friedrich Dreyer [Mon, 27 Oct 2014 12:00:31 +0000 (13:00 +0100)]
test files external amazon s3 storage id migration
Jörn Friedrich Dreyer [Thu, 16 Oct 2014 12:50:39 +0000 (14:50 +0200)]
fix files_external storage id migration
Frank Karlitschek [Thu, 23 Oct 2014 19:26:04 +0000 (21:26 +0200)]
7.0.3RC1
Vincent Petry [Wed, 29 Oct 2014 11:57:12 +0000 (12:57 +0100)]
Added encryption test when moving file as non-owner
Vincent Petry [Wed, 29 Oct 2014 11:56:49 +0000 (12:56 +0100)]
Fix warning with unset extension check
Vincent Petry [Wed, 29 Oct 2014 11:22:50 +0000 (12:22 +0100)]
Fix moving share keys as non-owner to subdir
This fix gathers the share keys BEFORE a file is moved to make sure that
findShareKeys() is able to find all relevant keys when the file still
exists.
After the move/copy operation the keys are moved/copied to the target
dir.
Also: refactored preRename and preCopy into a single function to avoid
duplicate code.
Lukas Reschke [Wed, 29 Oct 2014 09:28:09 +0000 (10:28 +0100)]
Close session for search
Make search non-blocking.
Lukas Reschke [Wed, 22 Oct 2014 16:12:21 +0000 (18:12 +0200)]
Close session for avatar get
This somehow blocked the "Users" UI for me when having a lot of users. - Shouldn't hurt here.
Lukas Reschke [Mon, 22 Sep 2014 13:36:39 +0000 (15:36 +0200)]
Show login again instead of JSON if CSRF check fails
Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login.
With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often.
This can be tested by opening the login page, then clearing the cookies, and trying to login.
Lukas Reschke [Tue, 28 Oct 2014 13:23:58 +0000 (14:23 +0100)]
Merge pull request #11802 from owncloud/backport-10958
Backport #10958
Thomas Müller [Tue, 28 Oct 2014 09:05:32 +0000 (10:05 +0100)]
Merge pull request #11800 from owncloud/backport-MakeSupportedDBsConfigurable
Make supported DBs configurable within config.php
Vincent Petry [Mon, 27 Oct 2014 15:27:12 +0000 (16:27 +0100)]
Properly catch 503 storage not available in getQuotaInfo
When doing a PROPFIND on the root and one of the mount points is not
available, the returned quota attributes will now be zero.
This fix prevents the expected exception to make the whole call fail.
Backport of
21d825ed6c11425d36a143f8ed63f1e3852d0aeb from master
Robin Appelman [Tue, 9 Sep 2014 11:57:02 +0000 (13:57 +0200)]
Introduce cross-db ILIKE
adding ILIKE to AdapterSQLSrv
add test case for ILIKE with wildcard
Make sqlite LIKE case sensitive on default
Implement ILIKE for sqlite
Use ILIKE in cache search
Fix ILIKE without wildcards for oracle
Lukas Reschke [Mon, 27 Oct 2014 11:51:26 +0000 (12:51 +0100)]
Make supported DBs configurable within config.php
This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake.
To test this play around with the new configuration parameter "supportedDatabases".
Conflicts:
lib/private/util.php
Lukas Reschke [Fri, 24 Oct 2014 09:14:51 +0000 (11:14 +0200)]
Make files non executable
There is not much sense in having these files marked executable, we should avoid that.
Vincent Petry [Thu, 23 Oct 2014 10:36:35 +0000 (12:36 +0200)]
Merge pull request #11719 from owncloud/stable7-fix-s3-regression
[stable7] Fix S3 connection regression
Vincent Petry [Wed, 22 Oct 2014 19:48:22 +0000 (21:48 +0200)]
Fix S3 connection
Arthur Schiwon [Wed, 22 Oct 2014 11:28:08 +0000 (13:28 +0200)]
Backport of #11702
set up FS by username, not login name\!
better variable name
Vincent Petry [Wed, 22 Oct 2014 12:50:22 +0000 (14:50 +0200)]
Lazy initialize external storages
Backport of
075e8d8e8658913e1c5b8869f3e457fa6db2d847 from master
Jörn Friedrich Dreyer [Tue, 21 Oct 2014 10:58:26 +0000 (12:58 +0200)]
guess mimetype on touch
Conflicts:
apps/files_external/lib/amazons3.php
Vincent Petry [Wed, 22 Oct 2014 09:06:12 +0000 (11:06 +0200)]
Merge pull request #11691 from owncloud/fix_pub_link_creation
fix target creation for public links
Bjoern Schiessle [Tue, 21 Oct 2014 14:20:28 +0000 (16:20 +0200)]
if it is not a folder share the path already points to the correct file
Bjoern Schiessle [Tue, 21 Oct 2014 14:19:54 +0000 (16:19 +0200)]
always use the correct share type
Lukas Reschke [Mon, 20 Oct 2014 18:09:27 +0000 (20:09 +0200)]
Merge pull request #11673 from owncloud/backport-11593
Backport #11593
Vincent Petry [Mon, 20 Oct 2014 15:11:08 +0000 (17:11 +0200)]
Add proper setup and teardown
Properly restore REQUEST_URI and SCRIPT_NAME after test runs
Lukas Reschke [Mon, 20 Oct 2014 11:35:23 +0000 (13:35 +0200)]
Add "$_SERVER['REQUEST_URI']" to fix the unit tests
Let's hope that works
Lukas Reschke [Mon, 20 Oct 2014 10:37:32 +0000 (12:37 +0200)]
Refer to relative path instead of absolute path
There is no need to refer to the absolute path here if we can use the relative one.
Conflicts:
lib/private/templatelayout.php
Conflicts:
lib/private/templatelayout.php
Lukas Reschke [Wed, 15 Oct 2014 11:43:04 +0000 (13:43 +0200)]
Add unit tests for convertToRelativePath
Arthur Schiwon [Thu, 18 Sep 2014 15:12:35 +0000 (17:12 +0200)]
backport of #11494
fix retrievel of group members and cache group members
fix changed variable name
with several backends, more than limit can be returned
make performance less bad. Still far from good, but at least it works
add one simple cache test
adjust group manager tests
macjohnny [Thu, 19 Jun 2014 09:37:46 +0000 (11:37 +0200)]
backport of #9104
Update manager.php
add caching to getUserGroupIds
Update manager.php
added description and blank lines in getUserGroupIds
Update manager.php
defined $uid in getUserGroupIds
Update manager.php
Update manager.php
Update manager.php
clean up function getUserGroupIds
clean up of function getUserGroupIds and improved caching mechanism of cachedUserGroupIds
modified caching mechanism in getUserGroupIds
removed cachedUserGroupIds, instead changed indexing in getUserGroups to groupId
adapted tests for a groupId indexed group array
Vincent Petry [Fri, 17 Oct 2014 10:28:27 +0000 (12:28 +0200)]
Encapsulate require_once to avoid name space bleedind
The script required by require_once might use variable names like $app
which will conflict with the code that follows.
This fix encapsulates require_once into its own function to avoid such
issues.
Thomas Müller [Fri, 17 Oct 2014 09:46:22 +0000 (11:46 +0200)]
fixing usage of EncryptionException
Thomas Müller [Fri, 17 Oct 2014 10:02:03 +0000 (12:02 +0200)]
Merge pull request #11610 from owncloud/fix-svg-s7
Fix SVG icons
Bjoern Schiessle [Wed, 15 Oct 2014 10:30:31 +0000 (12:30 +0200)]
set password field placeholder back if passward was disabled
Morris Jobke [Thu, 16 Oct 2014 22:57:35 +0000 (00:57 +0200)]
fix the RST syntax of config.sample.php
Jörn Friedrich Dreyer [Fri, 17 Oct 2014 07:50:06 +0000 (09:50 +0200)]
Merge pull request #11550 from owncloud/fix_flickering_users
fix flickering users in files external
Morris Jobke [Thu, 16 Oct 2014 22:35:51 +0000 (00:35 +0200)]
read config.sample.php options and whitespace fixes
Carla Schroder [Tue, 14 Oct 2014 23:57:45 +0000 (16:57 -0700)]
commented out instanceid and passwordsalt
Carla Schroder [Tue, 14 Oct 2014 17:00:20 +0000 (10:00 -0700)]
some small tweaks
Carla Schroder [Fri, 10 Oct 2014 16:42:58 +0000 (09:42 -0700)]
small corrections to config.sample.php
Lukas Reschke [Thu, 16 Oct 2014 19:45:09 +0000 (21:45 +0200)]
Add a try catch block
This function might also be called before ownCloud is setup which results in a PHP fatal error. We therefore should gracefully catch errors in there.
Arthur Schiwon [Tue, 7 Oct 2014 14:29:06 +0000 (16:29 +0200)]
backport of #11478
add checkbox for experienced users to server tab
must be empty not auto
sets user filters to raw mode when marking user as experienced
Objectlasses, Groups and Attributes are now loaded only in assisted mode and only once
user and group counts are only upated on demand in experienced mode
confirmation before switching to assisted mode when admin is experienced
rename internal var name to avoid collision
more beautiful white spaces
smaller corrections to make scruitinizer happier, no effective changes
bump version
fix triggering of group update counts. improves the basic code which is also responsible for user counts. i did not find regressions, please doublecheck
remove debug output
coding style, no effective code changes
always abort running ajax request when the method is fired up again
show a spinner next to test filter button when the test is running
show Spinner when stuff is being saved
show busy cursor and lock tabs on save
instead of dis/enabling tabs on save, cancel tab change. avoids noisy ui
remove debug output
rephrase xp'ed user mode label
left-align checkbox on server tab
Jörn Friedrich Dreyer [Thu, 16 Oct 2014 14:05:56 +0000 (16:05 +0200)]
Merge pull request #10732 from owncloud/make_skeleton_compatible_with_objectstore_minimal_stable7
make skeleton compatible with objectstore
Thomas Müller [Thu, 16 Oct 2014 11:29:51 +0000 (13:29 +0200)]
include the apps' versions hash to invalidate the cached assets
Lukas Reschke [Wed, 15 Oct 2014 09:23:42 +0000 (11:23 +0200)]
Add app version to JS and CSS
This leads to the regeneration of the hash in case a single application is updated.
Fixes https://github.com/owncloud/core/issues/11374
Bjoern Schiessle [Wed, 15 Oct 2014 12:05:18 +0000 (14:05 +0200)]
strip whitespace from the beginning and end of the display name to avoid empty display names
Lukas Reschke [Thu, 16 Oct 2014 12:33:32 +0000 (14:33 +0200)]
Merge pull request #11613 from owncloud/external-share-self-signed-stable7
[stable7] Use certificate bundle from files_external for external shares
Jörn Friedrich Dreyer [Wed, 8 Oct 2014 16:02:42 +0000 (18:02 +0200)]
throw exception in writeBack, the returned boolean is checked nowhere
Jörn Friedrich Dreyer [Fri, 10 Oct 2014 13:34:19 +0000 (15:34 +0200)]
make tests compatible with hook based skeleton generation
Jörn Friedrich Dreyer [Fri, 29 Aug 2014 12:36:00 +0000 (14:36 +0200)]
make skeleton compatible with objectstore
suspend encryption proxy when copying skeleton
Robin Appelman [Thu, 16 Oct 2014 11:42:42 +0000 (13:42 +0200)]
Use certificate bundle from files_external for external shares
Lukas Reschke [Thu, 16 Oct 2014 10:40:09 +0000 (12:40 +0200)]
Remove insane comment
Lukas Reschke [Thu, 16 Oct 2014 10:13:16 +0000 (12:13 +0200)]
Fix SVG icons
FIXME: Ugly hack to prevent SVG of being returned if the SVG
provider is not enabled.
This is required because the preview system is designed in a
bad way and relies on opt-in with asterisks (i.e. image/*)
which will lead to the fact that a SVG will also match the image
provider.
Conflicts:
lib/private/preview.php
Frank Karlitschek [Thu, 16 Oct 2014 06:26:55 +0000 (08:26 +0200)]
7.0.3 RC1
Lukas Reschke [Tue, 14 Oct 2014 10:58:00 +0000 (12:58 +0200)]
Add darwin to if block
Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.
Lukas Reschke [Wed, 15 Oct 2014 20:24:59 +0000 (22:24 +0200)]
Merge pull request #11520 from owncloud/make-trash-objectstore-compatible
make trashbin compatible with objectstore
Lukas Reschke [Sun, 12 Oct 2014 16:40:10 +0000 (18:40 +0200)]
Use `rawurlencode` since this seems to be expected by cURL
Fixes https://github.com/owncloud/core/pull/11501#issuecomment-
58794405
Conflicts:
tests/lib/largefilehelpergetfilesize.php
Robin Appelman [Wed, 15 Oct 2014 15:00:01 +0000 (17:00 +0200)]
Merge pull request #11567 from owncloud/cache-updater-refactor-stable7
[stable7] Refactor cache updater to work outside of the users home
Clark Tomlinson [Fri, 26 Sep 2014 14:14:59 +0000 (10:14 -0400)]
Adding test helper to test private methods
Vincent Petry [Mon, 13 Oct 2014 15:15:58 +0000 (17:15 +0200)]
Allow specifying protocol in ext storage OC config
Allow specifying a protocol in the host field when mounting another
ownCloud instance. Note that this was already possible with the WebDAV
config but this bug made it inconsistent.
Vincent Petry [Wed, 15 Oct 2014 08:14:20 +0000 (10:14 +0200)]
Use body element when animating scroll in public page
In the public page the scroll container is the window instead of a div.
The $(window) object doesn't support animating the scroll property, so
the $('body') element is used instead.
Backport of
704ffaa6a37730f02a3359e8e8f0a0070f0e0d31 from master