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

16123 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
e156f85bfb Rephrase and clarify log message 2014-02-10 11:29:08 +01:00
Arthur Schiwon
a76840d206 Wizard: enable base DN for editing, if not base DN could have been detected. Also part of fix for #6670 2014-02-10 11:29:02 +01:00
Arthur Schiwon
e825a008c9 Wizard: disable LDAP referrals, fixes #6670 2014-02-10 11:28:55 +01:00
Arthur Schiwon
a908bd5695 throw an info message, when base dn test failed 2014-02-10 11:28:46 +01:00
Arthur Schiwon
bc17b40650 LDAP: extend LDAP wrapper search method for sizelimit, improves performance in wizard 2014-02-10 11:28:38 +01:00
Thomas Müller
45d07906b8 Merge pull request #7131 from owncloud/issue/6269 
Change MySQL to MariaDB/MySQL in the frontend
 2014-02-10 11:09:03 +01:00
Bjoern Schiessle
050e84a08f refuse login as long as the initial encryption is running 2014-02-10 10:56:11 +01:00
Thomas Müller
8c7fb64b8b Merge pull request #7066 from owncloud/check_svg_installed 
properly check if pdf and svg modules are installed
 2014-02-10 10:28:32 +01:00
Thomas Müller
8de9758fee Merge pull request #7071 from jcfischer/master 
close statement in MimeType detection is executed [#7069]
 2014-02-10 10:27:21 +01:00
Thomas Müller
e7db48cd7f Merge pull request #7133 from owncloud/fix-implied-eval 
Fix implied evals and doubled definition of variable
 2014-02-10 10:08:40 +01:00
Andreas Fischer
bbfd97ce03 Merge pull request #6247 from owncloud/memcached-multiple-servers 
Add support for multiple memcached servers.

* owncloud/memcached-multiple-servers:
  Readd support for memcached_server config variable.
  Add support for multiple memcached servers.
 2014-02-08 14:21:19 +01:00
Joas Schilling
828985dc60 Make google drive client secret and dropbox api secret a password field 
Fix issue #5794
 2014-02-07 18:12:01 +01:00
Bjoern Schiessle
91254c304d name users after test 2014-02-07 18:07:38 +01:00
Morris Jobke
13fa0e2a9d Fix implied evals and doubled definition of variable 
fixes #7119
fixes #7120
fixes #7121
fixes #7122
 2014-02-07 17:47:42 +01:00
Joas Schilling
dbec143f09 Change MySQL to MySQL/MariaDB in the frontend 
Fix issue #6269
 2014-02-07 17:03:43 +01:00
Bjoern Schiessle
dc53c83e7b getData() always needs to return an array 2014-02-07 16:38:15 +01:00
Vincent Petry
60cba9962d Merge pull request #7112 from owncloud/enc_fix_size_for_shared_files 
replace 'size' with 'unencrypted_size' if encryption is enabled
 2014-02-07 14:49:22 +01:00
Robin Appelman
4cdf83e6d2 Remove the Test_AppConfig_Object tests as they no longer make sense with caching 2014-02-07 14:03:57 +01:00
Robin Appelman
cd3ef0bb9d Add caching to appconfig 2014-02-07 14:03:39 +01:00
Thomas Müller
f0afbffaef Merge pull request #6997 from owncloud/fix_l10n_warnings 
change order of issubdirectory() calls to avoid error messages for non-apps
 2014-02-07 13:47:33 +01:00
Robin Appelman
b537d90e58 use the 'new' server container for appconfig 2014-02-07 13:45:59 +01:00
Joas Schilling
af7366cd30 Only add files to file list when uploading to current directory 
Fix Issue #6683
 2014-02-07 13:06:50 +01:00
Bjoern Schiessle
a8943ad022 replace 'size' with 'unencrypted_size' if encryption is enabled 2014-02-07 12:53:13 +01:00
Thomas Müller
b9e724d4ae Update README.md 2014-02-07 00:40:57 +01:00
Thomas Müller
88087b21c7 Update README.md 2014-02-07 00:40:08 +01:00
Vincent Petry
788c8540aa Added isLocal() method to storage, used for xsendfile 
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
 2014-02-06 20:53:15 +01:00
Vincent Petry
be47e156a5 Merge pull request #6952 from MartialGeek/add_freebox_support 
New user agent added for the Freebox.
 2014-02-06 18:12:32 +01:00
Vincent Petry
5ab12a8b85 Merge pull request #6445 from owncloud/fix_5956 
fix issue with logging non utf8 chars
 2014-02-06 17:47:13 +01:00
Thomas Müller
0d94da7e9e Merge pull request #7099 from owncloud/fix-autoconfig-master 
fixing autoconfig handling
 2014-02-06 14:35:31 +01:00
Vincent Petry
aff1cafaca Merge pull request #7089 from owncloud/sharing-searchbymime 
Fixed searchByMime in shared cache
 2014-02-06 14:15:00 +01:00
Morris Jobke
8f7b99d2e5 Merge pull request #7105 from NCTU-NBA/pr-7098 
Fix #7098
 2014-02-06 11:02:06 +01:00
Pellaeon Lin
946fccc0dd Remove unused template variable assignment of files_sharing/template/public.php 2014-02-06 12:26:36 +08:00
Pellaeon Lin
8c56e21ced Move template variable assignment to correct place 2014-02-06 12:06:16 +08:00
Thomas Müller
e2625ae7aa fixing autoconfig handling 2014-02-05 18:23:40 +01:00
Thomas Müller
e2a28e5d1d Merge pull request #7091 from owncloud/jenkins-catchsetuperrors 
Catch setup errors during autotest
 2014-02-05 17:51:33 +01:00
Jan-Christoph Borchardt
61aa6ead83 Merge pull request #6490 from owncloud/theming-for-appstemplate 
do not show 'Add app' and 'More apps' for themed ownCloud
 2014-02-05 16:49:07 +01:00
Jan-Christoph Borchardt
b0692af29a Merge pull request #7064 from owncloud/files-scrolltopafterupdate 
Scroll to the top after switching dir
 2014-02-05 16:13:55 +01:00
Vincent Petry
20935f4e24 Catch setup errors during autotest 2014-02-05 15:34:08 +01:00
Björn Schießle
697b25f165 Merge pull request #7032 from owncloud/enc_fix_delete 
Encryption replace delete proxy with pre/post hooks and add tests
 2014-02-05 14:26:52 +01:00
Robin Appelman
1e79369338 merge master into storagestatistics-reuse 2014-02-05 13:36:55 +01:00
Vincent Petry
fa5ddc3e18 Fixed searchByMime in shared cache 
- searchByMime now correctly returns files recursively search through
  all the dirs
- added unit test for searchByMime
 2014-02-05 13:29:06 +01:00
Thomas Müller
9d9f360b77 Load authentication apps to get users from all backends - fixes #7019 2014-02-05 12:54:31 +01:00
Vincent Petry
3d88b10f20 Merge pull request #7067 from owncloud/core-sessionheartbeatconfig 
Core sessionheartbeatconfig
 2014-02-05 10:03:36 +01:00
Thomas Müller
ced80c6f27 Merge pull request #6969 from owncloud/tests-morecoverage 
Fixed unit test scripts + coverage
 2014-02-04 12:21:13 -08:00
Thomas Müller
6d3b61f388 Merge pull request #7011 from owncloud/jshint 
Added .jshintrc
 2014-02-04 12:11:32 -08:00
Thomas Müller
45ab9810c5 fixing typos 2014-02-04 20:58:06 +01:00
Vincent Petry
fe2a63ffd4 Scroll to the top after switching dir 
Fixes #7061
 2014-02-04 18:59:43 +01:00
Jan-Christoph Borchardt
0609f30d1c Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg 
Change misleading message when file size exceeds upload limit
 2014-02-04 08:04:19 -08:00
Jens-Christian Fischer
11f46e121c close statement in MimeType detection is executed [#7069] 
close statement was never executed due to it being after a return
statement.
 2014-02-04 17:03:52 +01:00
Vincent Petry
bd6734291c Merge pull request #6081 from owncloud/partfilewebdavfix 
Allow getting info or renaming part files through WebDAV
 2014-02-04 07:48:37 -08:00