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

	Commit message (Expand)	Author	Age	Files	Lines
*	show dialog again of operation failed	Bjoern Schiessle	2016-11-24	1	-0/+1
*	set focus on input field	Bjoern Schiessle	2016-11-24	1	-0/+1
*	Merge pull request #2296 from nextcloud/nitpicking-on-federation-admin-section	Lukas Reschke	2016-11-24	1	-3/+3
\|\
\| *	Fix some language issues in the federation admin panel	Joas Schilling	2016-11-24	1	-3/+3
* \|	Merge pull request #2290 from nextcloud/placeholder-typo-public-link-activity	Roeland Jago Douma	2016-11-24	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Fix placeholder typo in public link activity	Joas Schilling	2016-11-23	1	-1/+1
* \|	Merge pull request #2283 from nextcloud/no-padding-if-no-settings-area	Julius Härtl	2016-11-23	2	-0/+8
\|\ \ \| \|/ \|/\|
\| *	Remove padding from apps navigation if there is no settings area	Morris Jobke	2016-11-23	2	-0/+8
* \|	Merge pull request #2233 from nextcloud/change-link-to-11	Lukas Reschke	2016-11-23	1	-1/+1
\|\ \
\| * \|	Update link to the docs to 11	Lukas Reschke	2016-11-22	1	-1/+1
* \| \|	Merge pull request #2286 from nextcloud/ldap_password_pr-1	Lukas Reschke	2016-11-23	15	-6/+507
\|\ \ \
\| * \| \|	Add tests	Lukas Reschke	2016-11-23	7	-1/+268
\| * \| \|	restore ldap_password_pr	root	2016-11-23	11	-6/+240
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #2247 from nextcloud/avatar-fallback	Roeland Jago Douma	2016-11-23	2	-5/+5
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	fix unit tests	Morris Jobke	2016-11-23	1	-2/+2
\| * \|	use ? instead of X for avatar name fallback	Jan-Christoph Borchardt	2016-11-22	1	-3/+3
* \| \|	Merge pull request #2242 from nextcloud/fix-installation-spinner	Morris Jobke	2016-11-23	1	-2/+2
\|\ \ \
\| * \| \|	show installation spinner correctly, fix #2129	Jan-Christoph Borchardt	2016-11-22	1	-2/+2
* \| \| \|	Merge pull request #2281 from nextcloud/fix-translation	Morris Jobke	2016-11-23	2	-4/+4
\|\ \ \ \
\| * \| \| \|	Fix language typo	Joas Schilling	2016-11-23	2	-4/+4
* \| \| \| \|	Merge pull request #2232 from nextcloud/imagescale-fix	Lukas Reschke	2016-11-23	1	-1/+3
\|\ \ \ \ \
\| * \| \| \| \|	Workaround for PHP bug when calling imagescale	Julius Haertl	2016-11-22	1	-1/+3
* \| \| \| \| \|	Merge pull request #2278 from nextcloud/filelist-share-visible	Lukas Reschke	2016-11-23	1	-3/+9
\|\ \ \ \ \ \
\| * \| \| \| \| \|	improved style of shared entry	Morris Jobke	2016-11-23	1	-3/+8
\| * \| \| \| \| \|	make the share icon in the filelist visible again	Robin Appelman	2016-11-23	1	-0/+1
* \| \| \| \| \| \|	Merge pull request #2280 from nextcloud/do_not_escape_sharees	Lukas Reschke	2016-11-23	1	-9/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Do not escape sharees	Roeland Jago Douma	2016-11-23	1	-9/+3
* \| \| \| \| \| \| \|	Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_key	Lukas Reschke	2016-11-23	4	-0/+59
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	check if session is initialized	Bjoern Schiessle	2016-11-23	5	-3/+59
\| * \| \| \| \| \| \| \|	init Session/privateKeys on Master Key	Maxence Lange	2016-11-22	1	-0/+3
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2266 from nextcloud/avatar_image	Morris Jobke	2016-11-23	2	-7/+41
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	VCARDS don't hold binary data	Roeland Jago Douma	2016-11-23	2	-7/+41
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2275 from nextcloud/harden-cookies	Lukas Reschke	2016-11-23	3	-3/+110
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Harden cookies more appropriate	Lukas Reschke	2016-11-23	3	-3/+110
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #2262 from nextcloud/specify-parameters-on-public-download	Lukas Reschke	2016-11-23	1	-3/+9
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Specify the parameters on public download	Joas Schilling	2016-11-22	1	-3/+9
* \| \| \| \| \| \|	Merge pull request #2263 from nextcloud/remove91_migration	Lukas Reschke	2016-11-23	4	-234/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove 9.1 migration steps in app dav (#25654)	Thomas Müller	2016-11-22	4	-234/+0
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #2267 from nextcloud/issue-2254-react-to-remote-share-acti...	Lukas Reschke	2016-11-23	1	-2/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Only do stuff when its a remote-share activity	Joas Schilling	2016-11-22	1	-2/+3
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2239 from nextcloud/cleanup-settings-application-again	Joas Schilling	2016-11-23	1	-136/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Clean up the Application class again	Joas Schilling	2016-11-22	1	-136/+0
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #2250 from nextcloud/check-if-data-is-defined	Joas Schilling	2016-11-22	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Check if data is defined	Lukas Reschke	2016-11-22	1	-1/+1
* \| \| \| \| \|	Merge pull request #2251 from nextcloud/remove-superfluos-mail-input-field	Morris Jobke	2016-11-22	1	-28/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove superfluous email input field	Lukas Reschke	2016-11-22	1	-28/+0
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2246 from nextcloud/display-name-for-files-and-tagging-ac...	Lukas Reschke	2016-11-22	2	-8/+62
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	document new variable	Morris Jobke	2016-11-22	1	-0/+3
\| * \| \| \| \|	Use the display name for files activities again	Joas Schilling	2016-11-22	2	-8/+59
\| \|/ / / /
* \| \| \| \|	Merge pull request #2229 from nextcloud/select2-fix-bis	Lukas Reschke	2016-11-22	2	-5/+4
\|\ \ \ \ \