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

8859 commits

Author SHA1 Message Date
jknockaert
3e6eb28ee3 Applying diff as of https://github.com/owncloud/core/pull/15303 2015-04-07 13:30:28 +02:00
Bjoern Schiessle
a85e2e0bfd make recovery settings work 2015-04-07 13:30:28 +02:00
Bjoern Schiessle
937efe856d fix lib/private/encryption/util.php call 2015-04-07 13:30:28 +02:00
Bjoern Schiessle
c266b3b5b7 remove debug code from core 2015-04-07 13:30:28 +02:00
Bjoern Schiessle
c64e0af4fb check if recovery key exists and encrypt the file with the recovery key if needed 2015-04-07 13:30:28 +02:00
Bjoern Schiessle
2244ea998d core: documentation fixes 2015-04-07 13:30:27 +02:00
Bjoern Schiessle
cb9980823d core: small fixes 2015-04-07 13:30:27 +02:00
Bjoern Schiessle
810ca9105c implement rename and delete of encryption keys 2015-04-07 13:30:27 +02:00
Clark Tomlinson
0c2f9ca849 Updating keystorage movement and fixing hooks 2015-04-07 13:30:27 +02:00
Bjoern Schiessle
506222567e add deleteKey methods to key storage 2015-04-07 13:30:27 +02:00
Bjoern Schiessle
e2f714263f fix encryption manager to handle more than one encryption module 2015-04-07 13:30:27 +02:00
Bjoern Schiessle
5bc9ababeb fix keystorage and add unit tests 2015-04-07 13:30:27 +02:00
Clark Tomlinson
39733c8da1 Initial commit 2015-04-07 13:30:27 +02:00
Bjoern Schiessle
63e7fe608a create basic interfaces and wrapper to make encryption more modular 2015-04-07 13:30:27 +02:00
Joas Schilling
3bde7c2f67 When guessing the timezone, the offset might only be valid on a given timestamp 2015-04-07 10:13:06 +02:00
Jenkins for ownCloud
95e55aa4ad [tx-robot] updated from transifex 2015-04-07 01:54:47 -04:00
Jenkins for ownCloud
2bff92ade5 [tx-robot] updated from transifex 2015-04-05 01:54:51 -04:00
Thomas Müller
4996706078 Merge pull request #15338 from owncloud/encryption-mount-option 
Add mount point to disable the encryption wrapper
 2015-04-04 12:51:41 +02:00
Jenkins for ownCloud
9b250baf9e [tx-robot] updated from transifex 2015-04-04 01:54:43 -04:00
Thomas Müller
3bf269e565 Merge pull request #15229 from owncloud/response-setContentLengthHeader 
Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround...
 2015-04-03 22:51:36 +02:00
Thomas Müller
b2b3e1ac94 Merge pull request #15391 from owncloud/fix-language-caching 
fix caching of preferred language
 2015-04-03 22:51:13 +02:00
Thomas Müller
3d2116dfe7 Merge pull request #15386 from oparoz/yaml-cnf-mediatype 
Introducing media types for yml, yaml, cnf, conf
 2015-04-03 22:49:41 +02:00
Robin Appelman
712e478cb2 fix caching of preferred language 2015-04-03 15:36:24 +02:00
Morris Jobke
a2087f30d1 Merge pull request #15383 from owncloud/fix-exception-message 
Update exception messages to better reflect and describe the problem
 2015-04-03 10:15:23 +02:00
Jenkins for ownCloud
23f1702f24 [tx-robot] updated from transifex 2015-04-03 01:54:53 -04:00
Olivier Paroz
70ec74e88b Introducing media types for yml, yaml, cnf, conf 2015-04-02 21:37:57 +02:00
Lukas Reschke
fa079a5959 Merge pull request #12314 from oparoz/patch-3 
Make findBinaryPath compatible with open_basedir
 2015-04-02 18:54:03 +02:00
Joas Schilling
a8d1ede347 Fix the exception messages 2015-04-02 18:40:06 +02:00
Thomas Müller
9f58097e4d Merge pull request #14113 from owncloud/chunking-chunkpartfiles 
Added part files for when writing chunks
 2015-04-02 18:15:27 +02:00
Thomas Müller
4082436419 Merge pull request #15367 from owncloud/pre-setup-hook 
setup storage wrappers before setting up the filesystem
 2015-04-02 17:40:23 +02:00
Morris Jobke
1720fdf5f4 Merge pull request #15346 from oparoz/split-image-provider 
Split image provider in one sub-class per media type
 2015-04-02 13:40:09 +02:00
Robin Appelman
f585994c4b setup mount manager before wrappers 2015-04-02 13:28:36 +02:00
Olivier Paroz
8ec6dfdbf8 Split image provider in one sub-class per media type 2015-04-02 10:31:24 +02:00
Morris Jobke
82f91c50c7 Merge pull request #15349 from oparoz/limit-bitmap-previews-2 
The bitmap preview class now takes maxX and maxY into consideration
 2015-04-02 10:23:55 +02:00
Thomas Müller
9e5b319ed4 Merge pull request #15362 from owncloud/issue/15359-purge-memcache-console-app-disable 
Correctly purge the cache when an app is disabled via cli
 2015-04-02 09:26:15 +02:00
Joas Schilling
696c750cfe Fix docs and line breaks 2015-04-02 08:28:42 +02:00
Jenkins for ownCloud
cc96105ebe [tx-robot] updated from transifex 2015-04-02 01:54:47 -04:00
Robin Appelman
3cb53b7756 setup storage wrappers before setting up the filesystem 2015-04-01 17:12:06 +02:00
Olivier Paroz
1525ecd3dd The bitmap preview class now takes maxX and maxY into consideration 
This is a fix for owncloud#13607 and is part of the global programme: owncloud#13609

The image aspect ratio is kept intact.
 2015-04-01 15:54:22 +02:00
Joas Schilling
d01cfde982 Correctly purge the cache when an app is disabled via cli 2015-04-01 15:43:38 +02:00
Roeland Jago Douma
288da619b1 Deprecate functions that only call the urlgenerator anyway 2015-04-01 14:32:49 +02:00
Pierre Jochem
a1828ff034 More secure proposal 2015-04-01 11:28:53 +02:00
Jenkins for ownCloud
f5c7ba6b81 [tx-robot] updated from transifex 2015-04-01 01:55:33 -04:00
Olivier Paroz
0f01de9f7e Use getenv to get the paths for find 2015-03-31 23:49:21 +02:00
Olivier Paroz
7c41c0c13f use ExecutableFinder and find in findBinaryPath 
When using open_basedir, commands such as `which`or `command`can fail
because they might try to look outside of the restricted perimeter.
Symfony's ExecutableFinder can be used instead to look in standard
locations and we can use `find` as a last resort

A better solution would be to adopt a mechanism similar to what has
been done for office documents where a configuration parameter is used
to indicate the path where the executable is to be found.
 2015-03-31 23:49:16 +02:00
Robin Appelman
bac9b54bef Add mount point to disable the encryption wrapper 2015-03-31 16:25:33 +02:00
Jenkins for ownCloud
1d06d93d27 [tx-robot] updated from transifex 2015-03-31 01:55:55 -04:00
Morris Jobke
bf17ac929d Merge pull request #15169 from rullzer/fix_displayNamesInGroup 
Groupmanagers displayNamesInGroup should actually search in displaynames
 2015-03-30 17:04:09 +02:00
Robin McCorkell
4f0abd910c Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcache 
Add check for activated local memcache
 2015-03-30 11:24:44 +01:00
Jenkins for ownCloud
da55ff630c [tx-robot] updated from transifex 2015-03-30 01:54:41 -04:00