Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | moved to apps repository | Frank Karlitschek | 2012-08-26 | 1 | -30/+0 |
| | |||||
* | fix calendar | Georg Ehrke | 2012-06-21 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into calendar_repeat | Georg Ehrke | 2012-06-20 | 1 | -1/+1 |
|\ | |||||
| * | use sanitizeHTML() function | Bjoern Schiessle | 2012-06-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into calendar_repeat | Georg Ehrke | 2012-06-16 | 1 | -0/+1 |
|\| | |||||
| * | Calendar: Write-close session to enable parallel events.php requests | Bart Visscher | 2012-06-16 | 1 | -0/+1 |
| | | |||||
* | | fix merge conflicts | Georg Ehrke | 2012-06-15 | 1 | -9/+7 |
|\| | |||||
| * | Make events show again. | Thomas Tanghus | 2012-06-15 | 1 | -8/+7 |
| | | |||||
| * | show username of the body who shares in the summary | Georg Ehrke | 2012-06-13 | 1 | -1/+0 |
| | | |||||
* | | remove include command for when | Georg Ehrke | 2012-06-10 | 1 | -4/+0 |
|/ | |||||
* | removing executable bit - again | Thomas Mueller | 2012-05-15 | 1 | -0/+0 |
| | |||||
* | fix php notice and displaying of events | Georg Ehrke | 2012-05-13 | 1 | -1/+1 |
| | |||||
* | Correct undef variable mistake from prev commit | Brice Maron | 2012-05-10 | 1 | -2/+3 |
| | |||||
* | Correct calendar loading when calendar are from hooks. fix oc-619 | Brice Maron | 2012-05-10 | 1 | -9/+13 |
| | |||||
* | fix bug in events.php | Georg Ehrke | 2012-05-09 | 1 | -1/+1 |
| | |||||
* | fix for previous commit | Georg Ehrke | 2012-05-08 | 1 | -1/+1 |
| | |||||
* | fix calendar vulnerability | Georg Ehrke | 2012-05-08 | 1 | -1/+7 |
| | |||||
* | Calendar: Use array_merge to join event arrays | Bart Visscher | 2012-05-04 | 1 | -1/+1 |
| | |||||
* | Calendar: Fix repeating events | Bart Visscher | 2012-05-03 | 1 | -1/+1 |
| | |||||
* | Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud | Bart Visscher | 2012-05-03 | 1 | -1/+0 |
|\ | | | | | | | | | Conflicts: apps/calendar/ajax/events.php | ||||
| * | Handle event exceptions in calendar app. Execeptions to recurring events are ↵ | Henning Becker | 2012-02-17 | 1 | -1/+20 |
| | | | | | | | | not shown anymore. | ||||
* | | ported oc_json | Frank Karlitschek | 2012-05-03 | 1 | -3/+3 |
| | | |||||
* | | removing executable bit from various files | Thomas Mueller | 2012-04-30 | 1 | -0/+0 |
| | | |||||
* | | fix merge conflicts | Georg Ehrke | 2012-04-26 | 1 | -1/+0 |
|\ \ | |||||
| * \ | fix merge conflicts | Georg Ehrke | 2012-04-21 | 1 | -91/+7 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-15 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-25 | 1 | -2/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-19 | 1 | -9/+24 |
| |\ \ \ \ \ | |||||
| * | | | | | | replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime | Georg Ehrke | 2012-02-24 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | fix merge conflicts | Georg Ehrke | 2012-04-22 | 1 | -91/+8 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | fix merge conflicts | Georg Ehrke | 2012-04-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | fix view of single shared events | Georg Ehrke | 2012-04-07 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix path and class name | Georg Ehrke | 2012-04-07 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | clean up events.php of calendar | Georg Ehrke | 2012-04-07 | 1 | -83/+10 |
| | | | | | | | |||||
| * | | | | | | revert 0fd8b1a04430fc36bd62a0828530dc2bc3910e81 | Georg Ehrke | 2012-04-02 | 1 | -3/+9 |
| | | | | | | | |||||
| * | | | | | | fix events.php for rewritten OC_Caledar_App class | Georg Ehrke | 2012-03-31 | 1 | -9/+3 |
| | | | | | | | |||||
| * | | | | | | fix merge conflicts | Georg Ehrke | 2012-03-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | fix merge conflicts | Georg Ehrke | 2012-03-03 | 1 | -13/+23 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | fix merge conflicts | Georg Ehrke | 2012-02-25 | 1 | -12/+18 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | add rw and r to events.php | Georg Ehrke | 2012-02-20 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | check userrights in events.php | Georg Ehrke | 2012-02-12 | 1 | -0/+5 |
| | | | | | | | |||||
| * | | | | | | show shared calendars | Georg Ehrke | 2012-02-11 | 1 | -21/+15 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | remove the require_once lib base from all (or nearly all) files | Georg Ehrke | 2012-04-17 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | reuse OC_L10N objects | Robin Appelman | 2012-04-14 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | fix previous made bug and fix oc bug - oc-139 | Georg Ehrke | 2012-03-23 | 1 | -2/+4 |
| | | | | |||||
* | | | | check if the title of an event is null - bugfix for oc-139 | Georg Ehrke | 2012-03-23 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | make calendar compatible with php 5.2 - works for me with PHP 5.2.12 | Georg Ehrke | 2012-03-03 | 1 | -2/+7 |
| | | | |||||
* | | | Implement showing Birthdays of contacts in the calendar | Bart Visscher | 2012-03-01 | 1 | -6/+16 |
| | | | |||||
* | | | Calendar: fix bug in creating DTEND from DTSTART | Bart Visscher | 2012-03-01 | 1 | -1/+1 |
| |/ |/| | |||||
* | | make the location of the 3rdparty folder flexible. | Frank Karlitschek | 2012-02-23 | 1 | -1/+1 |
| | | | | | | | | | | It´s automatically search in the owncloud folder and in the parent folder. override with an option in config.php is also possible |