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

	Commit message (Expand)	Author	Age	Files	Lines
*	improvements for dropoimport	Georg Ehrke	2012-06-30	3	-7/+25
*	little fix for import	Georg Ehrke	2012-06-30	1	-1/+2
*	improve dropimport	Georg Ehrke	2012-06-30	3	-2/+23
*	Merge branch 'master' into calendar_import	Georg Ehrke	2012-06-30	8	-146/+233
\|\
\| *	fix documentation style	Georg Ehrke	2012-06-30	6	-101/+186
\| *	fix some doc	Georg Ehrke	2012-06-30	1	-42/+42
\| *	some improvements for calendar export	Georg Ehrke	2012-06-30	1	-2/+3
\| *	Contacts: align the bottom control buttons	Tom Needham	2012-06-30	1	-0/+1
\| *	Contacts: fix add contact icon path	Tom Needham	2012-06-30	1	-1/+1
* \|	import works now for dropimport	Georg Ehrke	2012-06-30	2	-22/+36
* \|	some work on (drop)import)	Georg Ehrke	2012-06-30	5	-86/+94
* \|	Merge branch 'master' into calendar_import	Georg Ehrke	2012-06-30	7	-41/+141
\|\\|
\| *	fix merge conflicts	Georg Ehrke	2012-06-30	20	-69/+123
\| \|\
\| \| *	Fix placeholder value for optional fields in external storage UI	Michael Gapczynski	2012-06-29	1	-1/+1
\| \| *	fix encryption test cases when not logged in	Robin Appelman	2012-06-30	1	-2/+6
\| \| *	Don't add duplicate contacts in the list when en-/disable an address book.	Thomas Tanghus	2012-06-29	1	-12/+14
\| * \|	fix for previous commit	Georg Ehrke	2012-06-28	1	-0/+1
\| * \|	use OC_Calendar_Export for publicly shared calendars	Georg Ehrke	2012-06-28	1	-13/+21
\| * \|	Calendar Export: replace spaces with dashes in the name of the calendar / event	Georg Ehrke	2012-06-28	1	-2/+2
\| * \|	some changes and more doc for OC_Calendar_Export class	Georg Ehrke	2012-06-28	1	-19/+55
\| * \|	fix calendar export for Apple iCal - i hate bloody line ends	Georg Ehrke	2012-06-28	1	-0/+3
\| * \|	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-28	3	-2/+40
\| \|\ \
\| * \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-28	11	-147/+172
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-27	1	-11/+48
\| \|\ \ \ \
\| * \| \| \| \|	fix style of some doc	Georg Ehrke	2012-06-27	1	-5/+5
\| * \| \| \| \|	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-27	10	-33/+57
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-27	13	-101/+257
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-26	41	-167/+246
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-23	9	-27/+35
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-22	52	-342/+320
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-21	10	-151/+158
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-20	13	-91/+416
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-20	28	-44/+448
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-20	8	-34/+69
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-18	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-18	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-18	7	-82/+125
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-17	1	-2/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-17	2	-2/+48
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-16	8	-25/+33
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-16	25	-43/+25
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-16	1	-2/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-16	15	-135/+177
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-15	4	-3/+12
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-15	33	-150/+840
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-13	35	-44/+166
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-13	47	-773/+4710
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-10	58	-465/+903
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-08	33	-259/+697
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into calendar_export	Georg Ehrke	2012-06-06	190	-757/+2558
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \