]>
source.dussan.org Git - nextcloud-server.git/log
Frank Karlitschek [Sat, 13 Jul 2013 11:28:22 +0000 (13:28 +0200)]
Removed the preview warning. This is only a simple text change
Björn Schießle [Fri, 12 Jul 2013 09:22:31 +0000 (02:22 -0700)]
Merge pull request #3859 from owncloud/versioning_improved_expire_function
call expire function before writing the new version to make sure to have...
Thomas Müller [Fri, 12 Jul 2013 09:00:14 +0000 (02:00 -0700)]
Merge pull request #3965 from dphi/fix_2846
speedup for propfinds on shared folders
Thomas Müller [Thu, 11 Jul 2013 21:00:31 +0000 (14:00 -0700)]
Merge pull request #4014 from owncloud/fixing-4005-stable5
EventSource and update fixes
Thomas Müller [Thu, 11 Jul 2013 09:40:17 +0000 (02:40 -0700)]
Merge pull request #3984 from owncloud/enable_oci_testing_stable5
Enable oci testing stable5
Thomas Müller [Wed, 10 Jul 2013 22:26:40 +0000 (00:26 +0200)]
update.php: remove event type 'error' as it's unused
eventsource.js: fixing typos and JSDoc comment
Thomas Müller [Wed, 10 Jul 2013 22:04:43 +0000 (00:04 +0200)]
missing file
Thomas Müller [Wed, 10 Jul 2013 22:00:01 +0000 (00:00 +0200)]
- eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser
- eventsource.js: handle undefined data on event
- update.js: in case of error we close the event source - advise the user to reload the page
- update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
Frank Karlitschek [Wed, 10 Jul 2013 06:54:03 +0000 (08:54 +0200)]
5.0.8
Victor Dubiniuk [Tue, 2 Jul 2013 15:46:37 +0000 (18:46 +0300)]
Fallback to border instead of box-shadow
Victor Dubiniuk [Tue, 2 Jul 2013 15:44:10 +0000 (18:44 +0300)]
Fix lazy styles loading in IE8
Jörn Friedrich Dreyer [Tue, 9 Jul 2013 10:52:40 +0000 (12:52 +0200)]
enable oci in autotest.sh
Bart Visscher [Fri, 28 Jun 2013 14:07:22 +0000 (16:07 +0200)]
Going from text to clob is not something we do.
Also Oracle DB has problems with this, see
http://abhijitbashetti.blogspot.de/2011/10/converting-varchar2-to-clob-and-clob-to.html
Conflicts:
tests/lib/dbschema.php
Bart Visscher [Mon, 8 Jul 2013 18:28:33 +0000 (11:28 -0700)]
Merge pull request #3893 from owncloud/backport_1872
Backport #1872
Thomas Müller [Mon, 8 Jul 2013 13:51:39 +0000 (06:51 -0700)]
Merge pull request #3970 from owncloud/backport-3946-stable5
Backport 3946 to stable5
Jörn Friedrich Dreyer [Mon, 8 Jul 2013 10:43:21 +0000 (03:43 -0700)]
Merge pull request #3940 from owncloud/stable5_oracle_testsuite_fixes
Stable5 oracle testsuite fixes
Thomas Müller [Mon, 8 Jul 2013 09:55:22 +0000 (11:55 +0200)]
Squashed commit of the following:
commit
70e6ad56ed5d00aeea8fe82b45047998dac92f80
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Sat Jul 6 00:11:42 2013 +0200
fixing check if public share is a folder or not
commit
8e74ecec3f43a52a9a55871954171ef4073eab9d
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Sat Jul 6 00:04:01 2013 +0200
removing unused getSharedItem()
commit
60ac0f274bbaa926dcec1800e952f2e0b1f05a50
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Jul 5 17:39:41 2013 +0200
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
Conflicts:
apps/files/ajax/upload.php
commit
f071f7439568ffd8b785cd96035cc2e616f61b01
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Jul 5 11:30:53 2013 +0200
fixing Notice: Undefined index: isPublic
commit
d2f2c7e9b896fd0ac57fb8047501205fc37b2abc
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Jul 5 09:58:41 2013 +0200
handle anonymous upload to reshared folder
Björn Schießle [Mon, 8 Jul 2013 08:07:57 +0000 (10:07 +0200)]
Merge https://github.com/owncloud/core/pull/3827
Squashed commit of the following:
commit
eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:03:23 2013 +0200
initialize OC_Defaults only once
commit
bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:02:48 2013 +0200
link to doc in error messages
commit
ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge:
e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:56 2013 +0200
Merge branch 'master' into better-messages
commit
e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:41 2013 +0200
move to non-static defaults.php
commit
9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 2 10:32:13 2013 +0200
no sprintf here, lets t() handle it
commit
fe1df349e248667a137f70d78b04225e5b42a111
Merge:
d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:13:38 2013 +0200
Merge branch 'master' into better-messages
commit
d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:10:57 2013 +0200
use document base url from defaults.php
commit
6c5403748a45717125a2aa375550f05646317d72
Merge:
bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:00:15 2013 +0200
Merge branch 'master' into better-messages
commit
bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:21:12 2013 +0200
link to docs in WebDAV message, ref #3791
commit
3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:10:21 2013 +0200
link to docs in error messages, fix #3819
Conflicts:
lib/config.php
Michael Gapczynski [Wed, 29 May 2013 22:22:54 +0000 (18:22 -0400)]
Implement getDirectoryPermissions() in Shared Permissions, fixes #2846
Michael Gapczynski [Wed, 29 May 2013 22:08:18 +0000 (18:08 -0400)]
Only retrieve the current user's permissions
Robin Appelman [Wed, 29 May 2013 13:25:42 +0000 (15:25 +0200)]
Cache: provide a function to get the permissions of all files in a folder with one query
Conflicts:
lib/files/view.php
Frank Karlitschek [Fri, 5 Jul 2013 15:06:34 +0000 (17:06 +0200)]
5.0.8 RC
Thomas Müller [Fri, 5 Jul 2013 21:47:18 +0000 (23:47 +0200)]
Backport of #3951 to stable5
Squashed commit of the following:
commit
46c1280e4f2ac61f0b3c5fed9d2a516cb000c009
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Jul 5 13:45:21 2013 +0200
proper fix for getting the shared item if no user is logged in
commit
99e32baec4464444a1a46ae47321e0378e367c3e
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Jul 5 13:22:38 2013 +0200
php 5.3 compliant now
commit
227e5f10016e362ed1302acb4426de391d4d9b4b
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Jul 5 12:15:47 2013 +0200
get the real physical folder name for anonymous upload
Thomas Müller [Fri, 5 Jul 2013 21:32:23 +0000 (23:32 +0200)]
Backport of #3948 to stable5
Thomas Mueller [Fri, 28 Jun 2013 14:49:25 +0000 (16:49 +0200)]
for now we disable public upload in case encryption is enabled
Thomas Müller [Fri, 5 Jul 2013 13:07:05 +0000 (15:07 +0200)]
adding tipsy to the upload button showing the max upload and restoring client side upload size validation
Conflicts:
apps/files_sharing/templates/public.php
Björn Schießle [Fri, 5 Jul 2013 14:18:17 +0000 (16:18 +0200)]
remove unneeded bracket, was introduced by the last merge
Björn Schießle [Fri, 5 Jul 2013 12:58:33 +0000 (14:58 +0200)]
added helper function to escape glob pattern
Conflicts:
apps/files_encryption/lib/helper.php
Björn Schießle [Tue, 25 Jun 2013 16:03:05 +0000 (18:03 +0200)]
fix getUidAndFilename() test
Björn Schießle [Tue, 25 Jun 2013 15:46:04 +0000 (17:46 +0200)]
only check for external mount points if the external storage app is enabled
Björn Schießle [Tue, 25 Jun 2013 15:17:41 +0000 (17:17 +0200)]
make trash bin aware of system wide mounts with respect to encryption keys
Björn Schießle [Tue, 25 Jun 2013 14:50:10 +0000 (16:50 +0200)]
only escape glob pattern
Björn Schießle [Tue, 25 Jun 2013 14:41:51 +0000 (16:41 +0200)]
del share keys from correct location
Björn Schießle [Tue, 25 Jun 2013 14:41:24 +0000 (16:41 +0200)]
always return normalized path
Björn Schießle [Tue, 25 Jun 2013 14:03:03 +0000 (16:03 +0200)]
delete file keys from the correct location
Björn Schießle [Tue, 25 Jun 2013 12:42:49 +0000 (14:42 +0200)]
handle rename correctly for system wide mounts
Björn Schießle [Tue, 25 Jun 2013 12:25:00 +0000 (14:25 +0200)]
move isSystemWideMountPoint() to util.php
Björn Schießle [Tue, 25 Jun 2013 12:15:53 +0000 (14:15 +0200)]
some performance improvements, check for system wide mounts only once while writing share keys
Björn Schießle [Tue, 25 Jun 2013 11:36:43 +0000 (13:36 +0200)]
fix path to OC_Mount_Config
Björn Schießle [Tue, 25 Jun 2013 10:21:54 +0000 (12:21 +0200)]
handle system wide mount points
Jörn Friedrich Dreyer [Fri, 5 Jul 2013 13:41:16 +0000 (15:41 +0200)]
fix insertIfNotExist return value, update doc and corresponding test
Thomas Müller [Fri, 5 Jul 2013 09:23:08 +0000 (11:23 +0200)]
no anonymous upload on read-only folders
Victor Dubiniuk [Wed, 3 Jul 2013 19:06:09 +0000 (22:06 +0300)]
Do not add groups if user has no groups
Georg Ehrke [Thu, 4 Jul 2013 08:32:26 +0000 (10:32 +0200)]
fix position of 'user shared the folder foldername with you' label
Jörn Friedrich Dreyer [Thu, 4 Jul 2013 16:20:56 +0000 (18:20 +0200)]
add correct check if table exists for oracle
Bart Visscher [Wed, 26 Jun 2013 19:40:31 +0000 (21:40 +0200)]
Oracle doesn't know & as bitwise AND
Conflicts:
lib/public/share.php
Jörn Friedrich Dreyer [Mon, 24 Jun 2013 20:52:01 +0000 (22:52 +0200)]
for oracle use BITAND() instead of & in sharing permissions sql
Jörn Friedrich Dreyer [Wed, 26 Jun 2013 18:03:24 +0000 (20:03 +0200)]
fix type of numeric columns
Jörn Friedrich Dreyer [Wed, 26 Jun 2013 17:57:28 +0000 (19:57 +0200)]
check item id is set
Jörn Friedrich Dreyer [Thu, 4 Jul 2013 15:08:24 +0000 (17:08 +0200)]
stable5 does not have execute audited yet
Jörn Friedrich Dreyer [Thu, 4 Jul 2013 15:07:18 +0000 (17:07 +0200)]
add missing backticks
Jörn Friedrich Dreyer [Tue, 25 Jun 2013 07:52:04 +0000 (09:52 +0200)]
manuall calculate unix_timestamp for oracle
Björn Schießle [Thu, 4 Jul 2013 12:50:07 +0000 (14:50 +0200)]
more verbose error message
Björn Schießle [Tue, 2 Jul 2013 08:14:33 +0000 (10:14 +0200)]
improved error message
Thomas Müller [Mon, 1 Jul 2013 19:13:04 +0000 (21:13 +0200)]
no ?> at the end of a file
missing .
Conflicts:
apps/files_encryption/files/error.php
Thomas Müller [Mon, 1 Jul 2013 19:12:21 +0000 (21:12 +0200)]
typo
Björn Schießle [Mon, 1 Jul 2013 15:18:16 +0000 (17:18 +0200)]
cast result to bool
Björn Schießle [Mon, 1 Jul 2013 10:24:21 +0000 (12:24 +0200)]
fix error string
Björn Schießle [Mon, 1 Jul 2013 10:23:26 +0000 (12:23 +0200)]
add correct php version
Björn Schießle [Mon, 1 Jul 2013 10:16:36 +0000 (12:16 +0200)]
check php version, the encryption app needs php >= 5.3.3
Conflicts:
apps/files_encryption/appinfo/app.php
Jörn Friedrich Dreyer [Thu, 27 Jun 2013 11:13:49 +0000 (13:13 +0200)]
one if less
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 13:38:02 +0000 (15:38 +0200)]
use assertEquals number of rows in db tests
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 12:49:10 +0000 (14:49 +0200)]
fix numRows usage in files_encryption
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 12:47:42 +0000 (14:47 +0200)]
fix numRows usage in core lib
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 12:47:12 +0000 (14:47 +0200)]
fix numRows usage in user_ldap
Conflicts:
apps/user_ldap/lib/access.php
apps/user_ldap/lib/helper.php
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 12:46:22 +0000 (14:46 +0200)]
make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query
Jörn Friedrich Dreyer [Thu, 4 Jul 2013 12:39:08 +0000 (05:39 -0700)]
Merge pull request #3931 from owncloud/backport_selectRange
Fixing renaming for stable5
Björn Schießle [Thu, 4 Jul 2013 08:04:19 +0000 (01:04 -0700)]
Merge pull request #3921 from owncloud/init_default_strings
Add init funtion to OC_Defaults to be able to wrap translatable strings
Victor Dubiniuk [Wed, 3 Jul 2013 21:24:43 +0000 (00:24 +0300)]
Add selectRange function
Björn Schießle [Wed, 3 Jul 2013 15:10:17 +0000 (17:10 +0200)]
eddition string should be empty by default
Björn Schießle [Wed, 3 Jul 2013 13:18:19 +0000 (15:18 +0200)]
add public api
Björn Schießle [Wed, 3 Jul 2013 12:21:51 +0000 (14:21 +0200)]
move to non-static OC_Defaults
Björn Schießle [Wed, 3 Jul 2013 10:38:20 +0000 (12:38 +0200)]
Add init funtion to OC_Defaults to be able to wrap translatable strings
Robin Appelman [Tue, 25 Jun 2013 15:04:25 +0000 (17:04 +0200)]
Sabre: throw exceptions when delete/create/write operations are not permitted
Thomas Müller [Mon, 1 Jul 2013 21:51:43 +0000 (23:51 +0200)]
use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set
Thomas Mueller [Sun, 16 Jun 2013 22:02:42 +0000 (00:02 +0200)]
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better than nothing
Thomas Müller [Tue, 2 Jul 2013 20:12:17 +0000 (13:12 -0700)]
Merge pull request #3905 from owncloud/emit_signals_for_part_files
Emit signals for part files
Björn Schießle [Wed, 26 Jun 2013 13:51:22 +0000 (15:51 +0200)]
add openssl_error_string() output to the owncloud.log
Björn Schießle [Thu, 27 Jun 2013 12:14:25 +0000 (14:14 +0200)]
fix function documentation
Björn Schießle [Thu, 27 Jun 2013 12:09:22 +0000 (14:09 +0200)]
introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled
Jörn Friedrich Dreyer [Tue, 2 Jul 2013 12:49:36 +0000 (05:49 -0700)]
Merge pull request #3909 from owncloud/stable5-anon-upload
Stable5 anon upload
Björn Schießle [Tue, 2 Jul 2013 08:11:17 +0000 (10:11 +0200)]
improved error message
Victor Dubiniuk [Fri, 28 Jun 2013 20:18:11 +0000 (23:18 +0300)]
Use svg to png fallback on demand only
Victor Dubiniuk [Fri, 28 Jun 2013 20:10:40 +0000 (23:10 +0300)]
Add fallback for svg app icons
Victor Dubiniuk [Fri, 28 Jun 2013 18:53:56 +0000 (21:53 +0300)]
Hide a ghost image on the apps management page
Robin Appelman [Mon, 1 Jul 2013 13:47:17 +0000 (15:47 +0200)]
fix detection of public upload in filelist.js
Robin Appelman [Mon, 1 Jul 2013 13:39:11 +0000 (15:39 +0200)]
fix uploading when ['dirtoken'] is not set
Robin Appelman [Mon, 1 Jul 2013 13:37:52 +0000 (15:37 +0200)]
code style
Roman Geber [Wed, 26 Jun 2013 20:51:38 +0000 (22:51 +0200)]
Added file-upload to GIT repo
Optimized CSS identifiers
Roman Geber [Tue, 25 Jun 2013 10:24:14 +0000 (12:24 +0200)]
Public upload feature
Conflicts:
apps/files/js/filelist.js
Jörn Friedrich Dreyer [Thu, 28 Mar 2013 18:13:37 +0000 (19:13 +0100)]
use css browser switch instead of deprecated jquery browser detection
Jörn Friedrich Dreyer [Thu, 28 Mar 2013 17:50:49 +0000 (18:50 +0100)]
'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly
Jörn Friedrich Dreyer [Wed, 27 Mar 2013 14:55:44 +0000 (15:55 +0100)]
use local variable to walk DOM only once
Jörn Friedrich Dreyer [Wed, 27 Mar 2013 14:55:09 +0000 (15:55 +0100)]
use === to compare empty string ''
Jörn Friedrich Dreyer [Wed, 13 Mar 2013 16:38:56 +0000 (17:38 +0100)]
don't update progress bar in ie < 10
Jörn Friedrich Dreyer [Wed, 13 Mar 2013 16:26:37 +0000 (17:26 +0100)]
return created table row, use as context in fileupload events
Jörn Friedrich Dreyer [Wed, 13 Mar 2013 16:25:27 +0000 (17:25 +0100)]
refactor files.js, make proper use of fileupload events
Jörn Friedrich Dreyer [Wed, 13 Mar 2013 16:24:47 +0000 (17:24 +0100)]
return original filename to fileupload
Jörn Friedrich Dreyer [Mon, 1 Jul 2013 15:53:33 +0000 (08:53 -0700)]
Merge pull request #3802 from owncloud/stable5_backport_oracle_fixes
backport oracle related changes, mostly comments, but also setup related...
Björn Schießle [Mon, 1 Jul 2013 15:00:17 +0000 (17:00 +0200)]
don't run hooks for .part files