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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into calendar_import	Georg Ehrke	2012-07-21	1	-1/+1
\|\
\| *	remove second "autocomplete" statement	Bjoern Schiessle	2012-07-18	1	-1/+1
\| \|
\| *	remember username and provide autocomplete feature	Bjoern Schiessle	2012-07-18	1	-1/+1
\| \|
* \|	Merge branch 'master' into oc_error	Georg Ehrke	2012-06-26	1	-1/+1
\|\\|
\| *	add x-webkit-speech to searchbox	Georg Ehrke	2012-06-24	1	-1/+1
\| \|
* \|	Merge branch 'master' into oc_error	Georg Ehrke	2012-06-22	3	-4/+4
\|\\|
\| *	Merge branch 'master' into multi_app_dir	Brice Maron	2012-06-21	2	-4/+4
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/app.php lib/base.php lib/minimizer/css.php lib/minimizer/js.php lib/template.php lib/util.php
\| \| *	use new sanitizeHTML() function	Bjoern Schiessle	2012-06-21	2	-2/+2
\| \| \|
\| * \|	Merge branch 'master' into multi_app_dir	Brice Maron	2012-06-14	4	-6/+16
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php
\| * \| \|	Change app path logic in templates	Brice Maron	2012-06-06	2	-3/+2
\| \| \| \|
\| * \| \|	Unit path and webpath, correct some more	Brice Maron	2012-06-06	1	-1/+2
\| \| \| \|
* \| \| \|	Merge branch 'master' into oc_error	Georg Ehrke	2012-06-19	1	-1/+1
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	CSS class headerAction -> header-action	Florian Hülsmann	2012-06-18	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' into oc_error	Georg Ehrke	2012-06-18	1	-2/+2
\|\\| \| \|
\| * \| \|	corrected header width and floating (can now dynamically add stuff to ↵	Florian Hülsmann	2012-06-18	1	-2/+2
\| \| \|/ \| \|/\| \| \| \| \| \| \|	header); someone may test this in IE
* \| \|	Merge branch 'master' into oc_error	Georg Ehrke	2012-06-15	3	-2/+12
\|\\| \|
\| * \|	Make requesttoken global.	Thomas Tanghus	2012-06-14	1	-1/+1
\| \| \|
\| * \|	Merge commit 'refs/merge-requests/127' of ↵	Michael Gapczynski	2012-06-13	2	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git://gitorious.org/owncloud/owncloud into merge-requests/127 Conflicts: apps/files_external/templates/settings.php lib/template.php
\| \| * \|	Removed some unessecary sanitizations	Lukas Reschke	2012-06-11	1	-1/+1
\| \| \| \|
\| \| * \|	Make some apps compatible	Lukas Reschke	2012-06-11	1	-1/+1
\| \| \| \|
\| * \| \|	Added JSON methods for CSRF prevention. Make request token accessible from ↵	Thomas Tanghus	2012-06-13	1	-0/+10
\| \|/ / \| \| \| \| \| \| \| \| \|	template and add js var.
* \| \|	fix merge conflicts	Georg Ehrke	2012-06-08	2	-4/+4
\|\\| \|
\| * \|	Better handling of core.css and core.js	Bart Visscher	2012-06-07	2	-4/+4
\| \|/ \| \| \| \| \| \| \| \|	Fixes calling remote.php on install. Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
* \|	Merge branch 'master' into oc_error	Georg Ehrke	2012-06-06	2	-0/+12
\|\\|
\| *	Merge branch 'unstable'	Bart Visscher	2012-06-04	2	-0/+12
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files_external/tests/config.php apps/files_versions/ajax/getVersions.php apps/files_versions/appinfo/app.php apps/files_versions/history.php apps/files_versions/js/versions.js apps/files_versions/templates/history.php apps/files_versions/versions.php lib/base.php
\| \| *	Combine and minimize core and default app js files	Bart Visscher	2012-05-16	2	-0/+6
\| \| \|
\| \| *	Combine and minimize core and default app css files	Bart Visscher	2012-05-16	2	-0/+6
\| \| \|
* \| \|	Merge branch 'master' into oc_error	Georg Ehrke	2012-05-25	1	-1/+1
\|\\| \|
\| * \|	add htmlentities() call into login form	Michiel de Jong	2012-05-18	1	-1/+1
\| \| \|
* \| \|	Merge branch 'master' into oc_error	Georg Ehrke	2012-05-17	2	-2/+2
\|\\| \|
\| * \|	Merge commit 'refs/merge-requests/115' of ↵	Michael Gapczynski	2012-05-17	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git://gitorious.org/owncloud/owncloud into merge-requests/115 Conflicts: apps/files/templates/index.php
\| \| * \|	Fix some non-utf8-friendly htmlentities (resulting in wrong display of ↵	Vitaly Kuznetsov	2012-05-10	1	-1/+1
\| \| \|/ \| \| \| \| \| \| \| \| \|	utf8-encoded directory names for example)
\| * \|	Sanitize search queries, thanks to Lukas Reschke	Michael Gapczynski	2012-05-13	1	-1/+1
\| \| \|
* \| \|	Merge branch 'master' into oc_error	Georg Ehrke	2012-05-13	3	-2/+5
\|\\| \|
\| * \|	Remove duplicate line	Bart Visscher	2012-05-11	1	-1/+0
\| \|/
\| *	Made the global settings icon accessable via keyboard.	Thomas Tanghus	2012-05-04	1	-1/+1
\| \| \| \| \| \| \| \|	Bug http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-561
\| *	add appswebroot to the guest template	Georg Ehrke	2012-05-02	1	-0/+1
\| \|
\| *	show the username in the title. good idea.	Frank Karlitschek	2012-04-30	1	-1/+1
\| \|
\| *	Merge branch 'master' into movable_apps_2	Georg Ehrke	2012-04-27	1	-0/+1
\| \|\
\| \| *	some more csrf fixes	Frank Karlitschek	2012-04-26	1	-0/+1
\| \| \|
\| * \|	fix loading of css files that are core related	Georg Ehrke	2012-04-26	1	-0/+1
\| \| \|
\| * \|	fix position of Semicolon	Georg Ehrke	2012-04-24	1	-1/+1
\| \| \|
\| * \|	fix pathes in contacts	Georg Ehrke	2012-04-24	1	-0/+1
\| \|/
* \|	fix merge conflicts	Georg Ehrke	2012-04-22	2	-2/+2
\|\\|
\| *	fix 2 potential xss problems	Robin Appelman	2012-04-16	1	-1/+1
\| \|
\| *	updated logos and icons	Jan-Christoph Borchardt	2012-04-16	1	-1/+1
\| \|
* \|	Merge branch 'master' into oc_error	Georg Ehrke	2012-04-15	1	-1/+1
\|\\|
\| *	fixed settings hover, now whole row sensitive and fading not jerky	Jan-Christoph Borchardt	2012-04-15	1	-1/+1
\| \|
* \|	fix merge conflicts	Georg Ehrke	2012-04-13	2	-2/+2
\|\\|
\| *	add a title attribute to the logout button	Frank Karlitschek	2012-04-12	1	-1/+1
\| \|