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 #6079 from nextcloud/fix-antivirus	blizzz	2017-12-11	2	-12/+53
\|\ \| \| \| \|	Parse Sabre Exception in OC.Files.Client and file-upload
\| *	Parse Sabre Exception in OC.Files.Client and file-upload	Vincent Petry	2017-11-13	2	-12/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In case of error, instead of a generic error message, an upload will display whichever message is returned in the Sabre Exception, if applicable. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* \|	Merge pull request #7249 from nextcloud/guest-flex	Morris Jobke	2017-12-11	1	-10/+12
\|\ \ \| \| \| \| \| \|	Guest flex instead of absolute
\| * \|	Fixed top	John Molakvoæ (skjnldsv)	2017-11-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
\| * \|	Fixed heigh resize	John Molakvoæ (skjnldsv)	2017-11-22	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
\| * \|	Use flex for guest full screen alignment	John Molakvoæ (skjnldsv)	2017-11-22	1	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* \| \|	Merge pull request #7324 from nextcloud/no-sorters-no-instances	Roeland Jago Douma	2017-12-11	1	-5/+7
\|\ \ \ \| \| \| \| \| \| \| \|	don't create sorter instances when none was requested
\| * \| \|	don't create sorter instances when none was requested	Arthur Schiwon	2017-11-28	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-12-11	6	-38/+74
\| \| \| \|
* \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-12-10	14	-54/+80
\| \| \| \|
* \| \| \|	Merge pull request #6876 from nextcloud/always_img_avatar	Morris Jobke	2017-12-08	1	-12/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Always generate avatar
\| * \| \| \|	Move avatar code to Avatar Class	Roeland Jago Douma	2017-11-29	1	-159/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
\| * \| \| \|	Always generate avatar	Roeland Jago Douma	2017-11-29	1	-5/+155
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Even if no avatar is set we should just generate the image. This to not duplicate the code on all the clients. And only server images from the avtar endpoint. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* \| \| \| \|	Merge pull request #7115 from nextcloud/fix-flow	Morris Jobke	2017-12-08	1	-1/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix flow
\| * \| \| \| \|	Fix flow	Mario Danic	2017-11-09	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Mario Danic <mario@lovelyhq.com>
* \| \| \| \| \|	Merge pull request #7390 from nextcloud/update-php-info	Morris Jobke	2017-12-08	1	-0/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show hint that PHP 5.6 will not be supported in Nextcloud 14 anymore
\| * \| \| \| \| \|	Show hint that PHP 5.6 will not be supported in Nextcloud 14 anymore	Morris Jobke	2017-12-08	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-12-08	6	-4/+44
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-12-07	2	-2/+76
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #6670 from nextcloud/handle-encryption-state-in-web-interface	Tobias Kaminsky	2017-12-06	7	-3/+39
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle encryption state in web interface
\| * \| \| \| \| \| \|	show e2e folder icon on encrypted folders	Bjoern Schiessle	2017-11-20	5	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
\| * \| \| \| \| \| \|	check for encryption state on propfind	Bjoern Schiessle	2017-11-20	2	-2/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-12-06	12	-0/+66
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-12-05	2	-0/+20
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #7319 from nextcloud/remove-svg-shadows	Morris Jobke	2017-12-04	3	-12/+36
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Remove svg shadows
\| * \| \| \| \| \| \|	Fix syntax error	Morris Jobke	2017-12-04	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Morris Jobke <hey@morrisjobke.de>
\| * \| \| \| \| \| \|	Define icon-shadow only in context of icon-white	Marin Treselj	2017-11-30	1	-7/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Marin Treselj <marin@pixelipo.com>
\| * \| \| \| \| \| \|	Revert removing of deprecated icons	Marin Treselj	2017-11-28	13	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Marin Treselj <marin@pixelipo.com>
\| * \| \| \| \| \| \|	Remove deprecated white, shaded icons	Marin Treselj	2017-11-28	13	-13/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Marin Treselj <marin@pixelipo.com>
\| * \| \| \| \| \| \|	Add new .icon-white and .icon-shadow classes, add toggle-background icon	Marin Treselj	2017-11-28	3	-11/+39
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Marin Treselj <marin@pixelipo.com>
* \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-12-04	6	-0/+20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-12-03	2	-0/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-12-02	4	-0/+48
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-12-01	32	-0/+642
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-11-30	8	-18/+94
\| \|_\|_\|/ / / \|/\| \| \| \| \|
* \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-11-29	12	-0/+162
\|/ / / / /
* \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-11-28	114	-1536/+644
\| \| \| \| \|
* \| \| \| \|	Merge pull request #7303 from nextcloud/fix-contact-menu	Morris Jobke	2017-11-27	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix contacts menu height for Safari
\| * \| \| \| \|	Fix contacts menu height for Safari	Morris Jobke	2017-11-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* fixes #5119 * in Safari the input field was 38px in height and not 34px like in all other browsers Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* \| \| \| \| \|	Merge pull request #7222 from nextcloud/fix-filerow-avatars	blizzz	2017-11-27	2	-31/+160
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix filerow avatars
\| * \| \| \| \| \|	fix sorting test on phantomjs	Arthur Schiwon	2017-11-24	1	-15/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \|	recycle SharedFileInfo values in fileInfo	Arthur Schiwon	2017-11-23	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fileInfo is composed of data from sharing, however additional data is pulled when sidebar opens, e.g. the size. Then, existing data is overwritten by data from the other source (files). The data points that would be lost are not dirty however and still used, so we keep them. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \|	fix tooltips for good	Arthur Schiwon	2017-11-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \|	apply tooltip to all avatars	Arthur Schiwon	2017-11-23	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \|	rip out obsolete recipientsDisplayName	Arthur Schiwon	2017-11-23	2	-10/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also needs tests adjustements, and this also brings in natural sorting Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \|	adjust tests and apply sorting	Arthur Schiwon	2017-11-23	2	-27/+112
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \|	adjust, fix and extend tests	Arthur Schiwon	2017-11-23	2	-25/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \|	Fix avatars in file rows of incoming shares	Arthur Schiwon	2017-11-23	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \|	fix avatars in file rows of outgoing shares	Arthur Schiwon	2017-11-23	1	-7/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* \| \| \| \| \| \|	Merge pull request #7266 from ↵	Morris Jobke	2017-11-27	1	-2/+27
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nextcloud/fix-input-field-not-disabled-while-a-comment-is-being-sent Fix input field not disabled while a comment is being sent