]>
source.dussan.org Git - nextcloud-server.git/log
Björn Schießle [Thu, 19 Dec 2013 15:09:07 +0000 (07:09 -0800)]
Merge pull request #6495 from owncloud/enc_fseek_fallback
Added fseek fallback to the encryption app
Thomas Müller [Thu, 19 Dec 2013 11:25:58 +0000 (03:25 -0800)]
Merge pull request #6491 from owncloud/fix-warning-array_walk_recursive-json
only walk an array
icewind1991 [Thu, 19 Dec 2013 11:25:20 +0000 (03:25 -0800)]
Merge pull request #6492 from owncloud/appconfig-cache
Fetch all appconfig values for an app at once and cache the results
Thomas Müller [Thu, 19 Dec 2013 11:24:37 +0000 (03:24 -0800)]
Merge pull request #4378 from owncloud/fixing-3417-master
Don't use xcache in case admin auth is enabled
Vincent Petry [Thu, 19 Dec 2013 10:56:46 +0000 (02:56 -0800)]
Merge pull request #6503 from owncloud/finally-kill-mdb2-master
Finally kill mdb2 master
Frank Karlitschek [Thu, 19 Dec 2013 07:41:36 +0000 (23:41 -0800)]
Merge pull request #6502 from owncloud/core-extramimetypes
Added missing mime types
Jenkins for ownCloud [Thu, 19 Dec 2013 06:57:03 +0000 (01:57 -0500)]
[tx-robot] updated from transifex
Thomas Müller [Wed, 18 Dec 2013 23:33:29 +0000 (00:33 +0100)]
fix return statement
Thomas Müller [Wed, 18 Dec 2013 23:32:46 +0000 (00:32 +0100)]
kill MDB2 in PHPDoc
Thomas Müller [Wed, 18 Dec 2013 23:26:41 +0000 (00:26 +0100)]
Updating to latest master of 3rdparty - once more :-(
Thomas Müller [Wed, 18 Dec 2013 23:15:26 +0000 (15:15 -0800)]
Merge pull request #6476 from ogasser/dbal_precision_scale
DB: Support DECIMAL(precision,scale) syntax in XML
Oliver Gasser [Wed, 18 Dec 2013 22:40:11 +0000 (23:40 +0100)]
Add unit tests for decimal type usage
Vincent Petry [Wed, 18 Dec 2013 21:39:02 +0000 (22:39 +0100)]
Added missing mime types
This is mostly to fix acceptance tests that have a .cc file.
Also fixed typo in python mime type.
Bjoern Schiessle [Wed, 18 Dec 2013 16:07:35 +0000 (17:07 +0100)]
add test for the stream wrapper to read encrypted files from the system folder /tmp
Bjoern Schiessle [Wed, 18 Dec 2013 15:39:34 +0000 (16:39 +0100)]
test for isEncryptedPath()
Andreas Fischer [Wed, 18 Dec 2013 14:44:46 +0000 (15:44 +0100)]
Merge remote-tracking branch 'owncloud/master' into fixing-3417-master
* owncloud/master: (30 commits)
Added entry with ext storage info
[tx-robot] updated from transifex
[tx-robot] updated from transifex
clarifying license
remove unused method tail()
reliable detect encrypted files
[tx-robot] updated from transifex
remove duplicated code
add missing quotes + field declarations
Do not use xcache variable cache if cache size is 0.
always show home breadcrumb in files view
Use DEBUG instead of ERROR when favourites not found. Fix #6419
update file cache for target file
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
Fixed JS plural function to be per app
call set password hook because it doesn't get triggered during test execution and fix paths
Do not use L10n when logging exceptions
Also add default to the \OCP\IConfig interface
add default parameter for AllConfig->get*Value()
always show 'Deleted Files' breadcrumb
...
Conflicts:
lib/private/memcache/xcache.php
Bjoern Schiessle [Tue, 17 Dec 2013 17:13:46 +0000 (18:13 +0100)]
extend the encryption stream wrapper to handle local files and add a fall back for file size calculation if the storage doesn't support fseek
Bjoern Schiessle [Wed, 18 Dec 2013 14:40:43 +0000 (15:40 +0100)]
implement ftell stream wrapper and fix return value from fseek stream wrapper
Robin Appelman [Wed, 18 Dec 2013 14:28:32 +0000 (15:28 +0100)]
dont re-read the config values for an app when a non existing key is fetched
Thomas Müller [Wed, 18 Dec 2013 14:25:28 +0000 (15:25 +0100)]
only walk an array
Robin Appelman [Wed, 18 Dec 2013 14:13:27 +0000 (15:13 +0100)]
Add index on oc_appconfig for appid
Robin Appelman [Wed, 18 Dec 2013 14:10:12 +0000 (15:10 +0100)]
Fetch all appconfig values for an app at once and cache the results
Thomas Müller [Wed, 18 Dec 2013 14:03:50 +0000 (06:03 -0800)]
Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes
Fixed download file from URL error messages
Thomas Müller [Wed, 18 Dec 2013 13:36:40 +0000 (05:36 -0800)]
Merge pull request #6461 from owncloud/check-xcache-varsize
Do not use xcache variable cache if cache size is 0.
Thomas Müller [Wed, 18 Dec 2013 13:21:42 +0000 (05:21 -0800)]
Merge pull request #6469 from owncloud/enc_cleanup
remove duplicated code
Thomas Müller [Wed, 18 Dec 2013 13:20:06 +0000 (05:20 -0800)]
Merge pull request #6256 from owncloud/session-preserver-thirdparty
preserve 3rd party values in in the Session destructor
Frank Karlitschek [Wed, 18 Dec 2013 12:32:49 +0000 (04:32 -0800)]
Merge pull request #6485 from owncloud/extstorage-issuetemplate
Added entry with ext storage info
Vincent Petry [Wed, 18 Dec 2013 12:31:15 +0000 (13:31 +0100)]
Added entry with ext storage info
Thomas Müller [Wed, 18 Dec 2013 11:11:18 +0000 (03:11 -0800)]
Merge pull request #6431 from owncloud/core-pluraltranslationsfix
Added plural translation fallback
Jenkins for ownCloud [Wed, 18 Dec 2013 06:55:49 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Oliver Gasser [Tue, 17 Dec 2013 23:37:09 +0000 (00:37 +0100)]
Increment number of columns by one
Jan-Christoph Borchardt [Tue, 17 Dec 2013 22:59:24 +0000 (14:59 -0800)]
Merge pull request #6366 from owncloud/fix-6335
Bump the footer down 20px to avoid overlap.
Oliver Gasser [Tue, 17 Dec 2013 22:46:36 +0000 (23:46 +0100)]
Typo fixed
Oliver Gasser [Tue, 17 Dec 2013 22:08:05 +0000 (23:08 +0100)]
Add decimal(precision,scale) column to unit tests
Oliver Gasser [Tue, 17 Dec 2013 21:46:45 +0000 (22:46 +0100)]
DB: Support DECIMAL(precision,scale) syntax in XML
Add support for specifying the precision and scale of a decimal data
type to the XML description language.
See owncloud/core#6475
Jenkins for ownCloud [Tue, 17 Dec 2013 21:43:17 +0000 (16:43 -0500)]
[tx-robot] updated from transifex
Björn Schießle [Tue, 17 Dec 2013 17:12:02 +0000 (09:12 -0800)]
Merge pull request #6474 from owncloud/enc_detect_encrypted_files
reliable detect encrypted files
Frank Karlitschek [Tue, 17 Dec 2013 16:32:01 +0000 (17:32 +0100)]
clarifying license
Bjoern Schiessle [Tue, 17 Dec 2013 15:19:00 +0000 (16:19 +0100)]
remove unused method tail()
Bjoern Schiessle [Tue, 17 Dec 2013 15:18:05 +0000 (16:18 +0100)]
fall back to getLocalFile if storage doesn't support fseek
Bjoern Schiessle [Tue, 17 Dec 2013 14:53:25 +0000 (15:53 +0100)]
reliable detect encrypted files
Frank Karlitschek [Tue, 17 Dec 2013 13:09:58 +0000 (05:09 -0800)]
Merge pull request #6436 from owncloud/allconfig-defaults
Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
Jenkins for ownCloud [Tue, 17 Dec 2013 11:46:52 +0000 (06:46 -0500)]
[tx-robot] updated from transifex
Bjoern Schiessle [Tue, 17 Dec 2013 10:28:05 +0000 (11:28 +0100)]
remove duplicated code
Thomas Müller [Tue, 17 Dec 2013 09:54:30 +0000 (01:54 -0800)]
Merge pull request #6345 from owncloud/mysql-set-names-utf8-tests
DB tests: Test whether we can insert and read UTF8 data.
Thomas Müller [Tue, 17 Dec 2013 09:05:20 +0000 (10:05 +0100)]
add missing quotes + field declarations
Thomas Müller [Tue, 17 Dec 2013 08:53:03 +0000 (00:53 -0800)]
Merge pull request #6438 from owncloud/core-logexceptionfix
Do not use L10n when logging exceptions
Frank Karlitschek [Tue, 17 Dec 2013 08:25:06 +0000 (00:25 -0800)]
Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb
always show 'Deleted Files' breadcrumb
Andreas Fischer [Tue, 17 Dec 2013 01:20:00 +0000 (02:20 +0100)]
Do not use xcache variable cache if cache size is 0.
This is possible because it is possible to only use xcache as an opcode cache
but not a variable cache.
Björn Schießle [Mon, 16 Dec 2013 16:46:52 +0000 (08:46 -0800)]
Merge pull request #6183 from owncloud/enc_tests
enable more encryption tests
Bjoern Schiessle [Fri, 13 Dec 2013 13:34:26 +0000 (14:34 +0100)]
always show home breadcrumb in files view
Thomas Tanghus [Mon, 16 Dec 2013 16:30:08 +0000 (08:30 -0800)]
Merge pull request #6448 from owncloud/silence_favourites
Use DEBUG instead of ERROR when favourites not found.
Thomas Tanghus [Mon, 16 Dec 2013 16:07:22 +0000 (17:07 +0100)]
Use DEBUG instead of ERROR when favourites not found. Fix #6419
Bjoern Schiessle [Mon, 16 Dec 2013 14:24:11 +0000 (15:24 +0100)]
update file cache for target file
Bjoern Schiessle [Mon, 16 Dec 2013 11:16:07 +0000 (12:16 +0100)]
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
Vincent Petry [Mon, 16 Dec 2013 14:59:44 +0000 (15:59 +0100)]
Fixed JS plural function to be per app
Some apps might not define the same "nplural" value.
To avoid conflicts, the plural function is now generated per app.
Fixes #6427
Bjoern Schiessle [Wed, 11 Dec 2013 14:38:19 +0000 (15:38 +0100)]
call set password hook because it doesn't get triggered during test execution and fix paths
Vincent Petry [Mon, 16 Dec 2013 14:04:02 +0000 (15:04 +0100)]
Do not use L10n when logging exceptions
In some specific situations, the L10N bundle isn't loadable yet (for
example when there is an issue with the app_config table). In such case,
we still want to be able to log the real exception.
This fixes errors that say "OC_L10N_String::__toString must not throw
exceptions"
icewind1991 [Mon, 16 Dec 2013 14:01:00 +0000 (06:01 -0800)]
Merge pull request #6315 from owncloud/ingroup-cache
cache the result from inGroup
Robin Appelman [Mon, 16 Dec 2013 13:33:03 +0000 (14:33 +0100)]
Also add default to the \OCP\IConfig interface
Robin Appelman [Mon, 16 Dec 2013 13:28:56 +0000 (14:28 +0100)]
add default parameter for AllConfig->get*Value()
Andreas Fischer [Sat, 14 Dec 2013 17:32:48 +0000 (18:32 +0100)]
Merge remote-tracking branch 'owncloud/master' into fixing-3417-master
* owncloud/master: (1989 commits)
[tx-robot] updated from transifex
dont try to register background jobs if we haven't upgraded yet
adjust test
coding style
coding style
On webdav sesssions, loginname was compared to username which does not need to match necessarily
rely only on php DateTime to parse the db datetime string
LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
Fix webroot for update page
Update 3rdparty ref
update 3rdparty
toggle select all checkbox
remove unneeded ; in comment
LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
Add test for having utf8 filenames in the cache
fix fallback overwriting result of getHome
[tx-robot] updated from transifex
fix smbclient directory listing parser
cache the home folder of a User
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
...
Conflicts:
lib/util.php
Jenkins for ownCloud [Fri, 13 Dec 2013 19:44:31 +0000 (14:44 -0500)]
[tx-robot] updated from transifex
Vincent Petry [Fri, 13 Dec 2013 17:13:06 +0000 (09:13 -0800)]
Merge pull request #6321 from sevoku/master
fix smbclient directory listing parser
Vincent Petry [Fri, 13 Dec 2013 17:06:53 +0000 (09:06 -0800)]
Merge pull request #6392 from owncloud/no-backgroundjobs-during-upgrade
dont try to register background jobs if we haven't upgraded yet
Robin Appelman [Fri, 13 Dec 2013 12:30:29 +0000 (13:30 +0100)]
dont try to register background jobs if we haven't upgraded yet
Arthur Schiwon [Fri, 13 Dec 2013 11:56:06 +0000 (12:56 +0100)]
adjust test
Arthur Schiwon [Wed, 11 Dec 2013 13:01:48 +0000 (14:01 +0100)]
coding style
Arthur Schiwon [Wed, 11 Dec 2013 12:57:02 +0000 (13:57 +0100)]
coding style
Arthur Schiwon [Wed, 11 Dec 2013 12:56:45 +0000 (13:56 +0100)]
On webdav sesssions, loginname was compared to username which does not need to match necessarily
Jörn Friedrich Dreyer [Thu, 12 Dec 2013 18:09:21 +0000 (19:09 +0100)]
rely only on php DateTime to parse the db datetime string
Arthur Schiwon [Thu, 12 Dec 2013 22:09:31 +0000 (23:09 +0100)]
LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
Vincent Petry [Fri, 13 Dec 2013 13:35:29 +0000 (05:35 -0800)]
Merge pull request #6390 from owncloud/migration-fixwebroot
Fix webroot for update page
Vincent Petry [Fri, 13 Dec 2013 11:54:08 +0000 (12:54 +0100)]
Fix webroot for update page
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.
This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
Bjoern Schiessle [Fri, 13 Dec 2013 11:17:10 +0000 (12:17 +0100)]
always show 'Deleted Files' breadcrumb
Thomas Müller [Fri, 13 Dec 2013 09:30:43 +0000 (01:30 -0800)]
Merge pull request #6318 from owncloud/gethome-cache
cache the home folder of a User
Thomas Müller [Fri, 13 Dec 2013 09:27:13 +0000 (01:27 -0800)]
Merge pull request #6347 from owncloud/cache-test-utf8
Add test for having utf8 filenames in the cache
Thomas Müller [Thu, 12 Dec 2013 23:05:00 +0000 (00:05 +0100)]
Update 3rdparty ref
ringmaster [Thu, 12 Dec 2013 18:06:57 +0000 (13:06 -0500)]
Bump the footer down 20px to avoid overlap.
Fixes #6335.
Vincent Petry [Thu, 12 Dec 2013 17:03:11 +0000 (09:03 -0800)]
Merge pull request #6356 from owncloud/fix_6353
[trashbin] toggle select all checkbox
Jörn Friedrich Dreyer [Thu, 12 Dec 2013 16:56:16 +0000 (17:56 +0100)]
update 3rdparty
Owen Winkler [Thu, 12 Dec 2013 16:46:43 +0000 (08:46 -0800)]
Merge pull request #6302 from owncloud/mysql-set-names-utf8
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
Bjoern Schiessle [Thu, 12 Dec 2013 15:45:45 +0000 (16:45 +0100)]
toggle select all checkbox
Andreas Fischer [Thu, 12 Dec 2013 14:24:35 +0000 (15:24 +0100)]
Use old school query style that actually works.
Robin Appelman [Thu, 12 Dec 2013 14:14:44 +0000 (15:14 +0100)]
remove unneeded ; in comment
Arthur Schiwon [Thu, 12 Dec 2013 13:04:10 +0000 (14:04 +0100)]
LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
Robin Appelman [Thu, 12 Dec 2013 12:59:00 +0000 (13:59 +0100)]
remove unneeded ; in comment
Robin Appelman [Thu, 12 Dec 2013 12:43:55 +0000 (13:43 +0100)]
Add test for having utf8 filenames in the cache
Andreas Fischer [Thu, 12 Dec 2013 12:14:43 +0000 (13:14 +0100)]
DB tests: Test whether we can insert and read UTF8 data.
Robin Appelman [Thu, 12 Dec 2013 11:57:25 +0000 (12:57 +0100)]
fix fallback overwriting result of getHome
Vincent Petry [Tue, 10 Dec 2013 14:32:48 +0000 (15:32 +0100)]
Fixed download file from URL error messages
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
OC_L10N_String values
Jenkins for ownCloud [Wed, 11 Dec 2013 18:32:13 +0000 (13:32 -0500)]
[tx-robot] updated from transifex
Vsevolod Kukol [Wed, 11 Dec 2013 16:21:34 +0000 (17:21 +0100)]
fix smbclient directory listing parser
Robin Appelman [Wed, 11 Dec 2013 15:25:41 +0000 (16:25 +0100)]
user Group->users as assosiative array
Robin Appelman [Wed, 11 Dec 2013 15:22:26 +0000 (16:22 +0100)]
cache the home folder of a User
Robin Appelman [Wed, 11 Dec 2013 14:47:36 +0000 (15:47 +0100)]
cache the result from inGroup
Robin Appelman [Wed, 11 Dec 2013 11:59:48 +0000 (12:59 +0100)]
check if a $_SESSION entry exists before we try to remove it
Vincent Petry [Wed, 11 Dec 2013 10:59:22 +0000 (02:59 -0800)]
Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfix
Fixed sharing results to include the correct permissions
Andreas Fischer [Tue, 10 Dec 2013 23:13:40 +0000 (00:13 +0100)]
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
Thomas Müller [Tue, 10 Dec 2013 20:14:36 +0000 (12:14 -0800)]
Merge pull request #6244 from owncloud/memcached-connectivity-tests
Only run memcached tests if server is available.