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

817 commits

Author SHA1 Message Date
Arthur Schiwon
ffaf5fed0e load backbone universally 2015-08-06 12:27:18 +02:00
Thomas Müller
c3cac887f5 - more injection 
- less static calls
- use params on sql queries
- handle sql exception on database and user creation gracefully
 2015-07-30 00:04:30 +02:00
Morris Jobke
5265a44260 Remove commented code 2015-07-24 00:47:41 +02:00
Bernhard Posselt
582f07950f Merge pull request #17075 from owncloud/bootstrap-tooltip 
Replace jQuery tipsy with bootstrap tooltip
 2015-07-23 19:25:09 +02:00
Morris Jobke
2d691c2fb4 Merge pull request #17381 from owncloud/fix_sharing_add_to_group 
[sharing] fix addToGroup hook
 2015-07-21 13:30:41 +02:00
Bjoern Schiessle
058d910f5e intproduce pre_addToGroup hook. we need to calculate the possible unique 
targets before the user was added to the group otherwise we will always detect
a name collision
 2015-07-06 17:24:05 +02:00
Roeland Jago Douma
c8145cdbd6 Javascript mimetype icon resolver 
This makes it possible to retrieve the icon for mimetypes in javascript.
It makes no additional queries to the server to retrieve the mimetype.

* config/mimetypealiases.json added
* mimetype.js: this is where the logic resides to convert from mimetype
  to icon url
* mimetypelist.js: generated file with a list of mimetype mapping (aliases)
  and the list of icon files
* ./occ maintenance:mimetypesjs : new command for occ to gernerate
  mimetypes.js
* unit tests updated and still work
* javascript tests added
* theming support
* folder of the theme is now present in javascript (OC.theme.folder)
 2015-07-06 16:32:10 +02:00
Thomas Müller
d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Vincent Petry
2fe677d0ed Catch cache garbage collection exception on postLogin 
Just log the exception instead of preventing access to OC.
 2015-06-30 17:36:55 +02:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Hendrik Leppelsack
8621d176db moved tooltip.js to vendor scripts 2015-06-22 15:38:32 +02:00
Hendrik Leppelsack
f66e9af9a0 replaced tipsy with bootstrap tooltip 2015-06-22 13:32:06 +02:00
Thomas Müller
97a3d8c313 Fix login handler for file cache - fixes #16795 2015-06-08 14:13:38 +02:00
Thomas Müller
5e60795962 Bring back OC\Cache\File - fixes #16760 2015-06-05 14:21:17 +02:00
Morris Jobke
cf2c599218 Merge pull request #16200 from owncloud/kill-globalfilecache 
Drop file caching
 2015-06-02 09:11:33 +02:00
Robin Appelman
e08423f956 release all locks on shutdown 2015-06-01 13:22:56 +02:00
Georg Ehrke
745c3c64fa fix preview hooks, enable_previews default is true 2015-05-13 19:59:41 +02:00
Arthur Schiwon
e016ed55ff also free joblist and base from file cache code 2015-05-12 17:44:31 +02:00
Bjoern Schiessle
0d5c7a11e2 use hooks to update encryption keys instead of the storage wrapper if a file gets renamed/restored, as long as we 
are in the storage wrapper the file cache isn't up-to-date
 2015-05-11 12:06:57 +02:00
Hugo Gonzalez Labrador
3e647afbd4 Do not trigger preview hooks if enable_previews is false 2015-05-06 10:39:48 +02:00
Hugo Gonzalez Labrador
3a3a58f248 Do not trigger preview hooks if enable_previews is false 2015-05-06 10:03:18 +02:00
Lukas Reschke
9530e819eb Don't display errors and log them 
Fixes https://github.com/owncloud/core/issues/16014
 2015-05-05 12:34:22 +02:00
Lukas Reschke
8a85d8bc17 Try to set required ini values in base.php 
Fixes https://github.com/owncloud/core/issues/16006
 2015-05-03 13:23:29 +02:00
Robin Appelman
d0ad69aa9c use the preSetup hook to ensure the encryption wrapper is applied correctly 2015-04-30 13:28:06 +02:00
Thomas Müller
d9990c2b4e Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption\HookManager' 2015-04-17 13:55:31 +02:00
Bjoern Schiessle
b25c06f576 detect system wide mount points correctly 2015-04-16 14:15:04 +02:00
Thomas Müller
7b2d53603c Merge pull request #15489 from owncloud/dont_hide_exceptions_master 
Dont hide exceptions master
 2015-04-10 15:49:45 +02:00
Thomas Müller
a163243e31 Merge pull request #15510 from owncloud/cron-singleuser 
block cron when in single user mode
 2015-04-10 14:38:50 +02:00
Thomas Müller
a33edcd2f0 Fix singe user mode on public.php - take two 2015-04-10 11:17:33 +02:00
Jörn Friedrich Dreyer
8964c5068c do not disclose information, show generic error on login page 
Conflicts:
	core/templates/login.php
	lib/base.php
 2015-04-10 09:12:37 +02:00
Thomas Müller
f05e19348d Fix single user check in case no user is logged in 2015-04-09 23:47:24 +02:00
Thomas Müller
f099c9883e Adding check command to validate server environment - fixes #15429 2015-04-08 00:19:23 +02:00
Thomas Müller
ba9a797eaa Encryption storage wrapper is enabled by default - necessary to detect encrypted files even if encryption was disabled after files have been encrypted - prevents data corruption 2015-04-07 13:30:31 +02:00
Bjoern Schiessle
e4895bda01 add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files 2015-04-07 13:30:29 +02:00
Thomas Müller
4db75e3407 Setting up the encryption wrapper in a setup hook - temporarily fixes the wrapping order 2015-04-07 13:30:29 +02:00
Thomas Müller
dbdd754c3f Further cleanup of files_encryption 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
Robin Appelman
bac9b54bef Add mount point to disable the encryption wrapper 2015-03-31 16:25:33 +02:00
Thomas Müller
232518ac54 Merge pull request #15234 from owncloud/encryption2_core 
core part of encryption 2.0
 2015-03-26 21:14:59 +01:00
Bjoern Schiessle
ff9c85ce60 implement basic encryption functionallity in core to enable multiple encryption modules 2015-03-26 20:56:51 +01:00
Lukas Reschke
3e57e9d3e5 Merge pull request #15232 from owncloud/remove-arg-separator-magic 
Remove custom `arg_separator.output`
 2015-03-26 19:41:22 +01:00
Lukas Reschke
73af302d39 Remove custom arg_separator.output 
This seems unrequired nowadays and like a legacy fragment. It should be safe to remove.

Fixes https://github.com/owncloud/core/issues/14782
 2015-03-26 17:07:26 +01:00
Jenkins for ownCloud
b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Thomas Müller
843fef0490 Handle session initialization errors and display error page - fixes #15053 2015-03-20 12:21:03 +01:00
Joas Schilling
0bed187613 Stop executing, when 3rdparty is missing or apps directory is invalid 2015-03-18 11:58:18 +01:00
Thomas Müller
6c1a1234f8 Properly handle available databases at runtime and respect setup checks in command line as well 2015-03-11 09:27:12 +01:00
Thomas Müller
7181840665 Use occ to install ownCloud in autotest.sh 2015-03-11 09:27:12 +01:00
Robin McCorkell
0e4933e6d2 Refactor \OC\Memcache\Factory 
Caches divided up into two groups: distributed and local. 'Low latency' is an
alias for local caches, while the standard `create()` call tries to get
distributed caches first, then local caches.

Memcache backend is set in `config.php`, with the keys `memcache.local` and
`memcache.distributed`. If not set, `memcache.distributed` defaults to the value
of `memcache.local`.
 2015-03-05 11:36:34 +00:00
Lukas Reschke
bbd5f28415 Let users configure security headers in their Webserver 
Doing this in the PHP code is not the right approach for multiple reasons:

1. A bug in the PHP code prevents them from being added to the response.
2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud)
3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations.

This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
 2015-03-02 19:07:46 +01:00
Lukas Reschke
afb0d742b9 Simplify code 2015-03-01 12:35:41 +01:00