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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #4650 from nextcloud/appcache_on_updatev12.0.0beta1	Lukas Reschke	2017-05-02	3	-78/+129
\|\
\| *	Bump version	Roeland Jago Douma	2017-05-02	1	-1/+1
\| *	Fix and update tests	Roeland Jago Douma	2017-05-02	1	-65/+116
\| *	Do not do ETag caching when the version is updated	Roeland Jago Douma	2017-05-02	1	-12/+12
\|/
*	[tx-robot] updated from transifex	Nextcloud bot	2017-05-02	112	-922/+2648
*	Merge pull request #4630 from nextcloud/mark-ip-as-whitelisted-if-bruteforce-...	Morris Jobke	2017-05-01	2	-7/+54
\|\
\| *	Add missing space	Lukas Reschke	2017-05-01	1	-1/+1
\| *	Mark IP as whitelisted if brute force protection is disabled	Lukas Reschke	2017-05-01	2	-8/+55
* \|	Merge pull request #4626 from nextcloud/adjust-shipped-json	Lukas Reschke	2017-05-01	1	-4/+0
\|\ \
\| * \|	Remove apps delivered from the appstore	Lukas Reschke	2017-05-01	1	-4/+0
* \| \|	Merge pull request #4615 from nextcloud/js-reduce-share.js-complexity	Lukas Reschke	2017-05-01	1	-87/+0
\|\ \ \
\| * \| \|	Remove unused methods from OC.Share	Morris Jobke	2017-05-01	1	-87/+0
\| \|/ /
* \| \|	Merge pull request #4612 from nextcloud/js-fix-long-lines	Roeland Jago Douma	2017-05-01	2	-2/+8
\|\ \ \
\| * \| \|	Fix some long lines in JS - JSLinut recommendation	Morris Jobke	2017-05-01	2	-2/+8
* \| \| \|	Merge pull request #4613 from nextcloud/remove-unused	Roeland Jago Douma	2017-05-01	1	-371/+0
\|\ \ \ \
\| * \| \| \|	Remove unused JS file	Morris Jobke	2017-05-01	1	-371/+0
\| \|/ / /
* \| \| \|	Merge pull request #4599 from nextcloud/contactsmenu-mobile	Lukas Reschke	2017-05-01	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Define max-width for Contacts menu for mobile	Jan-Christoph Borchardt	2017-04-29	1	-0/+1
* \| \| \| \|	Merge pull request #4598 from nextcloud/menu-flashing	Lukas Reschke	2017-05-01	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Prevent flashing of apps and user menu	Jan-Christoph Borchardt	2017-04-29	1	-2/+2
\| \|/ / / /
* \| \| \| \|	Merge pull request #4594 from nextcloud/theming-image-default	Morris Jobke	2017-05-01	2	-0/+69
\|\ \ \ \ \
\| * \| \| \| \|	Delete theming images when logo/background is reset to default	Julius Härtl	2017-04-30	2	-0/+69
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #4527 from nextcloud/downstream-27504	Morris Jobke	2017-05-01	2	-24/+65
\|\ \ \ \ \
\| * \| \| \| \|	remove duplicate method	Robin Appelman	2017-04-26	1	-26/+8
\| * \| \| \| \|	remove excessive logging	Robin Appelman	2017-04-26	1	-25/+8
\| * \| \| \| \|	Add new specific tests for SMB	Juan Pablo Villafáñez	2017-04-26	1	-0/+19
\| * \| \| \| \|	Adjust SMB permissions on the root	Juan Pablo Villafáñez	2017-04-26	1	-3/+60
* \| \| \| \| \|	Merge pull request #4624 from nextcloud/email-settings-html	Lukas Reschke	2017-05-01	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	fix email settings	Robin Appelman	2017-05-01	1	-1/+1
* \| \| \| \| \|	Merge pull request #4610 from nextcloud/js-semicolons	Lukas Reschke	2017-05-01	8	-16/+16
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix semicolon at end of JS lines	Morris Jobke	2017-05-01	8	-16/+16
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplate	Lukas Reschke	2017-05-01	3	-4/+6
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix variable definitions in oc dialogs	Morris Jobke	2017-05-01	3	-4/+6
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #4513 from nextcloud/bump-version-to-beta1	Lukas Reschke	2017-05-01	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Bump version to Nextcloud 12.0 beta 1	Lukas Reschke	2017-04-26	1	-2/+2
* \| \| \| \| \|	Merge pull request #4616 from nextcloud/js-reduce-complexity-for-sharedialogv...	Roeland Jago Douma	2017-05-01	1	-7/+4
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	Fix variable definition in sharedialogview.js	Morris Jobke	2017-05-01	1	-7/+4
\|/ / / / /
* \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-05-01	102	-66/+630
* \| \| \| \|	Merge pull request #4602 from nextcloud/make-tooltip-intransparent	Morris Jobke	2017-04-30	1	-2/+2
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Make tooltip intransparent	Morris Jobke	2017-04-29	1	-2/+2
* \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-04-30	166	-206/+274
* \| \| \| \|	Merge pull request #4603 from nextcloud/basic-settings	blizzz	2017-04-29	2	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	Rename “Server settings” to “Basic settings”	Marius Blüm	2017-04-29	2	-3/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #4583 from nextcloud/theming-fixes-admin	Jan-Christoph Borchardt	2017-04-29	7	-132/+114
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Code cleanup and preview for undo actions	Julius Härtl	2017-04-29	3	-34/+19
\| * \| \| \|	Make sure that ThemingDefaults uses the correct default values from \OC_Defaults	Julius Härtl	2017-04-29	3	-56/+36
\| * \| \| \|	Use generated SCSS for theming preview	Julius Härtl	2017-04-29	4	-45/+62
* \| \| \| \|	Merge pull request #4597 from nextcloud/tooltips-invert	Morris Jobke	2017-04-29	1	-30/+31
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Invert tooltip color to white, fix #4563	Jan-Christoph Borchardt	2017-04-29	1	-30/+31
* \| \| \| \|	Merge pull request #1234 from nextcloud/rebase-413-by-faldon	Morris Jobke	2017-04-29	14	-110/+878
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|