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 #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
\| * \| \| \| \| \| \| \|	adding documentation for registerRoutes()	Thomas Müller	2013-11-25	1	-1/+13
\| * \| \| \| \| \| \| \|	fix appframework routing	Thomas Müller	2013-11-25	3	-2/+16
* \| \| \| \| \| \| \| \|	Merge pull request #5955 from owncloud/fix5863	blizzz	2013-11-27	6	-30/+195
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	LDAP Wizard: clear the cache on save so changes have immediate effect	Arthur Schiwon	2013-11-20	1	-0/+3
\| * \| \| \| \| \| \| \| \|	LDAP Wizard: proper behaviour for raw filter input. remember the editing mode...	Arthur Schiwon	2013-11-19	4	-27/+163
\| * \| \| \| \| \| \| \| \|	LDAP Wizard: move raw login filter field from advanced tab to login filter ta...	Arthur Schiwon	2013-11-14	3	-3/+29
* \| \| \| \| \| \| \| \| \|	Merge pull request #6075 from owncloud/ssl-warning	Thomas Müller	2013-11-27	1	-0/+14
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	fix wording	Morris Jobke	2013-11-27	1	-1/+1
\| * \| \| \| \| \| \| \| \| \|	add warning for HTTP connection	Morris Jobke	2013-11-27	1	-0/+14
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #6071 from owncloud/db-documentation	Thomas Müller	2013-11-27	1	-0/+107
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix spacing.	Andreas Fischer	2013-11-26	1	-0/+16
\| * \| \| \| \| \| \| \| \|	db-doc: privatedata description	Andreas Fischer	2013-11-26	1	-1/+6
\| * \| \| \| \| \| \| \| \|	db-doc: vcategory* descriptions	Andreas Fischer	2013-11-26	1	-2/+8
\| * \| \| \| \| \| \| \| \|	db-doc: users description	Andreas Fischer	2013-11-26	1	-1/+3
\| * \| \| \| \| \| \| \| \|	db-doc: jobs description	Andreas Fischer	2013-11-26	1	-1/+4
\| * \| \| \| \| \| \| \| \|	db-doc: share description	Andreas Fischer	2013-11-26	1	-1/+14
\| * \| \| \| \| \| \| \| \|	db-doc: properties description	Andreas Fischer	2013-11-26	1	-1/+4