wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15559 commits 157 branches 562 tags 714 MiB
Commit graph

15559 commits

This branch
This branch
All branches
Author SHA1 Message Date
Björn Schießle
079f1a6f41 Merge pull request #6495 from owncloud/enc_fseek_fallback 
Added fseek fallback to the encryption app
 2013-12-19 07:09:07 -08:00
Thomas Müller
ae3df84e20 Merge pull request #6491 from owncloud/fix-warning-array_walk_recursive-json 
only walk an array
 2013-12-19 03:25:58 -08:00
icewind1991
3ea01e2152 Merge pull request #6492 from owncloud/appconfig-cache 
Fetch all appconfig values for an app at once and cache the results
 2013-12-19 03:25:20 -08:00
Thomas Müller
9b18a4fd87 Merge pull request #4378 from owncloud/fixing-3417-master 
Don't use xcache in case admin auth is enabled
 2013-12-19 03:24:37 -08:00
Vincent Petry
684e331b5b Merge pull request #6503 from owncloud/finally-kill-mdb2-master 
Finally kill mdb2 master
 2013-12-19 02:56:46 -08:00
Frank Karlitschek
748d90592a Merge pull request #6502 from owncloud/core-extramimetypes 
Added missing mime types
 2013-12-18 23:41:36 -08:00
Jenkins for ownCloud
37cdbc3be0 [tx-robot] updated from transifex 2013-12-19 01:57:03 -05:00
Thomas Müller
aa17a896ac fix return statement 2013-12-19 00:33:29 +01:00
Thomas Müller
5eae75eeca kill MDB2 in PHPDoc 2013-12-19 00:32:46 +01:00
Thomas Müller
6c2a425686 Updating to latest master of 3rdparty - once more :-( 2013-12-19 00:26:41 +01:00
Thomas Müller
62fdc2b0dc Merge pull request #6476 from ogasser/dbal_precision_scale 
DB: Support DECIMAL(precision,scale) syntax in XML
 2013-12-18 15:15:26 -08:00
Oliver Gasser
cacb66480b Add unit tests for decimal type usage 2013-12-18 23:40:11 +01:00
Vincent Petry
b109d411d8 Added missing mime types 
This is mostly to fix acceptance tests that have a .cc file.

Also fixed typo in python mime type.
 2013-12-18 22:40:58 +01:00
Bjoern Schiessle
df0c1fe7f3 add test for the stream wrapper to read encrypted files from the system folder /tmp 2013-12-18 17:07:35 +01:00
Bjoern Schiessle
f9ec3a7124 test for isEncryptedPath() 2013-12-18 16:39:34 +01:00
Andreas Fischer
38f4ecaeac 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
 2013-12-18 15:44:46 +01:00
Bjoern Schiessle
4f8ae789ae 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 2013-12-18 15:43:50 +01:00
Bjoern Schiessle
d9668977cd implement ftell stream wrapper and fix return value from fseek stream wrapper 2013-12-18 15:41:40 +01:00
Robin Appelman
2e195dbdae dont re-read the config values for an app when a non existing key is fetched 2013-12-18 15:28:32 +01:00
Thomas Müller
6c707323f2 only walk an array 2013-12-18 15:25:28 +01:00
Robin Appelman
47245e7417 Add index on oc_appconfig for appid 2013-12-18 15:13:27 +01:00
Robin Appelman
5a646477a5 Fetch all appconfig values for an app at once and cache the results 2013-12-18 15:10:12 +01:00
Thomas Müller
277ae28171 Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes 
Fixed download file from URL error messages
 2013-12-18 06:03:50 -08:00
Thomas Müller
a90342b781 Merge pull request #6461 from owncloud/check-xcache-varsize 
Do not use xcache variable cache if cache size is 0.
 2013-12-18 05:36:40 -08:00
Thomas Müller
930a46e8e2 Merge pull request #6469 from owncloud/enc_cleanup 
remove duplicated code
 2013-12-18 05:21:42 -08:00
Thomas Müller
9c5a620c4f Merge pull request #6256 from owncloud/session-preserver-thirdparty 
preserve 3rd party values in  in the Session destructor
 2013-12-18 05:20:06 -08:00
Frank Karlitschek
3b4d49546b Merge pull request #6485 from owncloud/extstorage-issuetemplate 
Added entry with ext storage info
 2013-12-18 04:32:49 -08:00
Vincent Petry
001b49601f Added entry with ext storage info 2013-12-18 13:31:15 +01:00
Thomas Müller
f57c38df77 Merge pull request #6431 from owncloud/core-pluraltranslationsfix 
Added plural translation fallback
 2013-12-18 03:11:18 -08:00
Jenkins for ownCloud
5f4b32c33a [tx-robot] updated from transifex 2013-12-18 01:55:49 -05:00
Oliver Gasser
f0962c99dc Increment number of columns by one 2013-12-18 00:37:09 +01:00
Jan-Christoph Borchardt
ee2ecbe543 Merge pull request #6366 from owncloud/fix-6335 
Bump the footer down 20px to avoid overlap.
 2013-12-17 14:59:24 -08:00
Oliver Gasser
cb9e87eced Typo fixed 2013-12-17 23:46:36 +01:00
Oliver Gasser
5fcbe5350c Add decimal(precision,scale) column to unit tests 2013-12-17 23:08:05 +01:00
Oliver Gasser
3b0d0e2b1f 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
 2013-12-17 22:46:45 +01:00
Jenkins for ownCloud
6488ff2c75 [tx-robot] updated from transifex 2013-12-17 16:43:17 -05:00
Björn Schießle
22a6bf9e5a Merge pull request #6474 from owncloud/enc_detect_encrypted_files 
reliable detect encrypted files
 2013-12-17 09:12:02 -08:00
Frank Karlitschek
0b9f4130b0 clarifying license 2013-12-17 17:32:01 +01:00
Bjoern Schiessle
9a94c07553 remove unused method tail() 2013-12-17 16:19:00 +01:00
Bjoern Schiessle
c955381d56 fall back to getLocalFile if storage doesn't support fseek 2013-12-17 16:18:05 +01:00
Bjoern Schiessle
69b89454a4 reliable detect encrypted files 2013-12-17 15:53:25 +01:00
Frank Karlitschek
1d0af242b9 Merge pull request #6436 from owncloud/allconfig-defaults 
Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
 2013-12-17 05:09:58 -08:00
Jenkins for ownCloud
a99dd3183c [tx-robot] updated from transifex 2013-12-17 06:46:52 -05:00
Bjoern Schiessle
83417d69be remove duplicated code 2013-12-17 11:28:05 +01:00
Thomas Müller
5a1194520e Merge pull request #6345 from owncloud/mysql-set-names-utf8-tests 
DB tests: Test whether we can insert and read UTF8 data.
 2013-12-17 01:54:30 -08:00
Thomas Müller
ab4136f432 add missing quotes + field declarations 2013-12-17 10:05:20 +01:00
Thomas Müller
275d666d26 Merge pull request #6438 from owncloud/core-logexceptionfix 
Do not use L10n when logging exceptions
 2013-12-17 00:53:03 -08:00
Frank Karlitschek
753525c57f Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb 
always show 'Deleted Files' breadcrumb
 2013-12-17 00:25:06 -08:00
Andreas Fischer
dfeb04a574 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.
 2013-12-17 02:40:16 +01:00
Björn Schießle
4ae148cebd Merge pull request #6183 from owncloud/enc_tests 
enable more encryption tests
 2013-12-16 08:46:52 -08:00