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 branch 'master' into lib-private-master-2	Thomas Müller	2013-09-30	1	-0/+1
\|\
\| *	Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled	Thomas Müller	2013-09-30	1	-0/+1
\| \|\
\| \| *	introduce OC_Util::rememberLoginAllowed()	Bjoern Schiessle	2013-09-24	1	-1/+1
\| \| *	don't remember login if the encrypion app is enabled because the user	Bjoern Schiessle	2013-09-24	1	-0/+1
* \| \|	move the private namespace OC into lib/private - OCP will stay in lib/public	Thomas Müller	2013-09-30	1	-1/+1
\|/ /
* \|	Merge branch 'master' into appframework-master	Thomas Müller	2013-09-25	1	-0/+1
\|\\|
\| *	Merge pull request #4684 from owncloud/improved-console	Bart Visscher	2013-09-19	1	-0/+1
\| \|\
\| \| *	Use more object oriented way for console commands	Bart Visscher	2013-09-01	1	-0/+1
* \| \|	Note to self 2: Do as you preach. Test!	Thomas Tanghus	2013-09-18	1	-1/+1
* \| \|	Note to self: Test before pushing!!!	Thomas Tanghus	2013-09-18	1	-1/+1
* \| \|	Use new emitter system	Thomas Tanghus	2013-09-18	1	-1/+3
* \| \|	OC_Cache namespace changes and add UserCache to server container.	Thomas Tanghus	2013-09-17	1	-2/+2
* \| \|	/OC/Server has created too early causing issues with config operations as OC:...	Thomas Müller	2013-09-15	1	-3/+3
* \| \|	Merge branch 'master' into appframework-master	Thomas Müller	2013-09-15	1	-0/+8
\|\\| \|
\| * \|	Merge branch 'master' into oc_avatars	kondou	2013-09-12	1	-10/+5
\| \|\ \
\| * \ \	Merge branch 'master' into oc_avatars	kondou	2013-09-04	1	-4/+4
\| \|\ \ \
\| * \| \| \|	Provide 'enable_avatars' in config.php, to disable avatars	kondou	2013-09-01	1	-5/+7
\| * \| \| \|	Merge branch 'master' into oc_avatars	kondou	2013-08-31	1	-9/+26
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Use defaultavatars	kondou	2013-08-29	1	-0/+6
* \| \| \| \|	Merge branch 'master' into appframework-master	Thomas Müller	2013-09-13	1	-14/+18
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Revert "fixes #4574"	Thomas Müller	2013-09-06	1	-10/+5
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'master' into clean_up_util	kondou	2013-09-02	1	-15/+51
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge master into oc_preview	Georg Ehrke	2013-08-30	1	-9/+17
\| \| \|\ \
\| \| * \ \	Merge master into oc_preview	Georg Ehrke	2013-08-29	1	-6/+25
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	Merge branch 'master' into oc_preview	Georg Ehrke	2013-08-23	1	-16/+19
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'master' into oc_preview	Thomas Müller	2013-07-30	1	-31/+22
\| \| \|\ \ \ \
\| \| * \ \ \ \	merge conflicts ...	Georg Ehrke	2013-07-10	1	-10/+20
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'master' into oc_preview	Georg Ehrke	2013-06-17	1	-4/+1
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'master' into oc_preview	Georg Ehrke	2013-06-06	1	-7/+16
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'master' into oc_preview	Georg Ehrke	2013-05-29	1	-17/+28
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	move to OC namespace	Georg Ehrke	2013-05-29	1	-2/+2
\| \| * \| \| \| \| \| \| \| \|	connect preview lib to filesystem hooks	Georg Ehrke	2013-05-29	1	-0/+9
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into clean_up_util	kondou	2013-08-20	1	-16/+19
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix some naming and spacing in lib/util.php	kondou	2013-08-18	1	-2/+2
\| * \| \| \| \| \| \| \| \| \|	Clean up \OC\Util	kondou	2013-08-15	1	-4/+4
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' into appframework-master	Thomas Müller	2013-08-31	1	-15/+42
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #4661 from owncloud/separate-app-styles	Jan-Christoph Borchardt	2013-08-30	1	-1/+3
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	move CSS for browser-specific fixes out of styles.css into new fixes.css	Jan-Christoph Borchardt	2013-08-30	1	-0/+1
\| \| * \| \| \| \| \| \| \| \|	move CSS for apps out of styles.css into new apps.css	Jan-Christoph Borchardt	2013-08-30	1	-1/+2
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #4578 from houbaastef/master	Stephane Martin	2013-08-30	1	-5/+10
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	fixes #4574	Stephane Martin	2013-08-26	1	-5/+10
\| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use the real username in preferences and magic cookie instead of case-insensi...	Arthur Schiwon	2013-08-30	1	-3/+4
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Only enable logrotate when configured. Also rotate size is settable.	Bart Visscher	2013-08-28	1	-1/+2
\| * \| \| \| \| \| \| \|	Check for installed state before registering the logrotate background job	Bart Visscher	2013-08-28	1	-1/+15
\| * \| \| \| \| \| \| \|	Very simple log rotation	Bart Visscher	2013-08-28	1	-0/+1
\| * \| \| \| \| \| \| \|	Merge pull request #3891 from owncloud/fix_loadAppScriptFile	Bart Visscher	2013-08-28	1	-5/+8
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Check if the app is enabled and the app path is found before trying to load t...	Bart Visscher	2013-06-28	1	-5/+8
\| * \| \| \| \| \| \| \| \|	Merge pull request #4434 from owncloud/fix_octemplate_escaping	Thomas Tanghus	2013-08-28	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix octemplate string escaping.	Thomas Tanghus	2013-08-14	1	-1/+1
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' into appframework-master	Thomas Müller	2013-08-26	1	-16/+19
\|\\| \| \| \| \| \| \| \|