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

23864 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
d082e37270 Merge pull request #15244 from owncloud/use_default_share_folder 
always fall back to default share folder
 2015-03-26 22:39:04 +01:00
Robin McCorkell
c2909355bf Merge pull request #14925 from owncloud/ext-mountoptions-ui 
Mount options GUI for external storage
 2015-03-26 21:36:34 +00:00
Lukas Reschke
9d1ce53cb1 Add some generic default headers as well via PHP 2015-03-26 22:32:57 +01:00
Bjoern Schiessle
223cca2a07 also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php 2015-03-26 22:31:45 +01:00
Thomas Müller
a4171b295d More elaborate command description for upgrade - fixes #14864 2015-03-26 22:30:35 +01:00
Jan-Christoph Borchardt
fc59a37ae7 Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9 
Don't use placeholder for password in IE8 & 9
 2015-03-26 22:06:22 +01:00
Morris Jobke
e8109f0bc3 Merge pull request #13802 from owncloud/share-partfilepermissions 
Fix share permission checks
 2015-03-26 22:01:05 +01:00
Bjoern Schiessle
a3592534ef always fall back to default share folder 2015-03-26 21:56:44 +01:00
Morris Jobke
4c00be4961 Merge pull request #14488 from owncloud/enhancement/security/inline-disposition 
Serve all files with a Content-Disposition of 'attachment' via WebDAV
 2015-03-26 21:45:30 +01:00
Robin Appelman
cb9ead7dde add priority to storage wrappers 2015-03-26 21:26:38 +01:00
Thomas Müller
7bff0681fe Merge pull request #15001 from owncloud/kill-share-proxy 
Replace share proxy with a hook
 2015-03-26 21:20:05 +01: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
8ebe667202 Remove unneeded argument 2015-03-26 20:45:39 +01:00
Thomas Müller
0cb133003c Merge pull request #15237 from owncloud/remove-ide-autocomplete-fail 
Remove IDE autocomplete fail
 2015-03-26 20:21:26 +01:00
Morris Jobke
d3ed020d34 Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-master 
no php execution timeout for webdav
 2015-03-26 20:18:01 +01:00
Lukas Reschke
74a9fc29b4 Merge pull request #14399 from owncloud/ignore-empty-plurals 
Ignore empty plurals just like with singulars
 2015-03-26 20:15:33 +01:00
Morris Jobke
0a589d938c fix enforced password for share in IE8 2015-03-26 20:05:41 +01:00
Morris Jobke
55e1226dfe Don't use placeholder for password in IE8 & 9 
* the placeholder is in IE 8 and 9 just set as text and
  styled a bit grey. If the form is then serialized without
  typing something in the placeholder is sent as value
* this fixes that behaviour for the password field and
  properly detects empyt passwords
* fixes #14912
 2015-03-26 20:03:27 +01:00
Lukas Reschke
55fd0082aa Serve all files with a Content-Disposition of 'attachment' via WebDAV 
As an additional security hardening it's sensible to serve these files with a Content-Disposition of 'attachment'. Currently they are served 'inline' and get a "secure mimetype" assigned in case of potential dangerous files.

To test this change ensure that:

- [ ] Syncing with the Desktop client still works
- [ ] Syncing with the Android client still works
- [ ] Syncing with the iOS client still works

I verified that the 1.8 OS X and iOS client still work with this change.
 2015-03-26 20:01:05 +01:00
Robin Appelman
1be7da4a57 replace share proxy with hook 2015-03-26 19:56:57 +01:00
Robin Appelman
173c31e42a rename proxy test 2015-03-26 19:56:31 +01:00
Lukas Reschke
c8c722bc6d Merge pull request #15129 from owncloud/version-command-bus 
expire versions in a background command
 2015-03-26 19:55:13 +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
071a339593 Remove IDE autocomplete fail 
🙈 *cough* *cough*
 2015-03-26 19:39:15 +01:00
Morris Jobke
70e64822b9 Merge pull request #14665 from owncloud/fileid-increment 
SQLite autoincrement test
 2015-03-26 19:36:18 +01:00
Vincent Petry
58b4c2c0e5 Make sure mountOptions keep their data type 
str_replace for $user substitution was converting the data type of
mountOptions to string. This fix prevents this to happen by making sure
only strings are processed by substitution.

Also added a int conversion when reading the watcher policy
 2015-03-26 19:24:37 +01:00
Thomas Müller
9c6649f4f1 Merge pull request #15228 from owncloud/add-missing-navigation-for-tips-n-tricks 
Add navigation entry for tips and tricks setion
 2015-03-26 18:21:44 +01:00
Jan-Christoph Borchardt
b95139e5b2 Merge pull request #15230 from owncloud/sqlite-notice 
move SQLite notice from warnings to tips & tricks
 2015-03-26 18:15:22 +01:00
Jan-Christoph Borchardt
e3d60ee5b0 Merge pull request #14958 from owncloud/dropdown-style 
popover style for apps and user dropdown menus
 2015-03-26 18:07:35 +01:00
Robin Appelman
6447962f2a teardown after we're done 2015-03-26 17:30:43 +01:00
Thomas Müller
a8b756154a Merge pull request #14495 from owncloud/update-mailmap-01 
Updating .mailmap
 2015-03-26 17:17:18 +01:00
Jan-Christoph Borchardt
d1db727d1f mock up missing elements in the tests 2015-03-26 17:13:50 +01:00
Robin Appelman
1969c8d5c8 save uid instead of user object in command 2015-03-26 17:11:34 +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
Robin Appelman
8c903c100f check limit of serialized command in unit tests 2015-03-26 17:07:02 +01:00
Robin Appelman
268f249e8d ensure commands can be serialized in unit tests 2015-03-26 17:07:02 +01:00
Robin Appelman
176fba83ea Setup the filesystem in the expire command 2015-03-26 17:07:02 +01:00
Robin Appelman
ddd6a67d2a Handle exceptions thrown during hooks when running unit tests 2015-03-26 17:07:02 +01:00
Robin Appelman
3ed6ed3c36 Force test cases using background commands to handle setting up the filesystem 2015-03-26 17:07:02 +01:00
Robin Appelman
7ec8f12ad4 expire versions in a background command 2015-03-26 17:07:01 +01:00
Jan-Christoph Borchardt
e7dcc01017 only move dropdown triangle when navigation is opened, fix timing bug 2015-03-26 17:01:35 +01:00
Jan-Christoph Borchardt
82fc754d3f move SQLite notice from warnings to tips & tricks 2015-03-26 16:53:27 +01:00
Joas Schilling
02ffc6c6ee Merge pull request #15226 from owncloud/fix-upload-placeholder 
Fix placeholder in files upload
 2015-03-26 16:50:43 +01:00
Joas Schilling
39dbf9509b Merge pull request #15224 from owncloud/issue/15191-app-code-checker-error-list 
Correctly only send the errors of the current file to the event
 2015-03-26 16:35:46 +01:00
Joas Schilling
cd09b949a6 Add navigation entry for tips and tricks setion 2015-03-26 16:23:21 +01:00
Vincent Petry
70acd58336 Copy Etag header to OC-Etag for sabre calls 2015-03-26 16:06:43 +01:00
Robin McCorkell
a323d781a6 Revert "add https:// placeholder for From Link feature. closes #13255" 
This reverts commit 18b5966f3a.
 2015-03-26 14:47:21 +00:00
Thomas Müller
e66dda83df Merge pull request #15218 from owncloud/revert-oc-etag-master 
Revert oc etag master
 2015-03-26 15:34:24 +01:00
Joas Schilling
db763027bb Correctly only send the errors of the current file to the event 2015-03-26 15:33:31 +01:00