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 #1474 from samtuke/master	Lukas Reschke	2013-02-05	16	-489/+783
\|\
\| *	Fixed comment typo, wrapped return value conditional on var assignment in ses...	Sam Tuke	2013-02-05	2	-3/+5
\| *	Added missing translation wrapping	Sam Tuke	2013-02-05	1	-1/+3
\| *	Added notice to personal settings indicating what filetypes are not encrypted	Sam Tuke	2013-02-05	3	-48/+23
\| *	Removed debugging output	Sam Tuke	2013-02-05	2	-12/+0
\| *	Fixed bug relating to Filesystem{} that prevented webdav logins with files_en...	Sam Tuke	2013-02-05	1	-50/+52
\| *	Cleaned up path formatting with new method stripUserFilesPath()	Sam Tuke	2013-02-05	2	-20/+22
\| *	Recryption of legacy encrypted files now working on login	Sam Tuke	2013-02-05	2	-7/+20
\| *	Merge github.com:owncloud/core	Sam Tuke	2013-02-05	179	-405/+2556
\| \|\
\| * \|	Added debugging output relating to recrypting legacy files	Sam Tuke	2013-02-01	2	-3/+16
\| * \|	Improved support for detecting and recrypting legacy files. Bugs remain.	Sam Tuke	2013-01-31	4	-17/+37
\| * \|	Fixed compatibility with filecache rewrite merge	Sam Tuke	2013-01-31	1	-1/+1
\| * \|	Fixed incompatibilities with filecache rewrite merge	Sam Tuke	2013-01-31	2	-7/+7
\| * \|	Merge github.com:owncloud/core	Sam Tuke	2013-01-31	196	-1383/+3259
\| \|\ \
\| * \| \|	Fixed handling of keyfile subdir creation	Sam Tuke	2013-01-30	2	-84/+24
\| * \| \|	Working on support for deleting directories (removing all keyfiles)	Sam Tuke	2013-01-30	1	-13/+19
\| * \| \|	Made encyrption keyfiles be deleted when their parents are	Sam Tuke	2013-01-29	5	-34/+142
\| * \| \|	Fixed many coding guidelines issues	Sam Tuke	2013-01-24	12	-177/+282
\| * \| \|	Work on util: findFiles() and encryptAll(); both close to working	Sam Tuke	2013-01-23	9	-181/+213
\| * \| \|	Merge branch 'files_encryption'	Sam Tuke	2013-01-23	8	-53/+139
\| \|\ \ \
\| \| * \| \|	Adding sharing support: added new method in Keymanager setShareKey()	Sam Tuke	2013-01-14	6	-50/+125
\| \| * \| \|	Merge branch 'master' into files_encryption	Sam Tuke	2013-01-14	35	-319/+547
\| \| \|\ \ \
\| \| * \| \| \|	Added creation of dir for shared file env encryption keys	Sam Tuke	2013-01-14	2	-3/+14
* \| \| \| \| \|	Remove undefined crumb variable from home breadcrumb	Michael Gapczynski	2013-02-04	1	-1/+1
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-02-05	15	-3/+179
* \| \| \| \|	Merge pull request #1432 from owncloud/add_requesttoken	Thomas Tanghus	2013-02-04	2	-1/+4
\|\ \ \ \ \
\| * \| \| \| \|	[user_webdavauth] add requesttoken	Lukas Reschke	2013-02-03	2	-1/+4
* \| \| \| \| \|	Merge pull request #1434 from owncloud/trashbin_CSRF	Björn Schießle	2013-02-04	1	-3/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	OCP\JSON instead of OCP\User	Lukas Reschke	2013-02-04	1	-1/+1
\| * \| \| \| \| \|	[files_trashbin] Add CSRF token	Lukas Reschke	2013-02-03	1	-3/+2
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #1229 from owncloud/from_live_to_on	Thomas Müller	2013-02-03	5	-16/+15
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into from_live_to_on	Thomas Mueller	2013-01-31	164	-1310/+4003
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	attach on to filelist instead of individual td elements for file link behaviour	Jörn Friedrich Dreyer	2013-01-30	1	-1/+1
\| * \| \| \| \| \| \|	replace live() with on() in core js	Jörn Friedrich Dreyer	2013-01-30	5	-15/+15
* \| \| \| \| \| \| \|	Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master	Thomas Müller	2013-02-03	3	-1/+6
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	call ajax scan only if a user is logged in - otherwise we'll get a 500	Thomas Mueller	2013-01-31	1	-0/+4
\| * \| \| \| \| \| \| \|	Merge branch 'master' into fixing-js-errors-public-link-master	Thomas Mueller	2013-01-31	176	-1305/+4159
\| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	call ajax scan only if a user is logged in - otherwise we'll get a 500	Thomas Mueller	2013-01-28	1	-5/+7
\| * \| \| \| \| \| \| \|	include keyboardshortcuts.js	Thomas Mueller	2013-01-28	1	-0/+1
\| * \| \| \| \| \| \| \|	fixing href for folders	Thomas Mueller	2013-01-28	1	-1/+1
* \| \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-02-04	15	-35/+135
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1422 from TheSFReader/master	Thomas Müller	2013-02-03	1	-1/+2
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'refs/remotes/upstream/master'	TheSFReader	2013-02-02	71	-37/+299
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'refs/remotes/upstream/master'	TheSFReader	2013-02-01	69	-11/+452
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Correct it	TheSFReader	2013-02-01	1	-1/+2
* \| \| \| \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-02-03	46	-204/+260
\| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1415 from owncloud/ldap_fix_settings	Lukas Reschke	2013-02-01	2	-20/+32
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	remove ugly whitespace	Arthur Schiwon	2013-02-01	1	-1/+1
\| * \| \| \| \| \| \| \| \| \|	LDAP: settings Advanced tab has grown too long by far. Structure it using acc...	Arthur Schiwon	2013-02-01	2	-20/+32
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* / \| \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-02-02	69	-17/+267
\|/ / / / / / / / /