Commit Graph

104 Commits (master)

Author SHA1 Message Date
Michał 'rysiek' Woźniak a97f5fc113 implemented @crti's suggestion to use the calendar/event owners' timezone by default in the link-shared calendar/event display 2014-02-13 01:16:25 +01:00
Michał 'rysiek' Woźniak e28e513668 link-shared calendar timezone display and settings 2014-02-11 00:03:33 +01:00
Michał 'rysiek' Woźniak 976a84f7df single event sharing implemented, and properly (with pure HTML/CSS transitions, and as little JS as practical at this time).
it should be possible to add a completely JS-less implementation easily later.
2014-02-05 18:05:12 +01:00
nezzi d905969b2f Add some extra debug information in case of invalid events 2013-12-01 18:54:43 -05: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 22471ff525 don't sent email if email var is null 2013-10-04 22:24:10 +02: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 0c5c596fb8 fix XSS 2013-10-03 15:05:35 +02:00
Georg Ehrke 1be86f62b9 fix filemode of lib/app.php 2013-10-03 14:53:01 +02:00
Georg Ehrke 91b7e79da2 use public api 2013-10-03 14:49:06 +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
Thomas Tanghus c10e2ddec8 Used wrong variable 2013-09-26 11:50:44 +02:00
Thomas Tanghus 8f540a1120 Fix birthday generation and add CalDAV birthdays. 2013-09-25 23:14:57 +02:00
Thomas Tanghus 2a322c63bd Check for CATEGORIES before using it 2013-09-25 18:47:22 +02:00
Thomas Tanghus 871581a759 Change the most obvious OC_ methods to OCP\ 2013-09-16 01:37:30 +02:00
Georg Ehrke 557bbdbae1 proper handling of invalid objects 2013-07-15 19:10:10 +02:00
Georg Ehrke c18d163eb6 fix escaping issue in webclient 2013-05-30 16:44:36 +02:00
Marcel Pennewiss 009960938d Share also confidential events (fixes issue #5) 2013-05-18 12:32:55 +02:00
visithaWB 3ae0cc0a29 HTML code is improved 2013-05-01 16:50:52 +05:30
visithaWB 418dc41878 sendEmails function is added again 2013-04-18 13:43:29 +05:30
visithaWB e7e5e9c181 Replaced by Original file 2013-04-18 13:36:27 +05:30
visithaWB 4c26692344 Replaced by Orginal file 2013-04-18 13:31:19 +05:30
visithaWB 1f91551adc File is replaced by original file 2013-04-18 13:24:43 +05:30
visithaWB b3db1be93c sendEmail function is modified to allow send emails to multiple users 2013-04-16 14:34:46 +05:30
visithaWB ad98fdcaa8 Added new function sendEmails to create HTML emails and send them 2013-04-16 01:47:42 +05:30
visithaWB a4e3830a96 added new function sendEmails to create HTML email and send it 2013-04-16 01:43:52 +05:30
Thomas Tanghus f6cb809adc Calendar: Error checking in generateEventOutput() Fix #621 2013-03-06 16:49:47 +01:00
Georg Ehrke e8ab189df4 fix some PHP Notices and fix birthday calendar - fix #610 2013-03-06 14:47:26 +01:00
Georg Ehrke 778e1ce985 some fixes for export with sharing 2013-01-31 17:52:50 +01:00
Marcel Pennewiss dcc352d4b3 fixed OCP\Share::PERMISSION to OCP\PERMISSION (fixes comment in #309) 2013-01-04 20:33:05 +01:00
Marcel Pennewiss 26acf5a622 implement access class support (rfc5545, section 3.8.1.3) for calendar 2012-12-07 22:05:19 +01:00
Thomas Tanghus a53fe4138a Made getVCategories() public to be able to update on edit/delete/add. 2012-11-18 22:50:00 +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
Thomas Tanghus 5cb36db034 Use CRUDS consts as defined in https://github.com/owncloud/core/pull/356 2012-11-11 19:43:44 +01:00
Bart Visscher 61ea8a1696 Merge remote-tracking branch 'git://github.com/susinths/apps'
Conflicts:
	calendar/ajax/event/edit.form.php
	calendar/lib/object.php
2012-10-27 16:36:06 +02:00
Susinthiran Sithamparanathan d1b6e5281f Update Contacts and Calendar with namespaces for Sabre 1.7.1 2012-10-18 23:08:26 +02:00
Thomas Tanghus 32a2fe8ab1 Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-10-15 21:42:30 +02:00
Brice Maron e95b004c2b Correct Unix format file and some LowerCaseConstant 2012-10-12 22:17:06 +00:00
Thomas Tanghus 72ef735b35 Make OC_Calendar_App::getDefaultCategories() public. 2012-10-11 22:32:41 +02:00
Thomas Tanghus 93eaf48b8f Don't scan for categories/groups in shared addressbooks/calendars. 2012-10-03 22:03:29 +02:00
Thomas Tanghus 67dbb70d92 Use types (event/contact) instead of app names for vcategories. Also purge category/object relations on object deletion. 2012-09-17 02:03:28 +02:00
Thomas Tanghus 0b9ea316a4 Transitional filter-by-category design take 1. 2012-09-11 14:19:28 +02:00
Thomas Mueller 89ab3bae90 adding space between) and { 2012-09-07 15:21:03 +02:00
Bart Visscher 3e4bd9fbb5 Fix whitespace in calendar 2012-09-07 14:32:45 +02:00
Bart Visscher 16e9dc1fa6 Calendar: Style fix 2012-09-06 21:50:30 +02:00
Bart Visscher 6e644c77ce Calendar/Tasks: Resolve categories translations to string
Fixes: oc-1648
2012-09-06 21:50:30 +02:00
Thomas Tanghus 27c645317b Wrong variable name. 2012-09-06 21:28:59 +02:00
Thomas Tanghus 44b4e5cbcb Used wrong variable name when looking for individually shared events. 2012-09-04 18:54:58 +02:00