Commit Graph

180 Commits

Author SHA1 Message Date
Michael Gapczynski 78cd1153f0 Merge branch 'master' into share_api
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
Georg Ehrke 00d7ae8319 move calendar settings from personal settings to in app settings 2012-08-09 12:37:26 +02:00
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
Michael Gapczynski 4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Georg Ehrke f9d3388854 Merge branch 'master' into calendar_import 2012-07-21 17:37:10 +02:00
Georg Ehrke 57207ddb82 some style fixes for calendar 2012-07-21 17:09:10 +02:00
Georg Ehrke a4c2893128 some more work on calendar import - new import is (nearly) done 2012-07-04 21:14:40 +02:00
Georg Ehrke 657eef354a Merge branch 'master' into calendar_import 2012-07-04 13:03:30 +02:00
Georg Ehrke 393eefa5d2 replace some direct links with OC.imagePath 2012-07-03 23:44:47 +02:00
Georg Ehrke c036700c54 some more work on calendar import 2012-07-03 22:33:24 +02:00
Georg Ehrke 0b3ed2b048 Merge branch 'master' into calendar_import 2012-07-03 16:39:09 +02:00
Georg Ehrke ca2b1f7863 fix encoding fail in calendar app - bugfix for oc-1194 2012-07-03 13:55:48 +02:00
Georg Ehrke 29a9559fa9 some work on calendar import dialog 2012-07-03 13:43:18 +02:00
Georg Ehrke 803f2c2517 some work on calendar import 2012-07-01 21:36:09 +02:00
Georg Ehrke ce331bd1d3 improvements for dropoimport 2012-06-30 23:18:41 +02:00
Georg Ehrke f15941a967 improve dropimport 2012-06-30 22:26:29 +02:00
Georg Ehrke 390f5cc89f some work on (drop)import) 2012-06-30 15:17:29 +02:00
Robin Appelman 75af5778a4 pass progresskey the correct way during calender import 2012-06-29 00:49:37 +02:00
Bjoern Schiessle 8c28aec664 date don't change correctly in the view list (bug #973) fixed 2012-06-22 11:30:40 +02:00
Bart Visscher fd23c286ef Calendar: Fix caldav url encoding 2012-06-21 23:30:04 +02:00
Georg Ehrke 0f13cbb47d Merge branch 'master' into calendar_repeat 2012-06-20 20:14:08 +02:00
Bjoern Schiessle 5a2c93ec2d use sanitizeHTML() function 2012-06-20 15:11:14 +02:00
Georg Ehrke 2b2da6fe35 Calendar: js fix 2012-06-19 13:26:55 +02:00
Georg Ehrke 4767c70578 fix merge conflicts 2012-06-15 11:48:26 +02:00
Thomas Tanghus 3c75ac5f62 Update calendar after delete. 2012-06-15 02:07:32 +02:00
Bart Visscher 7a8e7f18db Calendar: Clicking #datecontrol_date gives datepicker to jump to date 2012-06-13 21:39:12 +02:00
Bart Visscher 4da6b3a391 Calendar: Make button of #datecontrol_date 2012-06-13 21:39:12 +02:00
Georg Ehrke 3c9be43aa4 add some information about repeating events caching on personal settings page 2012-06-11 22:16:26 +02:00
Georg Ehrke ef1b04619d fix merge conflicts 2012-06-10 18:38:01 +02:00
Georg Ehrke 2862740674 increase height of event dialog 2012-06-09 15:38:03 +02:00
Georg Ehrke 28ab92ee76 make use of post instead of get 2012-06-09 14:41:26 +02:00
Georg Ehrke 2fa19ce9a0 Merge branch 'master' into calendar_repeat 2012-06-06 10:12:11 +02:00
Bart Visscher 091b343d5c Calendar & Contacts: Store import progress in OC_Cache
Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
2012-06-04 22:24:17 +02:00
Georg Ehrke 482caa04f9 add button to clear calendar's cache 2012-05-29 13:34:27 +02:00
Georg Ehrke 5e7b318e42 add urlencode for caldav link 2012-05-28 10:49:27 +02:00
Georg Ehrke a1c9191006 fix share for users with a point within their name 2012-05-26 15:23:46 +02:00
Georg Ehrke 38b93653a1 Merge branch 'master' into calendar_dropimport 2012-05-17 22:17:06 +02:00
Georg Ehrke 6146b6a131 fix paths to images and set height for calendar management dialog 2012-05-17 21:51:38 +02:00
Georg Ehrke 0892abd050 some little js fixes for drop import 2012-05-13 15:08:27 +02:00
Georg Ehrke 63a1b066bc add first version of drop import 2012-05-13 15:05:57 +02:00
Bart Visscher da1da8197e Calendar: Resize content after creating calendar layout
The calendar can be higher than the window, this corrects for the scrollbar
2012-05-08 18:40:40 +02:00
Georg Ehrke ef073a148f make calendar compatible with public.php 2012-05-07 15:48:41 +02:00
Georg Ehrke 6c908a4cd0 fix path in calendars geo.js 2012-04-30 21:18:54 +02:00
Thomas Mueller 07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Georg Ehrke de71842888 implement shared calendar activation on server side 2012-04-18 11:50:12 +02:00
Georg Ehrke 8959e0af3d implement shared calendar activation on js-side 2012-04-18 11:39:00 +02:00
Georg Ehrke afcb0aee40 fix merge conflicts 2012-04-13 16:40:10 -04:00
Georg Ehrke 02dc343209 fix address of public shared calendars 2012-04-13 16:26:06 -04:00
Bart Visscher 9165b5c28e Use the same category input and management as the contacts app 2012-04-12 23:10:49 +02:00
Georg Ehrke 8b9d439841 Calendar: fix address for import file 2012-03-26 15:37:47 +02:00