930a46e8e2
Merge pull request #6469 from owncloud/enc_cleanup
...
remove duplicated code
2013-12-18 05:21:42 -08:00
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
3b4d49546b
Merge pull request #6485 from owncloud/extstorage-issuetemplate
...
Added entry with ext storage info
2013-12-18 04:32:49 -08:00
001b49601f
Added entry with ext storage info
2013-12-18 13:31:15 +01:00
e7a5c90cab
Replace static usage of OC_Config and OC_Preferences with the injected \OC\ConfigAll
2013-12-18 13:03:19 +01:00
a6c1b3ece3
fix the config option to remove the ability for users to set their displayname
2013-12-18 13:03:19 +01:00
f57c38df77
Merge pull request #6431 from owncloud/core-pluraltranslationsfix
...
Added plural translation fallback
2013-12-18 03:11:18 -08:00
5f4b32c33a
[tx-robot] updated from transifex
2013-12-18 01:55:49 -05:00
f0962c99dc
Increment number of columns by one
2013-12-18 00:37:09 +01:00
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
cb9e87eced
Typo fixed
2013-12-17 23:46:36 +01:00
5fcbe5350c
Add decimal(precision,scale) column to unit tests
2013-12-17 23:08:05 +01:00
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
6488ff2c75
[tx-robot] updated from transifex
2013-12-17 16:43:17 -05:00
22a6bf9e5a
Merge pull request #6474 from owncloud/enc_detect_encrypted_files
...
reliable detect encrypted files
2013-12-17 09:12:02 -08:00
0b9f4130b0
clarifying license
2013-12-17 17:32:01 +01:00
9a94c07553
remove unused method tail()
2013-12-17 16:19:00 +01:00
c955381d56
fall back to getLocalFile if storage doesn't support fseek
2013-12-17 16:18:05 +01:00
69b89454a4
reliable detect encrypted files
2013-12-17 15:53:25 +01:00
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
a99dd3183c
[tx-robot] updated from transifex
2013-12-17 06:46:52 -05:00
83417d69be
remove duplicated code
2013-12-17 11:28:05 +01:00
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
c06844c374
Fix ```createCertificateBundle``` and ```getCertificates``` methods
...
from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the
path
2013-12-17 10:13:14 +01:00
ab4136f432
add missing quotes + field declarations
2013-12-17 10:05:20 +01:00
275d666d26
Merge pull request #6438 from owncloud/core-logexceptionfix
...
Do not use L10n when logging exceptions
2013-12-17 00:53:03 -08:00
b245e2e3d8
Fixing tab/space coding style
...
Only set SSL things when ```$this->secure``` is ```true```
2013-12-17 09:38:43 +01:00
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
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
4ae148cebd
Merge pull request #6183 from owncloud/enc_tests
...
enable more encryption tests
2013-12-16 08:46:52 -08:00
3e17fbe30d
always show home breadcrumb in files view
2013-12-16 17:40:35 +01:00
28a28611fb
Merge pull request #6448 from owncloud/silence_favourites
...
Use DEBUG instead of ERROR when favourites not found.
2013-12-16 08:30:08 -08:00
a3fbad43c1
Use DEBUG instead of ERROR when favourites not found. Fix #6419
2013-12-16 17:07:22 +01:00
95892c8be9
update file cache for target file
2013-12-16 16:05:24 +01:00
cdd816c930
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
2013-12-16 16:05:24 +01:00
d8d11e3976
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
2013-12-16 16:00:23 +01:00
6d489e0474
call set password hook because it doesn't get triggered during test execution and fix paths
2013-12-16 16:00:16 +01:00
059c3c8708
fix issue with logging non utf8 chars
2013-12-16 15:38:55 +01:00
2a1d6d3106
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"
2013-12-16 15:11:13 +01:00
fed63dff06
Merge pull request #6315 from owncloud/ingroup-cache
...
cache the result from inGroup
2013-12-16 06:01:00 -08:00
e2efad6ae7
Also add default to the \OCP\IConfig interface
2013-12-16 14:33:03 +01:00
59f02066b6
add default parameter for AllConfig->get*Value()
2013-12-16 14:30:01 +01:00
7c264c88fe
Fixing Issue #6301 on master branch
...
Added private var $certPath to store the user root cert
Move logic to determine the $certPath path to the constructor and modify to get the path from OC_User::getHome()
Add curl options to use the certificate to avoid certificate errors with self-signed certicates in the downdload/upload method so we don't get blank files
2013-12-15 17:22:52 +01:00
c205d8d1c9
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
2013-12-14 18:32:48 +01:00
77b68505c2
[tx-robot] updated from transifex
2013-12-13 14:44:31 -05:00
769256cb39
Merge pull request #6321 from sevoku/master
...
fix smbclient directory listing parser
2013-12-13 09:13:06 -08:00
a84fe4790f
Merge pull request #6392 from owncloud/no-backgroundjobs-during-upgrade
...
dont try to register background jobs if we haven't upgraded yet
2013-12-13 09:06:53 -08:00
4c45c6f418
dont try to register background jobs if we haven't upgraded yet
2013-12-13 17:15:18 +01:00
c0edb639ed
adjust test
2013-12-13 16:58:23 +01:00
f26ba5846d
coding style
2013-12-13 16:58:16 +01:00
Thomas Müller
Frank Karlitschek
Vincent Petry
Robin Appelman
Oliver Gasser
Jan-Christoph Borchardt
Björn Schießle
Carlos Cerrillo
Andreas Fischer
Thomas Tanghus
Georg Ehrke
icewind1991
Arthur Schiwon