mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
nextcloud/apps/calendar
History
Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
 		2012-07-25 17:08:18 -04:00
..
ajax Merge branch 'master' into calendar_import 2012-07-21 17:37:10 +02:00
appinfo Merge branch 'master' into calendar_import 2012-07-21 17:37:10 +02:00
css some more work on calendar import - new import is (nearly) done 2012-07-04 21:14:40 +02:00
img removing executable bit from various files 2012-04-30 12:05:57 +02:00
js Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
l10n [tx-robot] updated from transifex 2012-07-25 22:15:24 +02:00
lib Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
templates Merge branch 'master' into calendar_import 2012-07-21 17:37:10 +02:00
caldav.php add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav 2012-05-16 21:05:15 +02:00
export.php Calendar Export: replace spaces with dashes in the name of the calendar / event 2012-06-28 19:04:14 +02:00
index.php Only create new calendar when there are none. Fix oc-1007. 2012-06-15 01:55:02 +02:00
settings.php Implemented Sabre iCalendar Export Plugin. 2012-07-08 16:58:17 +02:00
share.php fix for previous commit 2012-06-28 19:13:43 +02:00