Commit Graph

290 Commits (master)

Author SHA1 Message Date
Jan-Christoph Borchardt fd8b9573fa disable half-baked list view, change for proper day view, fix #80 2013-11-18 18:14:34 +01:00
Jan-Christoph Borchardt f2405416dd properly display share permissions in Share tab 2013-11-18 17:50:13 +01:00
Jan-Christoph Borchardt fdaaf9dcce remove scrolling-to-switch-month which made the calendar unusable when you have some events, fix #24 2013-11-18 11:52:04 +01:00
Jan-Christoph Borchardt d717a7498a remove superfluous tipsy popup for events 2013-11-18 11:45:07 +01:00
libasys 8097464820 Update calendar.js
This is an onChange Event so you have to update the container data permissions.
2013-10-16 17:38:04 +02:00
Georg Ehrke ec2aeddeb5 Merge pull request #164 from owncloud/vcategories_to_tags
Adjust code to use OC.Tags
2013-10-14 10:25:39 -07:00
Georg Ehrke 59c47dcaf7 fixes for send email for shared event feature 2013-10-04 22:18:37 +02:00
Thomas Tanghus cf632410c4 Adjust code to use OC.Tags 2013-10-04 19:07:49 +02:00
Georg Ehrke c5e2f2f667 various fixes 2013-10-03 12:10:28 +02:00
Georg Ehrke ac8f753e4a Merge branch 'my-feature-branch' of github.com:visitha/calendar into visitha-my-feature-branch 2013-10-03 11:58:31 +02:00
Georg Ehrke 6c1a29b232 make it possible to set saturday as first day of the week 2013-09-27 17:24:52 +02:00
Ariel dc4bdab777 Fix of #860: Code shown instead of HTML entity when opening timepicker 2013-09-24 15:37:52 -03:00
Thomas Tanghus 871581a759 Change the most obvious OC_ methods to OCP\ 2013-09-16 01:37:30 +02:00
Thomas Tanghus a7a288a8c7 Add missing js/jquery.multi-autocomplete.js 2013-09-07 15:44:11 +02:00
Georg Ehrke f609d940ba make scrolling slower 2013-08-12 12:59:11 +02:00
Georg Ehrke 0e2bc1a67c disable scrolling in week view 2013-08-12 12:51:21 +02:00
Georg Ehrke 12ab60d173 fix close dialog button of calendar import 2013-07-15 19:09:19 +02:00
Georg Ehrke c8837c0406 check if OC.Share is defined - fixes #12 2013-05-10 11:45:23 +02:00
visithaWB 86722a452d added new function sendmail to get event data and send them to sendmail.php ajax file 2013-04-16 01:33:37 +05:30
MJCO bddf68d0f2 Added 'Go to Today' button to datecontrol form. 2013-04-02 12:30:55 +01:00
Georg Ehrke a827f51ef5 only send event's id when deleting it - fixes #922 2013-04-01 17:54:14 +02:00
Georg Ehrke 4afef89f28 fix #633 2013-03-02 17:21:20 +01:00
Lukas Reschke f7cbfef65e Remove not working piece of code
@georgehrke I have no idea what this code does, but it won't work here
since $_['showevent'] is not defined. Could you take a look at this?
THX
2013-02-08 18:39:21 +01:00
Lukas Reschke 172e3509f4 json_encode the ID 2013-02-08 18:06:17 +01:00
Georg Ehrke 30865e5c1f fix first day of week 2013-02-07 10:34:16 +01:00
Georg Ehrke eb27c01970 fix activation of calendars 2013-02-06 14:36:12 +01:00
Georg Ehrke d908f04a0f combine calendar overview and calendar settings 2013-02-06 14:22:24 +01:00
Georg Ehrke 5ddb475083 fix actions with edited events 2013-02-06 14:22:24 +01:00
Georg Ehrke 37d5d25638 fix loading of events 2013-01-25 17:54:56 +01:00
Lukas Reschke 967822c135 Use correct data attribute 2013-01-25 16:00:28 +01:00
Lukas Reschke 5002038864 Add missing JS vars 2013-01-25 14:10:19 +01:00
Lukas Reschke 31f009f2de Move oneclick handlers to external file 2013-01-25 14:01:54 +01:00
Lukas Reschke 0f047c256b Use the html5 data attribute 2013-01-25 11:19:17 +01:00
Lukas Reschke 6ec5822949 Calendar: Move some inline JS to external file 2013-01-23 20:52:00 +01:00
Lukas Reschke 24b7f693bc Move inline JS to external file 2013-01-22 20:25:07 +01:00
Lukas Reschke 4f7e5587e1 Add quotation marks
It's a string, not a var
2013-01-22 09:04:10 +01:00
Lukas Reschke 52aec2548b Calendar - Move JS of calendar.php to external file 2013-01-22 00:21:03 +01:00
Georg Ehrke e2b9e35bf5 fix fullcalendar implementation 2013-01-15 20:00:35 +01:00
Thomas Tanghus fb35751dc2 Make calendar load in IE 8. 2012-12-18 06:04:38 +01:00
Thomas Tanghus 94465f881a Calendar: Encode event title and desc in javascript to avoid double encoding. Fix #205 2012-11-20 01:45:29 +01:00
Thomas Tanghus 824750e192 Merge branch 'master' of github.com:owncloud/apps into vcategories_db
Conflicts:
	contacts/appinfo/app.php
2012-11-13 12:02:15 +01:00
Bernhard Posselt bd30ebc605 adjust todate when fromdate is bigger 2012-10-28 17:35:53 +01:00
Florian Hülsmann 6ef96d21fc Option for overwriting target calendar on import 2012-10-26 13:19:20 +02:00
Thomas Tanghus b2540e319e Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-10-23 06:33:38 +02:00
Florian Hülsmann a1b6290624 fixed html entities in calendar event titles 2012-10-21 23:33:31 +02:00
Jean-Louis Dupond a3b85640c4 Add space before endtime 2012-10-20 23:46:41 +02:00
Thomas Tanghus 8eebf89aab Update Calendar and Contacts js to also use type with OCCategories. 2012-10-19 00:36:58 +02:00
Thomas Tanghus 1adc437f65 Don't decode CalDAV URL (and why, oh why use spaces in the name) 2012-10-03 18:13:14 +02:00
Georg Ehrke d3d506e3f8 Calendar: fix XSS and display issue with week view 2012-09-08 21:09:06 +02:00
Bart Visscher 3e4bd9fbb5 Fix whitespace in calendar 2012-09-07 14:32:45 +02:00
Thomas Tanghus 7ba7a041b3 Prevent default in js. 2012-09-06 19:08:23 +02:00
Thomas Tanghus 50ab581173 Remove old sharing calls. 2012-09-02 18:17:38 +02:00
Georg Ehrke 63511f05ca slow calendar scrolling down 2012-09-02 17:09:27 +02:00
Robin Appelman c1944dca9a remove calender entry from list when deleting a calendar 2012-09-02 17:07:29 +02:00
Georg Ehrke d8fecdc3be improve general scroll behavior 2012-09-02 16:32:31 +02:00
Georg Ehrke 0b04c16e73 fix scrolling issue with webkit based browsers 2012-09-02 16:11:52 +02:00
Georg Ehrke 4804ae5fa5 fix scrolling issue with webkit based browsers 2012-09-02 16:10:14 +02:00
Thomas Tanghus 2967ad3917 Use sharing api for events too. 2012-09-02 09:40:44 +02:00
Thomas Tanghus 9fc5ded97c Load sharing status icons. 2012-09-02 09:40:43 +02:00
Jörn Friedrich Dreyer 6501300465 unify permissions (2/3): change apps to use OC::PERMISSION_X 2012-08-31 01:12:02 +02:00
Michael Gapczynski 13b7dbcd29 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 d7e742c32d move calendar settings from personal settings to in app settings 2012-08-09 12:37:26 +02:00
Michael Gapczynski c02d76bb4a 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 ecf906a784 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Georg Ehrke 0e49f07fe1 Merge branch 'master' into calendar_import 2012-07-21 17:37:10 +02:00
Georg Ehrke 01eab4408b some style fixes for calendar 2012-07-21 17:09:10 +02:00
Georg Ehrke 8c9376c614 some more work on calendar import - new import is (nearly) done 2012-07-04 21:14:40 +02:00
Georg Ehrke 3a85ecd5f8 Merge branch 'master' into calendar_import 2012-07-04 13:03:30 +02:00
Georg Ehrke b6933007ec replace some direct links with OC.imagePath 2012-07-03 23:44:47 +02:00
Georg Ehrke 95b018d00b some more work on calendar import 2012-07-03 22:33:24 +02:00
Georg Ehrke f0c59ccebb Merge branch 'master' into calendar_import 2012-07-03 16:39:09 +02:00
Georg Ehrke f8eb48f272 fix encoding fail in calendar app - bugfix for oc-1194 2012-07-03 13:55:48 +02:00
Georg Ehrke b361988ea6 some work on calendar import dialog 2012-07-03 13:43:18 +02:00
Georg Ehrke 70488fe5d1 some work on calendar import 2012-07-01 21:36:09 +02:00
Georg Ehrke c515265b23 improvements for dropoimport 2012-06-30 23:18:41 +02:00
Georg Ehrke b1f5979ae6 improve dropimport 2012-06-30 22:26:29 +02:00
Georg Ehrke c578ddecbc some work on (drop)import) 2012-06-30 15:17:29 +02:00
Robin Appelman e6ea46f461 pass progresskey the correct way during calender import 2012-06-29 00:49:37 +02:00
Bjoern Schiessle 18259f8cb2 date don't change correctly in the view list (bug #973) fixed 2012-06-22 11:30:40 +02:00
Bart Visscher 25d9ef6eba Calendar: Fix caldav url encoding 2012-06-21 23:30:04 +02:00
Georg Ehrke 683af756cb Merge branch 'master' into calendar_repeat 2012-06-20 20:14:08 +02:00
Bjoern Schiessle b14a6c4067 use sanitizeHTML() function 2012-06-20 15:11:14 +02:00
Georg Ehrke 9c7c74a6f8 Calendar: js fix 2012-06-19 13:26:55 +02:00
Georg Ehrke 0afd453b06 fix merge conflicts 2012-06-15 11:48:26 +02:00
Thomas Tanghus 0859c816b9 Update calendar after delete. 2012-06-15 02:07:32 +02:00
Bart Visscher 6a10b554a9 Calendar: Clicking #datecontrol_date gives datepicker to jump to date 2012-06-13 21:39:12 +02:00
Bart Visscher 488a8c91df Calendar: Make button of #datecontrol_date 2012-06-13 21:39:12 +02:00
Georg Ehrke cbdd8f023d add some information about repeating events caching on personal settings page 2012-06-11 22:16:26 +02:00
Georg Ehrke 775f8c9e2e fix merge conflicts 2012-06-10 18:38:01 +02:00
Georg Ehrke 53a77c2377 increase height of event dialog 2012-06-09 15:38:03 +02:00
Georg Ehrke 874b42edf8 make use of post instead of get 2012-06-09 14:41:26 +02:00
Georg Ehrke eb0e970e53 Merge branch 'master' into calendar_repeat 2012-06-06 10:12:11 +02:00
Bart Visscher e2dcd55ac1 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 281933f8fa add button to clear calendar's cache 2012-05-29 13:34:27 +02:00
Georg Ehrke edca239f2c add urlencode for caldav link 2012-05-28 10:49:27 +02:00
Georg Ehrke 6dff538871 fix share for users with a point within their name 2012-05-26 15:23:46 +02:00
Georg Ehrke 32908a261b Merge branch 'master' into calendar_dropimport 2012-05-17 22:17:06 +02:00
Georg Ehrke 14d9bb4242 fix paths to images and set height for calendar management dialog 2012-05-17 21:51:38 +02:00
Georg Ehrke 5269e16921 some little js fixes for drop import 2012-05-13 15:08:27 +02:00
Georg Ehrke 1f262fc564 add first version of drop import 2012-05-13 15:05:57 +02:00