nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #15240 from owncloud/storage-wrapper-priority	Thomas Müller	2015-03-27	3	-10/+20
\|\ \| \| \| \|	add priority to storage wrappers
\| *	add priority to storage wrappers	Robin Appelman	2015-03-26	3	-10/+20
\| \|
* \|	Merge pull request #15265 from owncloud/enc2_fixes	Thomas Müller	2015-03-27	3	-5/+18
\|\ \ \| \| \| \| \| \|	core improvements for Encryption 2.0
\| * \|	add deleteAllFileKeys to public interface and add "uid" as parameter for the	Bjoern Schiessle	2015-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	update call
\| * \|	fix check if a file is excluded from encryption or not	Bjoern Schiessle	2015-03-27	2	-4/+17
\| \| \|
* \| \|	Merge pull request #15247 from owncloud/fix_group_share_master_backport	Morris Jobke	2015-03-27	1	-4/+5
\|\ \ \ \| \| \| \| \| \| \| \|	also call generateTarget for group shares
\| * \| \|	also call generateTarget for group share to add the correct prefix if ↵	Bjoern Schiessle	2015-03-26	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	share_folder is defined in config.php
* \| \| \|	Merge pull request #15227 from owncloud/ocetag-header	Vincent Petry	2015-03-27	1	-0/+46
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Copy Etag header to OC-Etag for sabre calls
\| * \| \|	Copy Etag header to OC-Etag for sabre calls	Vincent Petry	2015-03-26	1	-0/+46
\| \| \| \|
* \| \| \|	Merge pull request #15225 from ↵	Morris Jobke	2015-03-27	1	-0/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \|	Add some generic default headers as well via PHP	Lukas Reschke	2015-03-26	1	-0/+9
\| \| \| \| \|
* \| \| \| \|	Filter potential dangerous characters in path name	Lukas Reschke	2015-03-26	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We should not allow / or \ in the postfix here.
* \| \| \| \|	Merge pull request #13654 from oparoz/tmpfile-with-extension	Vincent Petry	2015-03-26	2	-3/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Keep the extension in temp files
\| * \| \| \| \|	Make the method compatible with all types of extensions	Olivier Paroz	2015-03-19	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix existing tests
\| * \| \| \| \|	Fix the office class	Olivier Paroz	2015-03-19	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The office converter already replaces the original extension with '.pdf', so we need to switch the extensions of the tmp file instead of appending '.pdf' to it
\| * \| \| \| \|	Keep the extension in temp files	Olivier Paroz	2015-03-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The file extension helps some applications like ImageMagick to properly process files
* \| \| \| \| \|	Merge pull request #14925 from owncloud/ext-mountoptions-ui	Robin McCorkell	2015-03-26	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mount options GUI for external storage
\| * \| \| \| \| \|	Make sure mountOptions keep their data type	Vincent Petry	2015-03-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \|	Merge pull request #13802 from owncloud/share-partfilepermissions	Morris Jobke	2015-03-26	1	-6/+15
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|	Fix share permission checks
\| * \| \| \| \| \|	Fix permission checks in Sabre connector	Vincent Petry	2015-03-19	1	-6/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes moving files in and out of shared folders with some exotic permission combinations.
* \| \| \| \| \| \|	Merge pull request #14488 from owncloud/enhancement/security/inline-disposition	Morris Jobke	2015-03-26	1	-0/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Serve all files with a Content-Disposition of 'attachment' via WebDAV
\| * \| \| \| \| \| \|	Remove unneeded argument	Lukas Reschke	2015-03-26	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Serve all files with a Content-Disposition of 'attachment' via WebDAV	Lukas Reschke	2015-03-26	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \|	Merge pull request #15234 from owncloud/encryption2_core	Thomas Müller	2015-03-26	12	-0/+1877
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|	core part of encryption 2.0
\| * \| \| \| \| \| \|	implement basic encryption functionallity in core to enable multiple ↵	Bjoern Schiessle	2015-03-26	12	-0/+1877
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	encryption modules
* \| \| \| \| \| \| \|	Merge pull request #14399 from owncloud/ignore-empty-plurals	Lukas Reschke	2015-03-26	2	-21/+3
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Ignore empty plurals just like with singulars
\| * \| \| \| \| \| \|	Revert "Correctly fallback to english, if the plural case is not translated"	Joas Schilling	2015-02-20	2	-21/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit cbad5c998b260040523ac8e6a2797591d0086938.
* \| \| \| \| \| \| \|	Merge pull request #15129 from owncloud/version-command-bus	Lukas Reschke	2015-03-26	3	-3/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	expire versions in a background command
\| * \| \| \| \| \| \| \|	check limit of serialized command in unit tests	Robin Appelman	2015-03-26	1	-0/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	ensure commands can be serialized in unit tests	Robin Appelman	2015-03-26	1	-1/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Handle exceptions thrown during hooks when running unit tests	Robin Appelman	2015-03-26	1	-0/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Force test cases using background commands to handle setting up the filesystem	Robin Appelman	2015-03-26	2	-2/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #14665 from owncloud/fileid-increment	Morris Jobke	2015-03-26	3	-0/+38
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|	SQLite autoincrement test
\| * \| \| \| \| \| \| \|	Add repair step to fix SQLite autoincrement	Vincent Petry	2015-03-26	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Force Doctrine to generate alter table SQL statements for SQLite to make sure the code from OCSqlitePlatform is triggered.
\| * \| \| \| \| \| \| \|	Rename platform	Robin Appelman	2015-03-25	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add custom sqlite platform to set auto increment	Robin Appelman	2015-03-25	2	-0/+36
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #14495 from owncloud/update-mailmap-01	Thomas Müller	2015-03-26	323	-2093/+6562
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Updating .mailmap
\| * \| \| \| \| \| \| \|	Update license headers	Jenkins for ownCloud	2015-03-26	323	-2093/+6562
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #15224 from owncloud/issue/15191-app-code-checker-error-list	Joas Schilling	2015-03-26	1	-2/+3
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|	Correctly only send the errors of the current file to the event
\| * \| \| \| \| \| \|	Correctly only send the errors of the current file to the event	Joas Schilling	2015-03-26	1	-2/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Revert "adding OC-ETag header"	Vincent Petry	2015-03-26	2	-20/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 30ee8b6f998b4b2e27da92b3adcdbc4683d3bcde.
* \| \| \| \| \| \| \|	Revert "adding unit tests"	Vincent Petry	2015-03-26	1	-2/+5
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 8d327c94a844804d0e7af057866e552bd5aafd17.
* \| \| \| \| \| \|	Merge pull request #15168 from owncloud/oc-etag-master	Vincent Petry	2015-03-26	2	-2/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	adding OC-ETag header
\| * \| \| \| \| \| \|	adding unit tests	Thomas Müller	2015-03-26	1	-5/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	adding OC-ETag header	Thomas Müller	2015-03-24	2	-2/+20
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #14125 from dratini0/master	Lukas Reschke	2015-03-26	1	-1/+7
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	[nginx] Extending X-Accel-Redirect support
\| * \| \| \| \| \| \|	Removed simplified X-accel-redirect even further	dratini0	2015-03-23	1	-6/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Changed the disputed while loop to a single if.	dratini0	2015-03-23	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Extending the X-accel redirect functionality with a more scalable approach.	dratini0	2015-02-11	1	-1/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Revert "Fix: X-Accel-Redirect did not support custom data dir and local mounts"	dratini0	2015-02-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f2075f803fc59918cc20071cf174d6b5f81f5eed.