Commit Graph

307 Commits (master)

Author SHA1 Message Date
Michał 'rysiek' Woźniak 8381f056be event display/edit forms now properly show timezone-adjusted date/time 2014-02-11 02:26:58 +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 a2554c0fc1 cleanups 2014-02-10 13:34:02 +01:00
Michał 'rysiek' Woźniak 0e7ce0624b fixed the double-display bug 2014-02-06 02:49:57 +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
Michał 'rysiek' Woźniak 33f9b4edf1 properly showing events from link-shared calendars 2014-02-05 18:05:11 +01:00
Michał 'rysiek' Woźniak f205ba67eb minor clean-ups
ajax/events.php modified to react to public share tokens properly
almost-working public link-shared calendar display
2014-02-05 18:05:11 +01:00
nezzi 938e56f402 Don't array_merge the generated event output if the generation failed 2013-11-26 18:15:04 +01:00
ganomi d4e7438847 Fix call to translation util
$l was not initialized
2013-11-26 10:05:30 +01:00
Morris Jobke 1b69d14cfa Fix typo in comment 2013-11-25 09:24:32 +01:00
Georg Ehrke 31ed512a53 Merge pull request #225 from libasys/patch-4
Update edit.form.php
2013-11-24 15:52:55 -08:00
libasys 261f61e32a Update new.form.php
Added init values to prevend user input errors
2013-11-22 19:42:44 +01:00
libasys 4e350d7110 Update edit.form.php
Some Bugfixes on parsing and a hidden init to prevent user errors
2013-11-22 19:38:16 +01:00
Jan-Christoph Borchardt fd8b9573fa disable half-baked list view, change for proper day view, fix #80 2013-11-18 18:14:34 +01:00
Georg Ehrke 67c0bd69b1 Merge pull request #179 from libasys/patch-1
Update new.form.php
2013-11-15 02:07:42 -08:00
Thomas Tanghus 7ab9761c89 Convert imports to UTF-8. Fix #198 2013-11-07 18:24:01 +01:00
libasys 4a750d25b5 Update new.form.php
We create an event and not edit an event!
2013-10-16 17:33:51 +02:00
Georg Ehrke 59c47dcaf7 fixes for send email for shared event feature 2013-10-04 22:18:37 +02:00
Georg Ehrke 7d2b4f0665 check if user is actually allowed to access event 2013-10-04 21:24:26 +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 f52e378f34 fix deleting event and fix php notices 2013-09-27 17:24:52 +02:00
Thomas Tanghus 871581a759 Change the most obvious OC_ methods to OCP\ 2013-09-16 01:37:30 +02:00
Georg Ehrke c18d163eb6 fix escaping issue in webclient 2013-05-30 16:44:36 +02:00
Georg Ehrke 44dfa2637f apply changes from https://github.com/owncloud/apps/pull/854 2013-05-24 17:14:24 +02:00
Georg Ehrke 8f0560dfba update events.php 2013-05-15 01:05:01 +03:00
Georg Ehrke b2eae7d17d some minor fixes for events.php 2013-04-22 00:13:46 +02:00
visithaWB 0efff2d243 File bit changed 2013-04-16 01:41:11 +05:30
visithaWB d8ef58ca8a this is new ajax file created to send event data to back end for the email creation 2013-04-16 01:37:14 +05:30
Thomas Tanghus c0aa52bc27 Calendar: Also check for shared calendars when editing. Fix #828 2013-04-11 16:04:45 +00:00
Georg Ehrke de9612837a Make "PUBLIC" the default accessclass - fix for #805 2013-03-23 16:16:04 +01:00
Georg Ehrke 9f42567321 fix apps #682 2013-03-04 22:14:43 +01:00
Georg Ehrke 1c45a71fbe some fixes for calendar - @LukasReschke ;) 2013-02-08 22:23:11 +01:00
Robin Appelman eef2f2adf9 merge master into filesystem 2013-01-28 03:17:27 +01:00
Lukas Reschke ee79e8bdd9 Replace JS redirect with PHP 2013-01-22 20:21:22 +01:00
Robin Appelman e8309a19a8 Merge branch 'master' into filesystem 2013-01-20 03:00:44 +01:00
Georg Ehrke 4a200b60c7 fix PHP Syntax Error - fixes #442 2013-01-17 18:49:21 +01:00
Robin Appelman b8eb7a042d merge master into filesystem 2013-01-01 17:57:23 +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
Robin Appelman 54a7ed79ae Merge branch 'master' into filesystem 2012-11-21 22:36:03 +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 e5c0b260fe Calendar: Prevent 'Undefined index' on repeating events. 2012-11-19 16:53:15 +01:00
Robin Appelman 189f687397 Merge branch 'master' into filesystem 2012-11-15 00:38:46 +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
Robin Appelman 91d18b90a8 Merge branch 'master' into filesystem 2012-10-27 18:12:32 +02: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
Robin Appelman 78d6ca213e merge master into filesystem 2012-10-27 14:30:30 +02:00
Florian Hülsmann 23f2de0ae1 Merge branch 'master' of github.com:owncloud/apps 2012-10-26 15:53:43 +02:00
Florian Hülsmann 6ef96d21fc Option for overwriting target calendar on import 2012-10-26 13:19:20 +02:00
Robin Appelman c5a1f090fa Merge branch 'master' into filesystem 2012-10-25 18:27:01 +02:00