]>
source.dussan.org Git - nextcloud-server.git/log
Bjoern Schiessle [Fri, 18 Oct 2013 09:20:33 +0000 (11:20 +0200)]
ocs share api backport to stable5
Vincent Petry [Thu, 17 Oct 2013 19:04:18 +0000 (21:04 +0200)]
Disable versions app JS in public mode
Since the version JS code isn't used in public link mode, disable it to
prevent Chrome freezing bugs due to the t() call being synchronous.
Fixes #4545
Backport of
41c6c44221177da4458f982bb13a5c7a6f90ff8e
Vincent Petry [Mon, 7 Oct 2013 14:59:57 +0000 (16:59 +0200)]
Added isPublic flag in files_sharing template
To make it possible for apps to find out whether they are running in
public mode, the flag "isPublic" will now be present in the DOM.
Backport of
6a36d7fa864ec241d05a00b419ca48cf84ca41ff required by other
fixes.
Vincent Petry [Thu, 17 Oct 2013 09:59:13 +0000 (11:59 +0200)]
Fixed sharing status update for new/uploaded files
Creating new files, folders or uploading files now have their sharing
icon updated accordingly.
For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.
In OC.Share, split loadIcons into loadIcons + updateIcons.
Fixes #4977
Backport of
70c9652cdf6e00f1c62fb9a61d9dd4fb3e2c93c3
Vincent Petry [Thu, 17 Oct 2013 08:46:55 +0000 (10:46 +0200)]
Fixed upload permissions distinction between public and logged in upload
Backport of
9cfb438ff7fd24ef5c81c4f2e075789d320016e2
Vincent Petry [Thu, 17 Oct 2013 10:16:47 +0000 (12:16 +0200)]
Update file actions for newly created files
The commit
d53b603b8259e9c9fe498b4bd50b4dbedc0bf01b for the backport
didn't contain code for the case where new files were created.
This is because that code already existed in OC6 as part of another fix.
This fix adds the missing call to update the file actions for newly
created files.
Thomas Müller [Wed, 16 Oct 2013 19:30:31 +0000 (12:30 -0700)]
Merge pull request #5229 from owncloud/more-link-expiration-stable5
Backport of #4856 to stable5: Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)
Thomas Müller [Wed, 16 Oct 2013 19:09:59 +0000 (12:09 -0700)]
Merge pull request #5185 from owncloud/Update-feed
[stable5] Fixes for update feed fetching and parsing
Andreas Fischer [Tue, 15 Oct 2013 14:15:37 +0000 (16:15 +0200)]
Merge pull request #5343 from owncloud/backport-5340-stable5
Backport 5340 stable5
* owncloud/backport-5340-stable5:
streamCopy() should return proper structure.
Thomas Müller [Mon, 14 Oct 2013 19:33:23 +0000 (21:33 +0200)]
streamCopy() should return proper structure.
Callers of streamCopy() expect an array to be returned containing count and result.
Conflicts:
lib/helper.php
tests/lib/helper.php
Vincent Petry [Mon, 14 Oct 2013 08:09:52 +0000 (10:09 +0200)]
File actions are now updated after create/upload file
The file actions must explicitly be updated by calling
FileActions.display() on the file element after creating or uploading a
file.
Backport of
e98ea06890e87a67f2ae501b7daa55882d1d3a03 for #4971 and #4993
Björn Schießle [Fri, 11 Oct 2013 13:04:14 +0000 (06:04 -0700)]
Merge pull request #5218 from owncloud/no_passwords
remove password before writing it to the log file
Bjoern Schiessle [Fri, 11 Oct 2013 12:57:36 +0000 (14:57 +0200)]
let admin specify timezone for log file entries
Backport from #5173 and #5219
Bjoern Schiessle [Wed, 9 Oct 2013 15:25:58 +0000 (17:25 +0200)]
make sure that we only find file/folder shares
Bjoern Schiessle [Wed, 9 Oct 2013 13:56:21 +0000 (15:56 +0200)]
only encrypt file to users with encryption keys
Conflicts:
apps/files_encryption/lib/stream.php
Thomas Müller [Thu, 10 Oct 2013 14:06:26 +0000 (16:06 +0200)]
the path need to be normalized before putting it into resolvePath()
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
Conflicts:
tests/lib/files/view.php
Victor Dubiniuk [Thu, 10 Oct 2013 16:56:20 +0000 (19:56 +0300)]
Improve empty data check
Björn Schießle [Wed, 9 Oct 2013 13:28:37 +0000 (06:28 -0700)]
Merge pull request #5208 from owncloud/fix_5126_stable5
[stable5] fix upload to /Shared
Andreas Fischer [Sat, 14 Sep 2013 16:44:28 +0000 (18:44 +0200)]
Perform expiration date checking before returning share data for token.
Andreas Fischer [Sat, 14 Sep 2013 15:56:55 +0000 (17:56 +0200)]
Tests whether expired/valid link share is still accessible.
Andreas Fischer [Wed, 9 Oct 2013 01:15:58 +0000 (03:15 +0200)]
Merge pull request #5190 from owncloud/stable5-numRows-no-limit
Do not pass PDO::FETCH_NUM (integer 3) as limit parameter to OC_DB::prepare().
* owncloud/stable5-numRows-no-limit:
Do not pass PDO::FETCH_NUM (integer 3) as limit parameter to OC_DB::prepare().
Andreas Fischer [Tue, 8 Oct 2013 21:16:17 +0000 (23:16 +0200)]
Merge pull request #5212 from owncloud/fixing-5201
[stable5] executeAudited->execute Closes #5201
* owncloud/fixing-5201:
OC_DB::executeAudited is not availabe in 5.0
Bjoern Schiessle [Tue, 8 Oct 2013 18:19:39 +0000 (20:19 +0200)]
remove username/passswords from URLs before writing the to the log file
Bjoern Schiessle [Tue, 8 Oct 2013 15:22:20 +0000 (17:22 +0200)]
Merge branch 'stable5' of github.com:owncloud/core into stable5
Bjoern Schiessle [Tue, 8 Oct 2013 15:21:12 +0000 (17:21 +0200)]
revert backport from here: https://github.com/owncloud/core/pull/5088
This shouldn't have been backported.
Victor Dubiniuk [Tue, 8 Oct 2013 15:19:09 +0000 (18:19 +0300)]
OC_DB::executeAudited is not availabe in 5.0
Björn Schießle [Tue, 8 Oct 2013 15:09:40 +0000 (08:09 -0700)]
Merge pull request #5211 from owncloud/sharing_search_users_fix-stable5
find users which are in the same group
Bjoern Schiessle [Tue, 8 Oct 2013 15:04:12 +0000 (17:04 +0200)]
find users which are in the same group
Björn Schießle [Tue, 8 Oct 2013 13:58:12 +0000 (06:58 -0700)]
Merge pull request #5206 from owncloud/cleanup_share_table
share table clean-up: make sure that we only remove files/folders
Bjoern Schiessle [Tue, 8 Oct 2013 13:46:54 +0000 (15:46 +0200)]
Backport of https://github.com/owncloud/core/pull/5193/
write the part file to the users root folder if the updated file is located in /Shared because we can't create new files in Shared/
Morris Jobke [Tue, 8 Oct 2013 13:45:52 +0000 (15:45 +0200)]
fix escaping
Bjoern Schiessle [Tue, 8 Oct 2013 13:16:33 +0000 (15:16 +0200)]
make sure that we only remove file/folder shares
Thomas Müller [Tue, 8 Oct 2013 11:39:13 +0000 (04:39 -0700)]
Merge pull request #5112 from owncloud/backport-4969-stable5
[backport-stable5] adding privilege check on move and rename operations
Andreas Fischer [Mon, 7 Oct 2013 23:33:22 +0000 (01:33 +0200)]
Do not pass PDO::FETCH_NUM (integer 3) as limit parameter to OC_DB::prepare().
Victor Dubiniuk [Mon, 7 Oct 2013 16:44:19 +0000 (19:44 +0300)]
Do not write current time before checking if cache is expired
Bjoern Schiessle [Mon, 7 Oct 2013 14:21:33 +0000 (16:21 +0200)]
Merge branch 'stable5' of github.com:owncloud/core into stable5
Bjoern Schiessle [Wed, 2 Oct 2013 14:13:08 +0000 (16:13 +0200)]
trash bin button needs to be an input field
Morris Jobke [Mon, 7 Oct 2013 13:23:03 +0000 (06:23 -0700)]
Merge pull request #5164 from owncloud/share-autofocus
Share autofocus
Morris Jobke [Mon, 7 Oct 2013 09:34:46 +0000 (11:34 +0200)]
Fix autofocus
fix #4465
fix #4941
backport of 4803 to stable5
Bjoern Schiessle [Mon, 7 Oct 2013 09:06:24 +0000 (11:06 +0200)]
catch exception if db query execution fails
Bjoern Schiessle [Mon, 7 Oct 2013 08:59:09 +0000 (10:59 +0200)]
clean up oc_share table from files which are no longer exists
Bjoern Schiessle [Fri, 4 Oct 2013 14:50:53 +0000 (16:50 +0200)]
add comments
Bjoern Schiessle [Wed, 2 Oct 2013 11:26:38 +0000 (13:26 +0200)]
remove deleted shares from the database table oc_share
Bart Visscher [Fri, 4 Oct 2013 11:31:40 +0000 (04:31 -0700)]
Merge pull request #5110 from owncloud/pg_install_db
postgresql connect with specify db if 'postgres' does not work
Thomas Müller [Tue, 24 Sep 2013 11:26:12 +0000 (13:26 +0200)]
adding privilege check on move and rename operations
Conflicts:
lib/connector/sabre/objecttree.php
Thomas Müller [Fri, 4 Oct 2013 08:09:00 +0000 (01:09 -0700)]
Merge pull request #5096 from owncloud/backport-4960-stable5
Backport of #4960 to stable5
Morris Jobke [Fri, 4 Oct 2013 05:54:22 +0000 (07:54 +0200)]
Try connection with specified db when postgres does not work
Frank Karlitschek [Thu, 3 Oct 2013 12:26:01 +0000 (14:26 +0200)]
5.0.12
Thomas Müller [Tue, 24 Sep 2013 11:54:18 +0000 (13:54 +0200)]
duplicate code :sigh: - will fix this in a second pr
Thomas Müller [Tue, 24 Sep 2013 11:53:32 +0000 (13:53 +0200)]
adding file_exists check just to be on the save side
Thomas Müller [Mon, 23 Sep 2013 20:04:37 +0000 (22:04 +0200)]
handle error situation of rename proper
Bjoern Schiessle [Thu, 26 Sep 2013 17:34:50 +0000 (19:34 +0200)]
set rememberlogin to false for the encryption app
Bjoern Schiessle [Thu, 26 Sep 2013 17:34:28 +0000 (19:34 +0200)]
check every enabled app if the remember login feature needs to be disabled
Bjoern Schiessle [Tue, 24 Sep 2013 16:01:34 +0000 (18:01 +0200)]
introduce OC_Util::rememberLoginAllowed()
Conflicts:
core/templates/login.php
lib/util.php
Bjoern Schiessle [Tue, 24 Sep 2013 11:08:55 +0000 (13:08 +0200)]
don't remember login if the encrypion app is enabled because the user
needs to log-in again in order to decrypt his private key with his password
Conflicts:
core/templates/login.php
lib/util.php
Frank Karlitschek [Fri, 27 Sep 2013 14:47:10 +0000 (16:47 +0200)]
5.0.12 RC1
VicDeo [Thu, 26 Sep 2013 13:39:05 +0000 (06:39 -0700)]
Merge pull request #4948 from owncloud/fix-inputfields
fix visual glitch, do not use black border for input fields
Bjoern Schiessle [Tue, 17 Sep 2013 16:18:23 +0000 (18:18 +0200)]
we can leave the loop if the permission of the link share was checked
Bjoern Schiessle [Tue, 17 Sep 2013 16:11:43 +0000 (18:11 +0200)]
check only permission from link-share to decide if public upload is enabled or disabled
Andreas Fischer [Tue, 24 Sep 2013 21:36:34 +0000 (23:36 +0200)]
Merge pull request #4954 from owncloud/fix-link-expiration-stable5
Backport of sharing fixes to stable5
* owncloud/fix-link-expiration-stable5:
Calculate dateInPast and dateInFuture.
Compare objects directly. Also use $expected and $actual.
Add database tests for INSERT/SELECT date format.
Add comment explaining how $dateInFuture was picked.
Coding style: { for methods start are supposed to be on the same line.
Expiration tests for sharing with groups.
Do not repeat shareUserOneTestFileWithUserTwo() code.
Make dates test class properties.
Try to make Oracle happy by also specifying seconds.
Test whether a still-valid user share is still accessible.
Test whether an expired user share is still accessible.
Andreas Fischer [Thu, 12 Sep 2013 21:37:43 +0000 (23:37 +0200)]
Calculate dateInPast and dateInFuture.
Andreas Fischer [Thu, 12 Sep 2013 20:52:14 +0000 (22:52 +0200)]
Compare objects directly. Also use $expected and $actual.
Andreas Fischer [Thu, 12 Sep 2013 20:36:28 +0000 (22:36 +0200)]
Add database tests for INSERT/SELECT date format.
Andreas Fischer [Mon, 9 Sep 2013 23:30:48 +0000 (01:30 +0200)]
Add comment explaining how $dateInFuture was picked.
Andreas Fischer [Thu, 5 Sep 2013 00:45:52 +0000 (02:45 +0200)]
Coding style: { for methods start are supposed to be on the same line.
Andreas Fischer [Thu, 5 Sep 2013 00:41:24 +0000 (02:41 +0200)]
Expiration tests for sharing with groups.
Andreas Fischer [Thu, 5 Sep 2013 00:31:54 +0000 (02:31 +0200)]
Do not repeat shareUserOneTestFileWithUserTwo() code.
Andreas Fischer [Thu, 5 Sep 2013 00:27:29 +0000 (02:27 +0200)]
Make dates test class properties.
Andreas Fischer [Wed, 4 Sep 2013 22:15:58 +0000 (00:15 +0200)]
Try to make Oracle happy by also specifying seconds.
Andreas Fischer [Wed, 4 Sep 2013 15:26:30 +0000 (17:26 +0200)]
Test whether a still-valid user share is still accessible.
Andreas Fischer [Wed, 4 Sep 2013 15:15:08 +0000 (17:15 +0200)]
Test whether an expired user share is still accessible.
Robin Appelman [Tue, 6 Aug 2013 13:59:06 +0000 (15:59 +0200)]
remove deleted files while scanning
Bjoern Schiessle [Fri, 20 Sep 2013 13:47:33 +0000 (15:47 +0200)]
initialize variable
Bjoern Schiessle [Fri, 20 Sep 2013 11:11:05 +0000 (13:11 +0200)]
calculate correct permissions while toggle the password protection
Bjoern Schiessle [Fri, 20 Sep 2013 10:40:21 +0000 (12:40 +0200)]
make sure that both $permissions and $oldPermissions have the same type
Bjoern Schiessle [Wed, 18 Sep 2013 09:49:02 +0000 (11:49 +0200)]
only remember password if the user changes the permissions, otherwise the user disabled the password protection
Conflicts:
lib/public/share.php
Jan-Christoph Borchardt [Sun, 22 Sep 2013 22:41:43 +0000 (00:41 +0200)]
fix visual glitch, do not use black border for input fields
Morris Jobke [Sun, 22 Sep 2013 15:40:03 +0000 (08:40 -0700)]
Merge pull request #4924 from owncloud/fixing-4416-stable5
Fixing 4416 stable5
Georg Ehrke [Mon, 3 Jun 2013 10:57:47 +0000 (12:57 +0200)]
public.php - check if maintenance mode is enabled
Thomas Müller [Fri, 20 Sep 2013 14:31:46 +0000 (16:31 +0200)]
setting a default on filecache column unencrypted_size
Thomas Müller [Wed, 18 Sep 2013 21:42:36 +0000 (23:42 +0200)]
adding comma to get cleaner diffs in the future
Thomas Müller [Wed, 18 Sep 2013 21:06:48 +0000 (23:06 +0200)]
no file actions during upload
Thomas Müller [Wed, 18 Sep 2013 11:09:47 +0000 (13:09 +0200)]
remove file action elements before recreating them
Thomas Müller [Wed, 18 Sep 2013 11:09:04 +0000 (13:09 +0200)]
store the permissions retrieved via ajax within the dom element
Thomas Müller [Wed, 18 Sep 2013 09:22:29 +0000 (11:22 +0200)]
add permissions of the file to the json response
Bjoern Schiessle [Wed, 18 Sep 2013 08:40:52 +0000 (10:40 +0200)]
performance improvement, check configuration only if no private key exists
backport from https://github.com/owncloud/core/commit/
72eaf2894a540bc9280e144ba493db7fcde07eac
Bjoern Schiessle [Tue, 3 Sep 2013 13:56:25 +0000 (15:56 +0200)]
check if stream wrapper is already registered to avoid warning
Thomas Müller [Fri, 13 Sep 2013 19:08:32 +0000 (12:08 -0700)]
Merge pull request #4827 from owncloud/backport-4719-stable5
some is_resource tests have been missing in #4701
Frank Karlitschek [Fri, 13 Sep 2013 10:07:42 +0000 (03:07 -0700)]
Merge pull request #4821 from owncloud/fix_user_management
Fix user management
Thomas Müller [Thu, 12 Sep 2013 23:00:43 +0000 (01:00 +0200)]
some is_resource tests have been missing in #4701
ringmaster [Thu, 12 Sep 2013 14:50:26 +0000 (10:50 -0400)]
Allow numeric group names
ringmaster [Thu, 12 Sep 2013 14:49:36 +0000 (10:49 -0400)]
Ensure creation of a JSON array, not an object.
Jörn Friedrich Dreyer [Wed, 11 Sep 2013 09:50:36 +0000 (11:50 +0200)]
Improve IE Compatibility
Added meta tags from HTML5 Boiler Plate to improve compatibility with IE7+. This fixes the issues with rendering.
Thomas Müller [Tue, 10 Sep 2013 23:11:57 +0000 (01:11 +0200)]
never hack late night
Conflicts:
apps/files_external/lib/irods.php
Robin Appelman [Thu, 29 Aug 2013 13:25:38 +0000 (15:25 +0200)]
test case for hooks send from a non-default view
Robin Appelman [Sat, 17 Aug 2013 08:57:31 +0000 (10:57 +0200)]
also emit hooks for views that are a subfolder of the user folder
Thomas Müller [Tue, 10 Sep 2013 11:55:06 +0000 (13:55 +0200)]
Merge branch 'stable5' of github.com:owncloud/core into stable5
Thomas Müller [Tue, 10 Sep 2013 09:25:40 +0000 (11:25 +0200)]
removing all ?> jutt in case
Thomas Müller [Tue, 10 Sep 2013 09:16:43 +0000 (11:16 +0200)]
removing ?> followed by whitespaces
Thomas Müller [Tue, 10 Sep 2013 08:55:02 +0000 (10:55 +0200)]
Workaround for IE 9 & 10 for clicking filelist after adding new item
manual backport of
f4ec5182bdeaa611d13648b50d24f80501d92acd