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 master...	Lukas Reschke	2013-01-23	207	-1883/+8268
\|\
\| *	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-01-23	166	-1081/+4115
\| *	Merge pull request #1113 from owncloud/fix-issue-1085	Michael Gapczynski	2013-01-22	6	-18/+24
\| \|\
\| \| *	Make database connection error messages less verbose	Michael Gapczynski	2013-01-21	1	-2/+3
\| \| *	returning http status code 503 in case connecting to the database failed	Thomas Mueller	2013-01-21	1	-0/+8
\| \| *	Merge branch 'master' into fix-issue-1085	Michael Gapczynski	2013-01-07	148	-2782/+3647
\| \| \|\
\| \| * \|	Move template parameters around so database error page is properly rendered	Michael Gapczynski	2013-01-07	6	-18/+15
\| * \| \|	Merge pull request #1259 from TheSFReader/master	Thomas Müller	2013-01-22	1	-0/+2
\| \|\ \ \
\| \| * \| \|	Add ebook specific mimetypes	TheSFReader	2013-01-17	1	-1/+0
\| \| * \| \|	Add ebook specific mimetypes	TheSFReader	2013-01-17	1	-0/+3
\| * \| \| \|	Merge pull request #1237 from owncloud/fix-template-tests	icewind1991	2013-01-22	1	-4/+0
\| \|\ \ \ \
\| \| * \| \| \|	Remove unnecessary ob_end_clean() from template tests	Michael Gapczynski	2013-01-19	1	-4/+0
\| * \| \| \| \|	Merge pull request #1105 from owncloud/files_encryption	Sam Tuke	2013-01-22	38	-793/+4118
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge branch 'master' into files_encryption	Sam Tuke	2013-01-22	740	-9271/+9056
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Removed depreciated file	Sam Tuke	2013-01-22	1	-0/+0
\| \| * \| \| \| \|	Added localisation for encryption settings	Sam Tuke	2013-01-22	2	-27/+114
\| \| * \| \| \| \|	Merge branch 'master' into files_encryption	Sam Tuke	2013-01-22	331	-3181/+3552
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Removed debugging comments	Sam Tuke	2013-01-14	1	-49/+0
\| \| * \| \| \| \| \|	Removed old and unnecessary comments	Sam Tuke	2013-01-10	1	-7/+0
\| \| * \| \| \| \| \|	Removed misleading crypto gen comment	Sam Tuke	2013-01-10	1	-2/+0
\| \| * \| \| \| \| \|	Removed unnecessary line	Sam Tuke	2013-01-10	1	-1/+0
\| \| * \| \| \| \| \|	Removed phantom depreciated files	Sam Tuke	2013-01-10	2	-96/+0
\| \| * \| \| \| \| \|	Merge branch 'master' into files_encryption	Sam Tuke	2013-01-10	247	-4949/+7068
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Re-added 'checkAdminUser'	Sam Tuke	2013-01-10	1	-6/+10
\| \| * \| \| \| \| \| \|	Merge branch 'master' into files_encryption	Sam Tuke	2013-01-06	10	-55/+177
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	All in-use unit tests now passing after merge	Sam Tuke	2013-01-06	15	-540/+513
\| \| * \| \| \| \| \| \| \|	Removed debugging line	Sam Tuke	2013-01-06	1	-1/+1
\| \| * \| \| \| \| \| \| \|	Made Keymanager::getFileKey() dependencies explicit, fixed client code and te...	Sam Tuke	2013-01-06	4	-7/+11
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into files_encryption	Sam Tuke	2013-01-05	184	-3746/+6986
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Development snapshot	Sam Tuke	2013-01-05	7	-77/+95
\| \| * \| \| \| \| \| \| \| \|	Development snapshot, mocking out Session{} for crypt unit tests	Sam Tuke	2013-01-02	5	-20/+35
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into files_encryption	Sam Tuke	2013-01-02	678	-13489/+26607
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into files_encryption	Sam Tuke	2012-12-12	2390	-379263/+52234
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Improved formatting of getPublicKeys()	Sam Tuke	2012-12-11	1	-7/+36
\| \| * \| \| \| \| \| \| \| \| \| \|	Changing user login pwd now correctly changes encryption key passphrase	Sam Tuke	2012-12-11	5	-111/+128
\| \| * \| \| \| \| \| \| \| \| \| \|	Reverted temporary changes to core lib files	Sam Tuke	2012-12-11	2	-5/+5
\| \| * \| \| \| \| \| \| \| \| \| \|	Replaced phpseclib calls with symmetric re-encryption of user private key	Sam Tuke	2012-12-11	3	-23/+15
\| \| * \| \| \| \| \| \| \| \| \| \|	Revert "Revert "Development snapshot""	Sam Tuke	2012-12-11	10	-74/+227
\| \| * \| \| \| \| \| \| \| \| \| \|	Revert "Development snapshot"	Sam Tuke	2012-12-11	10	-227/+74
\| \| * \| \| \| \| \| \| \| \| \| \|	Added library phpseclib	Sam Tuke	2012-12-11	24	-28/+24282
\| \| * \| \| \| \| \| \| \| \| \| \|	Development snapshot	Sam Tuke	2012-12-05	10	-74/+227
\| \| * \| \| \| \| \| \| \| \| \| \|	Development Snapshot	Sam Tuke	2012-12-04	5	-45/+176
\| \| * \| \| \| \| \| \| \| \| \| \|	Development snapshot	Sam Tuke	2012-11-28	7	-268/+316
\| \| * \| \| \| \| \| \| \| \| \| \|	Development snapshot	Sam Tuke	2012-11-22	1	-18/+29
\| \| * \| \| \| \| \| \| \| \| \| \|	Development snapshot	Sam Tuke	2012-11-22	2	-42/+30
\| \| * \| \| \| \| \| \| \| \| \| \|	Development snapshot	Sam Tuke	2012-11-22	3	-34/+33
\| \| * \| \| \| \| \| \| \| \| \| \|	Added unit tests for legacy encryption methods	Sam Tuke	2012-11-20	3	-7/+117
\| \| * \| \| \| \| \| \| \| \| \| \|	Development snapshot, lots of fixes	Sam Tuke	2012-11-16	8	-76/+176
\| \| * \| \| \| \| \| \| \| \| \| \|	Added unit tests for setupServerSide(), key paths, and ready()	Sam Tuke	2012-11-16	1	-3/+114
\| \| * \| \| \| \| \| \| \| \| \| \|	Fixing use of splitIv	Sam Tuke	2012-11-15	2	-28/+21