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

	Commit message (Collapse)	Author	Age	Files	Lines
*	add additional type check	Georg Ehrke	2014-06-06	1	-1/+1
\|
*	Merge branch 'master' into update_shipped_apps_from_appstore	Georg Ehrke	2014-06-05	1588	-76651/+58886
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/private/app.php settings/templates/apps.php
\| *	Merge pull request #8889 from owncloud/mtime-reuse	Thomas Müller	2014-06-05	2	-2/+3
\| \|\ \| \| \| \| \| \|	Don't update the mtime if the storage mtime hasn't changed
\| \| *	Fix uit tests	Robin Appelman	2014-06-05	1	-2/+2
\| \| \|
\| \| *	Don't update the mtime if the storage mtime hasn't changed	Robin Appelman	2014-06-05	1	-0/+1
\| \| \|
\| * \|	Merge pull request #8866 from owncloud/flock-quotafix	Vincent Petry	2014-06-05	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Fixed quota wrapper to return the value from flock()
\| \| * \|	Fixed quota wrapper to return the value from flock()	Vincent Petry	2014-06-04	1	-1/+1
\| \| \| \|
\| * \| \|	Merge pull request #8894 from owncloud/public-share-js-overwrite	Thomas Müller	2014-06-05	1	-1/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Dont overwrite OCA.Sharing
\| \| * \| \|	Dont overwrite OCA.Sharing	Robin Appelman	2014-06-05	1	-1/+3
\| \| \| \| \|
\| * \| \| \|	Merge pull request #8890 from owncloud/cleanup-trashsizes-table-master	Thomas Müller	2014-06-05	2	-33/+2
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	table files_trashsizes was still used in some locations -> removed
\| \| * \| \|	table files_trashsizes was still used in some locations -> removed	Thomas Müller	2014-06-05	2	-33/+2
\| \| \| \| \|
\| * \| \| \|	Merge pull request #8880 from owncloud/webdav-read-permissions	Thomas Müller	2014-06-05	1	-0/+24
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use the permissions exposed by ownCloud for webdav external storages
\| \| * \| \| \|	Use the permissions exposed by ownCloud for webdav external storages	Robin Appelman	2014-06-04	1	-0/+24
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge pull request #8883 from owncloud/files-slide-toggle	Jan-Christoph Borchardt	2014-06-05	2	-8/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	use slide toggle for files app
\| \| * \| \| \|	use slide toggle for files app	Bernhard Posselt	2014-06-05	2	-8/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #7878 from owncloud/quota-extstorageswitch	icewind1991	2014-06-05	4	-24/+180
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Added switch to count external storage data in quota
\| \| * \| \| \|	Added experimental switch to count external storage data in quota	Vincent Petry	2014-06-04	4	-24/+180
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This includes all mountpoints except the Shared one in the used space calculation. Added unit tests for ext storage inclusion in quota calculation
\| * \| \| \|	Merge pull request #8861 from owncloud/share-overview-linklist	Vincent Petry	2014-06-05	4	-2/+146
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Added Shared with link sidebar section in files app
\| \| * \| \| \|	Fixed wording to "Shared by link"	Vincent Petry	2014-06-04	2	-3/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Added "Shared with link" sidebar section in files app	Vincent Petry	2014-06-04	4	-2/+146
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added section to only show link shares. Please note that the filtering is currently done on the client side which might not be the most efficient way of doing it.
\| * \| \| \| \|	Merge pull request #8884 from owncloud/move-flock-to-app	Jörn Friedrich Dreyer	2014-06-05	4	-564/+0
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove file locking - code will continue to live in it's own app
\| \| * \| \| \| \|	remove file locking - code will continue to live in it's own app	Thomas Müller	2014-06-04	4	-564/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #8620 from owncloud/design-navigation-two	Thomas Müller	2014-06-05	13	-418/+397
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|	Toggle app navigation not only on mobile, but on desktop as well
\| \| * \| \| \| \|	fix leading decimal Scrutinizer coding style issue	Jan-Christoph Borchardt	2014-06-05	1	-3/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	fix unit test template	Morris Jobke	2014-06-05	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	fix first failing test	Morris Jobke	2014-06-05	1	-2/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	add to app navigation after enabling	Morris Jobke	2014-06-04	1	-8/+10
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	hover effect for app switcher label	Jan-Christoph Borchardt	2014-06-04	1	-6/+18
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	fix related layout issues in user management	Jan-Christoph Borchardt	2014-06-04	3	-2/+6
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	add a bit of whitespace to the bottom of the app list	Jan-Christoph Borchardt	2014-06-04	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	reduce opacity of app icon when loading	Jan-Christoph Borchardt	2014-06-04	1	-5/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	more CSS rearranging, removing duplicate code	Jan-Christoph Borchardt	2014-06-04	2	-62/+52
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	rearrange CSS, remove duplicate code	Jan-Christoph Borchardt	2014-06-04	3	-154/+109
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	move 'add apps' entry into normal navigation instead of a new line	Jan-Christoph Borchardt	2014-06-04	2	-17/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	better loading feedback for app start, move from JS to CSS	Jan-Christoph Borchardt	2014-06-04	3	-2/+25
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	show 'Apps' as fallback label for app switcher if no app title is present ↵	Jan-Christoph Borchardt	2014-06-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(for example in Settings)
\| \| * \| \| \| \|	show loading feedback	Jan-Christoph Borchardt	2014-06-04	1	-2/+10
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	separate home icon and menu toggle	Jan-Christoph Borchardt	2014-06-04	2	-0/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	show appname on mobile since now there's enough space	Jan-Christoph Borchardt	2014-06-04	1	-9/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	cut ownCloud text from logo when logged in, place appname there	Jan-Christoph Borchardt	2014-06-04	4	-5/+84
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	reduce font size of appname in header	Jan-Christoph Borchardt	2014-06-04	2	-6/+9
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	drop "push" element - no sticky footer needed anymore	Morris Jobke	2014-06-04	3	-7/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove obsoleted code to trigger navigation menu	Vincent Petry	2014-06-04	2	-106/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that the navigation menu is always togglable, the media query dependent code can be removed.
\| \| * \| \| \| \|	fix navigation bubble width and height on mobile	Jan-Christoph Borchardt	2014-06-04	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	show appname next to logo for better hint at navigation	Jan-Christoph Borchardt	2014-06-04	4	-8/+38
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	toggle the navigation on desktop, not only on mobile	Jan-Christoph Borchardt	2014-06-04	1	-8/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	adjust controls bar position for removed nav bar	Jan-Christoph Borchardt	2014-06-04	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	hide navigation by default, not only on small screens, first step	Jan-Christoph Borchardt	2014-06-04	3	-80/+75
\| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge pull request #8862 from owncloud/share-overview-fixmimetype	icewind1991	2014-06-05	1	-4/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mime type returning for shared with others files
\| \| * \| \| \| \|	Fix mime type returning for "shared with others" files	Vincent Petry	2014-06-04	1	-4/+2
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use "path" instead of "file_target", as the latter is not always set / reliable.