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 #9949 from owncloud/fixing-sqlite-migration-shared-hoster	Morris Jobke	2014-07-28	2	-2/+27
\|\ \| \| \| \|	generate copy of sqlite database file in data directory
\| *	generate copy of sqlite database file in data directory	Thomas Müller	2014-07-28	2	-2/+27
\| \|
* \|	Merge pull request #9924 from owncloud/eventsource-nginx-buffering	Robin Appelman	2014-07-28	1	-0/+2
\|\ \ \| \| \| \| \| \|	Prevent nginx from buffering event source events
\| * \|	Prevent nginx from buffering event source events	Robin Appelman	2014-07-26	1	-0/+2
\| \| \|
* \| \|	Merge pull request #9853 from owncloud/design-mobile-search	Morris Jobke	2014-07-28	4	-5/+19
\|\ \ \ \| \| \| \| \| \| \| \|	improve look of search on mobile, save space in top bar, fix overlap
\| * \| \|	improve look of search on mobile, save space in top bar	Jan-Christoph Borchardt	2014-07-24	4	-5/+19
\| \| \| \|
* \| \| \|	Merge pull request #9784 from josh4trunks/libreoffice_match_cl	Thomas Müller	2014-07-28	1	-3/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Cleanup Document Preview
\| * \| \| \|	Cleanup Document Preview	josh4trunks	2014-07-22	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the env:UserInstallation flag like https://github.com/owncloud/documents/blob/master/lib/converter.php. This will stop the creating of multiple directories for document conversion in tmpDir.
* \| \| \| \|	update 3rdparty submodule to merge commit	Morris Jobke	2014-07-28	1	-0/+0
\| \| \| \| \|
* \| \| \| \|	Merge pull request #9585 from owncloud/design-fix-public-footer	Jan-Christoph Borchardt	2014-07-28	2	-16/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	move public page footer rules from sharing app to core so it is used by other apps too
\| * \| \| \| \|	move public page footer rules from sharing app to core so it is used by ↵	Jan-Christoph Borchardt	2014-07-07	2	-16/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	other apps too
* \| \| \| \| \|	Merge pull request #9847 from owncloud/design-input-grouping	Jan-Christoph Borchardt	2014-07-28	1	-3/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	enable input grouping also outside of log in screen
\| * \| \| \| \| \|	enable input grouping also outside of log in screen	Jan-Christoph Borchardt	2014-07-24	1	-3/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #9641 from owncloud/localuser-addressbook	Thomas Müller	2014-07-28	3	-0/+208
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ownCloud users are exported as address book
\| * \| \| \| \| \| \|	ownCloud users are exported as address book	Thomas Müller	2014-07-24	3	-0/+208
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #9631 from owncloud/update-getid3	Thomas Müller	2014-07-28	2	-2/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update getID3 library
\| * \| \| \| \| \| \| \|	add autoload	Morris Jobke	2014-07-25	2	-2/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	update getID3 library	Morris Jobke	2014-07-25	2	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #9819 from owncloud/updater-setversionafterupdate	Thomas Müller	2014-07-28	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set version AFTER a successful update
\| * \| \| \| \| \| \| \| \|	Set version AFTER a successful update	Vincent Petry	2014-07-23	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If an app upgrade failed, the core version will not be increased either in the database. This will re-display the update page and make it possible to redo the apps upgrade. Note that any core repair routine must take into account that an update might need to be redone again even though the core's DB state is already the one of the new version.
* \| \| \| \| \| \| \| \| \|	Merge pull request #9859 from tiezdne/master	Thomas Müller	2014-07-28	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update mimetypes.list.php
\| * \| \| \| \| \| \| \| \| \|	Update mimetypes.list.php	tiezdne	2014-07-24	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #9905 from owncloud/joblist-non-existing-class	Thomas Müller	2014-07-28	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dont try to execute jobs that no longer exist
\| * \| \| \| \| \| \| \| \| \| \|	Dont try to execute jobs that no longer exist	Robin Appelman	2014-07-25	1	-1/+4
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #9935 from owncloud/harden-get-urlco	Thomas Müller	2014-07-28	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \|	Verify whether the URL is valid
\| * \| \| \| \| \| \| \| \| \|	Verify whether the URL is valid	Lukas Reschke	2014-07-27	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017 @karlitschek Backport for stable6 and stable7 requested.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #9904 from owncloud/loggedout-getuserfolder	Thomas Müller	2014-07-28	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dont throw an error when calling $server->getUserFolder when logged out
\| * \| \| \| \| \| \| \| \| \| \|	Dont throw an error when calling $server->getUserFolder when logged out	Robin Appelman	2014-07-25	1	-1/+5
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-master	Thomas Müller	2014-07-28	1	-7/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don't silently exit in cli-mode in case ownCloud in not yet installed
\| * \| \| \| \| \| \| \| \| \| \|	reorder if statements to remove negation, indentation correction	Jörn Friedrich Dreyer	2014-07-25	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	don't silently exit in cli-mode in case ownCloud in not yet installed	Thomas Müller	2014-07-24	1	-0/+2
\| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-07-28	42	-152/+213
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #9922 from visit1985/app_icon_size	Jan-Christoph Borchardt	2014-07-28	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	max icon size for app menu
\| * \| \| \| \| \| \| \| \| \|	max icon size for app menu	Michael Göhler	2014-07-26	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-07-27	50	-364/+454
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-07-26	53	-351/+446
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #9669 from owncloud/group-public	Robin Appelman	2014-07-25	7	-48/+235
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Add group management to the public api
\| * \| \| \| \| \| \| \| \|	Add group management to the public api	Robin Appelman	2014-07-16	7	-48/+235
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #9867 from owncloud/fix_sharing_update	Björn Schießle	2014-07-25	2	-2/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \|	fix sharing update, add proper escaping
\| * \| \| \| \| \| \| \| \|	fix sharing update, add proper escaping	Bjoern Schiessle	2014-07-24	2	-2/+5
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-07-25	20	-122/+147
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #9861 from owncloud/console-dontloadappsonupdate	Vincent Petry	2014-07-24	1	-6/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not load apps in console.php when an upgrade is due
\| * \| \| \| \| \| \| \| \|	Do not load apps when an upgrade is due	Vincent Petry	2014-07-24	1	-6/+12
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it still possible to update from the command line, but disables custom commands from apps
* \| \| \| \| \| \| \| \|	Merge pull request #9841 from owncloud/fix-password-reset-master	Thomas Müller	2014-07-24	3	-5/+28
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|	Fix password reset in console command and lost password controller
\| * \| \| \| \| \| \| \|	- adding default value for $recoveryPassword	Thomas Müller	2014-07-24	3	-5/+28
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- set password correctly in lost password
* \| \| \| \| \| \| \|	Merge pull request #9837 from owncloud/ignore-non-oc-tables-master	Thomas Müller	2014-07-24	2	-0/+43
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|	Adding test which breaks because bit and/or enum datatypes are used
\| * \| \| \| \| \| \|	register type mappings for unknown/unsupported mysql types	Thomas Müller	2014-07-24	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Adding test which breaks because bit and/or enum datatypes are used	Thomas Müller	2014-07-24	1	-0/+39
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #9703 from owncloud/files-preview-animate	Morris Jobke	2014-07-24	2	-3/+4
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	[OC 7] Fix preview animation on uploading
\| * \| \| \| \| \|	Fix preview animation on uploading	Vincent Petry	2014-07-17	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When adding/uploading files, the preview is now animated. When loading a list of files directly the preview is displayed directly.