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

23814 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
c6be1ba8d3 fix check if a file is excluded from encryption or not 2015-03-27 11:51:50 +01:00
Morris Jobke
7e73b25533 Merge pull request #15258 from owncloud/users-addtofilteredgroup 
Don't append user in a filtered list if groups don't match
 2015-03-27 10:02:33 +01:00
Morris Jobke
a62f38a18b Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-use-owncloud-on-not-proper-machines-a-little-bit-more-secure 
Add some generic default headers as well via PHP
 2015-03-27 09:54:40 +01:00
Jenkins for ownCloud
880b31c513 [tx-robot] updated from transifex 2015-03-27 01:56:21 -04:00
Thomas Müller
fb8994603b Merge pull request #15252 from owncloud/prevent-directory-characters-in-temporary-path 
Filter potential dangerous characters in path name
 2015-03-27 01:19:55 +01:00
Thomas Müller
710498402f Merge pull request #15256 from owncloud/emptycontent-messages 
fine-tuning the empty content messages
 2015-03-27 01:17:46 +01:00
Morris Jobke
f72939df91 Merge pull request #15255 from owncloud/test-namespacesforrepairtests 
Fix namespace for repair step tests
 2015-03-27 00:16:47 +01:00
Vincent Petry
ea93356598 Don't append user in a filtered list if groups don't match 2015-03-27 00:09:35 +01:00
Thomas Müller
055c18a7b4 Merge pull request #15245 from owncloud/fix-14864-master 
More elaborate command description for upgrade
 2015-03-26 23:50:06 +01:00
Jan-Christoph Borchardt
6b4985f5ad adjust shade of empty content icons, fix files icon shade 2015-03-26 23:49:32 +01:00
Jan-Christoph Borchardt
e09fd331eb adjust emptycontent messages for files and files_external 2015-03-26 23:22:26 +01:00
Vincent Petry
cf2fd2a825 Fix namespace for repair step tests 2015-03-26 23:19:27 +01:00
Lukas Reschke
9622fbdf29 Filter potential dangerous characters in path name 
We should not allow / or \ in the postfix here.
 2015-03-26 23:17:18 +01:00
Vincent Petry
746be98e03 Merge pull request #13654 from oparoz/tmpfile-with-extension 
Keep the extension in temp files
 2015-03-26 23:08:08 +01:00
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
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
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