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

16322 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
71e4d965a1 on filtering the share box users and groups whose name begins with the search term shall appear on top, fixes #6430 2014-02-11 10:49:22 +01:00
Bart Visscher
082abdc620 Merge branch 'master' into migration_unit_tests 2014-02-10 21:32:17 +01:00
Vincent Petry
bea80ffe20 Merge pull request #6881 from owncloud/remove-user-storage-entry 
Also remove the user's home storage from the storage table when deleting a user
 2014-02-10 15:04:05 +01:00
Arthur Schiwon
14d1abf63f LDAP: improve debug message 2014-02-10 14:45:37 +01:00
Arthur Schiwon
18e1a10e96 LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image 2014-02-10 14:45:31 +01:00
Tom Needham
84607db284 Merge pull request #6988 from owncloud/oc_api_fix_warinigs 
[ocs API] getData() always needs to return an array
 2014-02-10 13:43:16 +00:00
Morris Jobke
eba1d574cf Merge pull request #7134 from owncloud/issue/5794 
Make google drive client secret and dropbox api secret a password field
 2014-02-10 14:34:24 +01:00
Robin Appelman
e6df86f4cb Merge branch 'master' into quota-space-root 2014-02-10 14:03:06 +01:00
Robin Appelman
753af3a3ff Merge branch 'master' into storagestatistics-reuse 2014-02-10 14:01:32 +01:00
Robin Appelman
5ffc43cba0 Merge branch 'master' into remove-user-storage-entry 2014-02-10 13:53:01 +01:00
Morris Jobke
02bdb47049 Merge pull request #7140 from owncloud/enc_dont_login_during_encryption 
refuse login as long as the initial encryption is running
 2014-02-10 13:25:39 +01:00
Arthur Schiwon
299d37154b LDAP: add documentation info in info.xml 2014-02-10 12:59:11 +01:00
Vincent Petry
6b5a7035ee Merge pull request #7126 from nickvergessen/issue/6683 
Only add files to file list when uploading to current directory
 2014-02-10 12:14:05 +01:00
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
b330d07b51 Fix more documentation failes 
Issue #7111
 2014-02-08 11:47:55 +01:00
Robin Appelman
8ad3fc89be Merge branch 'master' into quota-space-root 2014-02-07 23:29:26 +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
Thomas Tanghus
2ff0d3a255 Test if $url is already prefixed by '/' 2014-02-07 17:39:19 +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
Joas Schilling
145d9a09ab Do not select input for all text input fields 
Fix issue #6920
 2014-02-07 16:31:29 +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
Jörn Friedrich Dreyer
81031984a6 remove duplicate param lines for OCP\User::getUsers() 2014-02-07 12:12:16 +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
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +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