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

	Commit message (Collapse)	Author	Age	Files	Lines
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-07-30	157	-3181/+3904
\|
*	Merge pull request #10022 from owncloud/fix-exec-admin-master	Thomas Müller	2014-07-29	1	-3/+5
\|\ \| \| \| \|	only call exec() if allowed to
\| *	only call exec() if allowed to	Thomas Müller	2014-07-29	1	-3/+5
\| \|
* \|	Merge pull request #10020 from owncloud/design-link-icon	Jan-Christoph Borchardt	2014-07-29	2	-2/+5
\|\ \ \| \|/ \|/\|	use more understandable 'link' icon for public links (instead of hard to recognize globe)
\| *	use more understandable 'link' icon for public links (instead of hard to ↵	Jan-Christoph Borchardt	2014-07-29	2	-2/+5
\| \| \| \| \| \| \| \|	recognize globe), fix #9707
* \|	Merge pull request #9721 from owncloud/enc_define_type_in_pre_hook	Björn Schießle	2014-07-29	1	-4/+7
\|\ \ \| \| \| \| \| \|	[encryption] define type in pre hook
\| * \|	define type in pre hook	Bjoern Schiessle	2014-07-18	1	-4/+7
\| \| \|
* \| \|	Merge pull request #9951 from owncloud/enc_inproved_error_messages	Björn Schießle	2014-07-29	3	-3/+13
\|\ \ \ \| \| \| \| \| \| \| \|	show a warning in the personal settings and admin settins if the encyption keys are not initialized
\| * \| \|	show a warning in the personal settings and admin settins if the encyption ↵	Bjoern Schiessle	2014-07-28	3	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	keys are not initialized
* \| \| \|	Merge pull request #9988 from owncloud/sharing_remove_share_permission	Björn Schießle	2014-07-29	2	-1/+34
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	remove share permission if user is excluded from sharing
\| * \| \| \|	remove share permission if user is excluded from sharing	Bjoern Schiessle	2014-07-29	2	-1/+34
\| \| \| \| \|
* \| \| \| \|	Merge pull request #9983 from owncloud/sharing_add_unshare_to_overview	Björn Schießle	2014-07-29	1	-0/+3
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|	update attributes for share-with-user view
\| * \| \| \|	update attributes for share with user list, file should always have delete ↵	Bjoern Schiessle	2014-07-28	1	-0/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	permissions, this means unshare in this context, and the overview page is always a root view
* \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-07-29	296	-9598/+14775
\| \| \| \|
* \| \| \|	Merge pull request #9989 from owncloud/fix-failing-unit-test-master	Thomas Müller	2014-07-29	1	-5/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	function declaration did not match
\| * \| \| \|	function declaration did not match	Thomas Müller	2014-07-29	1	-5/+5
\| \|/ / /
* \| \| \|	Merge pull request #9945 from owncloud/remove-mssql-bundle-master	Thomas Müller	2014-07-28	1	-0/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \|	remove MssqlBundle
\| * \| \|	remove MssqlBundle	Thomas Müller	2014-07-28	1	-0/+0
\|/ / /
* \| \|	Merge pull request #9758 from owncloud/share-expdatefix	Björn Schießle	2014-07-28	4	-15/+170
\|\ \ \ \| \| \| \| \| \| \| \|	Fix enforced share expiration date to be based on share time
\| * \| \|	Fix enforced share expiration date to be based on share time	Vincent Petry	2014-07-21	4	-15/+170
\| \| \| \|
* \| \| \|	Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date	Björn Schießle	2014-07-28	8	-34/+225
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[share api] add OCS api call to set expire date for link shares
\| * \| \| \|	adjust error code	Bjoern Schiessle	2014-07-28	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	add OCS api call to set expire date for link shares	Bjoern Schiessle	2014-07-25	8	-33/+224
\| \| \| \| \|
* \| \| \| \|	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