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

	Commit message (Expand)	Author	Age	Files	Lines
*	ownCloud 6 RC1v6.0.0RC1	Frank Karlitschek	2013-11-28	1	-2/+2
*	Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename	Frank Karlitschek	2013-11-28	5	-26/+87
\|\
\| *	Fixed unit tests for ajax rename	Vincent Petry	2013-11-27	1	-19/+44
\| *	Update file list entry on rename	Vincent Petry	2013-11-27	2	-7/+29
\| *	Redetect mime type whenever extension is renamed	Vincent Petry	2013-11-27	2	-0/+14
* \|	Merge pull request #6096 from owncloud/files-txtextfornewfiles	Vincent Petry	2013-11-28	2	-5/+15
\|\ \
\| * \|	Moved new file extension out of the translated string	Vincent Petry	2013-11-28	1	-1/+1
\| * \|	New file box now has default file name + extension	Vincent Petry	2013-11-28	2	-5/+15
* \| \|	Merge pull request #6070 from ganomi/showstars	Frank Karlitschek	2013-11-28	1	-1/+1
\|\ \ \
\| * \| \|	Show stars as placeholder	ganomi	2013-11-26	1	-1/+1
* \| \| \|	Merge pull request #6072 from owncloud/mssql-fix-schema-migration-oc6	Frank Karlitschek	2013-11-28	1	-0/+2
\|\ \ \ \
\| * \| \| \|	on mssql the schema migration sometimes fails due to an already existing tran...	Thomas Mueller	2013-11-26	1	-0/+2
* \| \| \| \|	Merge pull request #6094 from owncloud/enc_fix_reshares	Vincent Petry	2013-11-28	1	-2/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	fix path reconstruction for reshares	Bjoern Schiessle	2013-11-27	1	-2/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #6084 from owncloud/fix-app-routing	Thomas Müller	2013-11-28	1	-1/+5
\|\ \ \ \
\| * \| \| \|	Fix getRawPathInfo for the '/' edge case	Robin Appelman	2013-11-27	1	-1/+5
\| * \| \| \|	fix custom routes defined by apps	Robin Appelman	2013-11-27	1	-1/+1
* \| \| \| \|	Merge pull request #6048 from owncloud/encryption_initial_enc_indicator	Morris Jobke	2013-11-27	6	-17/+89
\|\ \ \ \ \
\| * \| \| \| \|	improve encryption message	Morris Jobke	2013-11-27	3	-2/+6
\| * \| \| \| \|	some small js fixes	Bjoern Schiessle	2013-11-27	1	-2/+2
\| * \| \| \| \|	add spinner to the template so that it can be loaded in time	Bjoern Schiessle	2013-11-27	2	-1/+3
\| * \| \| \| \|	switch to large spinner	Bjoern Schiessle	2013-11-27	3	-2/+7
\| * \| \| \| \|	switch from "name" attribute to "id"	Bjoern Schiessle	2013-11-27	2	-3/+3
\| * \| \| \| \|	Merge branch 'master' into encryption_initial_enc_indicator	Bjoern Schiessle	2013-11-27	33	-156/+720
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	with the latest changes in master $this-userID is always the correct ID, so w...	Bjoern Schiessle	2013-11-27	2	-25/+21
\| * \| \| \| \|	Merge branch 'master' into encryption_initial_enc_indicator	Bjoern Schiessle	2013-11-26	289	-1892/+3226
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	added a small version of the dark loading gif, looks nicer on the blue backgr...	Bjoern Schiessle	2013-11-26	2	-1/+1
\| * \| \| \| \|	use POST instead of GET	Bjoern Schiessle	2013-11-26	2	-3/+3
\| * \| \| \| \|	fix typo in var name	Bjoern Schiessle	2013-11-26	1	-1/+1
\| * \| \| \| \|	remove debug output	Bjoern Schiessle	2013-11-25	1	-1/+0
\| * \| \| \| \|	show a message at the log-in screen if inital encryption take place	Bjoern Schiessle	2013-11-25	5	-7/+73
* \| \| \| \| \|	Merge pull request #6088 from owncloud/fix_public_previews	Björn Schießle	2013-11-27	1	-3/+7
\|\ \ \ \ \ \
\| * \| \| \| \| \|	fix public preview creation if a user ios logged in	Bjoern Schiessle	2013-11-27	1	-3/+7
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash	Björn Schießle	2013-11-27	4	-39/+116
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fixed sharing hook to not remove the share before the trashbin	Vincent Petry	2013-11-27	2	-1/+7
\| * \| \| \| \| \|	only create complete share key if we know the exact path	Bjoern Schiessle	2013-11-26	1	-1/+3
\| * \| \| \| \| \|	move files to owners trash	Bjoern Schiessle	2013-11-25	2	-41/+110
* \| \| \| \| \| \|	Merge pull request #6086 from owncloud/incognito_mode	Morris Jobke	2013-11-27	1	-2/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	return false if user is in incognito mode	Bjoern Schiessle	2013-11-27	1	-2/+2
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* / \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-11-27	274	-11244/+15279
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5977 from owncloud/encryption_enable_public_upload	Vincent Petry	2013-11-27	8	-22/+17
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into encryption_enable_public_upload	Bjoern Schiessle	2013-11-27	828	-13068/+16529
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #5976 from owncloud/encryption_work_with_public_gallery	Thomas Müller	2013-11-27	7	-93/+123
\|\ \ \ \ \ \
\| * \| \| \| \| \|	typo fixed	Bjoern Schiessle	2013-11-27	1	-1/+1
\| * \| \| \| \| \|	some small changes according to the review comments	Bjoern Schiessle	2013-11-27	7	-18/+19
\| * \| \| \| \| \|	Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/cor...	Bjoern Schiessle	2013-11-25	731	-11649/+12619
\| \|\ \ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'master' into encryption_work_with_public_gallery	Thomas Mueller	2013-11-24	731	-11649/+12619
\| \| \|\ \ \ \ \ \
\| * \| \| \| \| \| \| \|	fix typo in comment	Bjoern Schiessle	2013-11-25	1	-1/+1
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #6027 from owncloud/public-api-restful-routing-oc6	Morris Jobke	2013-11-27	3	-2/+29
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	add PHPDoc for urlParams	Morris Jobke	2013-11-27	1	-0/+1