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

	Commit message (Collapse)	Author	Age	Files	Lines
*	remove triggerupdate, ref #11872	Jörn Friedrich Dreyer	2014-12-04	3	-28/+13
\|
*	Merge pull request #12522 from owncloud/bower-jstz	Morris Jobke	2014-12-04	17	-365/+675
\|\ \| \| \| \|	Bower jstz
\| *	move jstz to bower management	Morris Jobke	2014-12-01	7	-359/+409
\| \|
\| *	include lock files of bower to be able to use "bower install"	Morris Jobke	2014-12-01	12	-6/+266
\| \|
* \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-12-04	6	-2/+16
\| \|
* \|	Merge pull request #12581 from owncloud/fix_typo	Thomas Müller	2014-12-03	1	-1/+1
\|\ \ \| \| \| \| \| \|	fix typo in license header
\| * \|	fix typo	Bjoern Schiessle	2014-12-03	1	-1/+1
\|/ /
* \|	Merge pull request #12544 from owncloud/fix-windows-unittests	Thomas Müller	2014-12-03	21	-35/+43
\|\ \ \| \| \| \| \| \|	Replace uniqid calls with $this->getUniqueID so tests pass again on windows
\| * \|	Replace uniqid calls with $this->getUniqueID so tests pass again on windows	Joas Schilling	2014-12-03	21	-35/+43
\| \| \|
* \| \|	Merge pull request #12579 from owncloud/drop-files-external-tests	Thomas Müller	2014-12-03	2	-3/+1
\|\ \ \ \| \| \| \| \| \| \| \|	drop files_external tests from autotest - they will be executed with aut...
\| * \| \|	drop files_external tests from autotest - they will be executed with ↵	Morris Jobke	2014-12-03	2	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	autotest-external.sh which is coming
* \| \| \|	Merge pull request #12542 from owncloud/update-autotestcmd	Joas Schilling	2014-12-03	1	-17/+38
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Update autotest.cmd
\| * \| \| \|	Restore the development config after running the tests	Joas Schilling	2014-12-02	1	-3/+17
\| \| \| \| \|
\| * \| \| \|	Allow overwriting DATADIR completly so ramdisk can be used	Joas Schilling	2014-12-02	1	-5/+5
\| \| \| \| \|
\| * \| \| \|	Allow passing a test file just like in autotest.sh	Joas Schilling	2014-12-02	1	-7/+7
\| \| \| \| \|
\| * \| \| \|	Better manage the output when running autotest.cmd	Joas Schilling	2014-12-02	1	-5/+12
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #12492 from owncloud/deprecate-passwordsalt	Lukas Reschke	2014-12-03	1	-0/+3
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Officially deprecate passwordsalt
\| * \| \|	Officially deprecated passwordsalt	Lukas Reschke	2014-12-03	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hopefully this prevents people from using it in the future.
* \| \| \|	Merge pull request #12382 from owncloud/enc_reorganize_folders2	Morris Jobke	2014-12-03	25	-1674/+1172
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[encryption] reorganize folder structure (second try to make Jenkins happy)
\| * \| \| \|	small fixes	Bjoern Schiessle	2014-12-02	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	delete old keys if file was moved to a different mount point	Bjoern Schiessle	2014-12-02	1	-4/+10
\| \| \| \| \|
\| * \| \| \|	upgrade to new folder structure	Bjoern Schiessle	2014-12-02	18	-341/+483
\| \| \| \| \|
\| * \| \| \|	change private/public key names for consistency reasons	Bjoern Schiessle	2014-11-26	11	-226/+202
\| \| \| \| \|
\| * \| \| \|	harmonize copyright notice	Bjoern Schiessle	2014-11-26	7	-18/+28
\| \| \| \| \|
\| * \| \| \|	new folder structure for keys	Bjoern Schiessle	2014-11-26	15	-1162/+526
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	all keys are now in files_encryption/key/path_to_file/filename/ share keys are named: user.shareKey file key is named: fileKey
* \| \| \| \|	Merge pull request #12552 from szlwzl/master	Thomas Müller	2014-12-03	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	adding @ sign between email address and domain name to make syntax clearer
\| * \| \| \| \|	adding @ sign between email address and domain name to make the syntax clearer	Simon Whittaker	2014-12-02	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logflood	Lukas Reschke	2014-12-03	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Stop flooding the log, when previews are disabled
\| * \| \| \|	Stop flooding the log, when previews are disabled	Joas Schilling	2014-12-03	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #12553 from owncloud/default-iosid	Thomas Müller	2014-12-03	1	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	add missing public interface for iOS client app id
\| * \| \| \| \|	add missing public interface for iOS client app id	Morris Jobke	2014-12-02	1	-0/+8
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #12556 from owncloud/add-route-for-versions	Thomas Müller	2014-12-03	2	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add route for download of versions
\| * \| \| \| \|	Add route for download of versions	Lukas Reschke	2014-12-02	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise on master it was not possible anymore to download older versions. Fixes itself.
* \| \| \| \| \|	Merge pull request #12563 from owncloud/usermenu-remove-border	Volkan Gezer	2014-12-03	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove border from user menu, adjust to apps menu
\| * \| \| \| \| \|	remove border from user menu, adjust to apps menu	Jan-Christoph Borchardt	2014-11-28	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #12565 from owncloud/config-sample-databases	Vincent Petry	2014-12-03	1	-7/+13
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	add proper description what database is supported by CE and EE
\| * \| \| \| \| \|	add proper description what database is supported by CE and EE	Morris Jobke	2014-12-03	1	-7/+13
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #12554 from owncloud/versions-app-autoload	Lukas Reschke	2014-12-03	5	-8/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Autoload lib files of versions app
\| * \| \| \| \| \|	Autoload exception from files_trashbin	Joas Schilling	2014-12-02	2	-2/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Autoload lib files of versions app	Joas Schilling	2014-12-02	3	-6/+0
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-12-03	24	-88/+128
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #10881 from owncloud/touch-statcache	Robin Appelman	2014-12-02	2	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear statcache before getting the mtime from local storage backends
\| * \| \| \| \| \|	also clear statcache in mapped local	Robin Appelman	2014-12-02	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Clear statcache before getting the mtime from local storage backends	Robin Appelman	2014-12-02	1	-0/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #12333 from owncloud/delete-selected-files	Morris Jobke	2014-12-02	3	-10/+42
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix deleting non deletable files by selecting them
\| * \| \| \| \| \|	Add js unit test	Robin Appelman	2014-11-26	1	-7/+27
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Dont show the delete button for selected files if one of the selected files ↵	Robin Appelman	2014-11-26	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is not deletable
\| * \| \| \| \| \|	Check if files are deletable before trying to delete them	Robin Appelman	2014-11-26	1	-1/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #11975 from owncloud/Combustible-combustible_dev	Morris Jobke	2014-12-02	1	-254/+267
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Check imagecreate*() return before using and use logger in \OC_Image
\| * \| \| \| \| \|	Use \OCP\ILogger	Thomas Müller	2014-12-01	1	-257/+264
\| \| \| \| \| \| \|