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

15999 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Carlos Cerrillo
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
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
Carlos Cerrillo
b245e2e3d8 Fixing tab/space coding style 
Only set SSL things when ```$this->secure``` is ```true```
 2013-12-17 09:38:43 +01: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
Bjoern Schiessle
3e17fbe30d always show home breadcrumb in files view 2013-12-16 17:40:35 +01:00
Thomas Tanghus
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
Thomas Tanghus
a3fbad43c1 Use DEBUG instead of ERROR when favourites not found. Fix #6419 2013-12-16 17:07:22 +01:00
Bjoern Schiessle
95892c8be9 update file cache for target file 2013-12-16 16:05:24 +01:00
Bjoern Schiessle
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
Vincent Petry
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
Bjoern Schiessle
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
Vincent Petry
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
icewind1991
fed63dff06 Merge pull request #6315 from owncloud/ingroup-cache 
cache the result from inGroup
 2013-12-16 06:01:00 -08:00
Robin Appelman
e2efad6ae7 Also add default to the \OCP\IConfig interface 2013-12-16 14:33:03 +01:00
Robin Appelman
59f02066b6 add default parameter for AllConfig->get*Value() 2013-12-16 14:30:01 +01:00
Carlos Cerrillo
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
Andreas Fischer
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
Jenkins for ownCloud
77b68505c2 [tx-robot] updated from transifex 2013-12-13 14:44:31 -05:00
Vincent Petry
769256cb39 Merge pull request #6321 from sevoku/master 
fix smbclient directory listing parser
 2013-12-13 09:13:06 -08:00
Vincent Petry
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
Robin Appelman
4c45c6f418 dont try to register background jobs if we haven't upgraded yet 2013-12-13 17:15:18 +01:00
Arthur Schiwon
c0edb639ed adjust test 2013-12-13 16:58:23 +01:00
Arthur Schiwon
f26ba5846d coding style 2013-12-13 16:58:16 +01:00
Arthur Schiwon
dcfda5c2a9 coding style 2013-12-13 16:58:09 +01:00
Arthur Schiwon
91d6a6dd7c On webdav sesssions, loginname was compared to username which does not need to match necessarily 2013-12-13 16:58:03 +01:00
Jörn Friedrich Dreyer
6408125edc rely only on php DateTime to parse the db datetime string 2013-12-13 16:38:05 +01:00
Arthur Schiwon
1292793c4b LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng 2013-12-13 16:29:42 +01:00
Vincent Petry
ad998c1fb5 Merge pull request #6390 from owncloud/migration-fixwebroot 
Fix webroot for update page
 2013-12-13 05:35:29 -08:00
Vincent Petry
df1a404466 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.
 2013-12-13 12:56:48 +01:00
Bjoern Schiessle
3831b8b1be always show 'Deleted Files' breadcrumb 2013-12-13 12:17:10 +01:00
Thomas Müller
7b30ffbf23 Merge pull request #6318 from owncloud/gethome-cache 
cache the home folder of a User
 2013-12-13 01:30:43 -08:00
Thomas Müller
600655b0f9 Merge pull request #6347 from owncloud/cache-test-utf8 
Add test for having utf8 filenames in the cache
 2013-12-13 01:27:13 -08:00
Thomas Müller
9842890ed7 Update 3rdparty ref 2013-12-13 00:05:00 +01:00
ringmaster
e2197c7108 Bump the footer down 20px to avoid overlap. 
Fixes #6335.
 2013-12-12 13:06:57 -05:00
Vincent Petry
27d9af36db Merge pull request #6356 from owncloud/fix_6353 
[trashbin] toggle select all checkbox
 2013-12-12 09:03:11 -08:00
Jörn Friedrich Dreyer
fc13b9802e update 3rdparty 2013-12-12 17:56:16 +01:00
Owen Winkler
b47e4378d2 Merge pull request #6302 from owncloud/mysql-set-names-utf8 
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
 2013-12-12 08:46:43 -08:00
Bjoern Schiessle
79719d9ae5 toggle select all checkbox 2013-12-12 17:33:04 +01:00
Andreas Fischer
95dd58bfc0 Use old school query style that actually works. 2013-12-12 15:24:35 +01:00
Robin Appelman
46b72cbff0 remove unneeded ; in comment 2013-12-12 15:14:44 +01:00
Arthur Schiwon
5ba9344b0e LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283 2013-12-12 14:15:39 +01:00
Robin Appelman
8a86837eac remove unneeded ; in comment 2013-12-12 13:59:00 +01:00
Robin Appelman
30e0b474f8 Add test for having utf8 filenames in the cache 2013-12-12 13:43:55 +01:00