summaryrefslogtreecommitdiffstats
path: root/apps/calendar/ajax
Commit message (Expand)AuthorAgeFilesLines
* Corrected typos.Thomas Tanghus2012-06-061-3/+3
* Calendar & Contacts: Store import progress in OC_CacheBart Visscher2012-06-041-9/+11
* Calendar: small cleanup of import progress writingBart Visscher2012-05-311-24/+15
* fix statusGeorg Ehrke2012-05-291-9/+5
* Merge branch 'calendar_dropimport'Georg Ehrke2012-05-191-0/+74
|\
| * Merge branch 'master' into calendar_dropimportGeorg Ehrke2012-05-1733-4/+36
| |\
| * \ Merge branch 'master' into calendar_dropimportGeorg Ehrke2012-05-132-1/+2
| |\ \
| * | | add first version of drop importGeorg Ehrke2012-05-131-0/+74
* | | | fix for calendarGeorg Ehrke2012-05-191-2/+1
| |_|/ |/| |
* | | removing executable bit - againThomas Mueller2012-05-1533-0/+0
* | | better user permission check for files in ajax/calendar/Georg Ehrke2012-05-144-4/+20
* | | check user permissions in calendar's changepermission.phpGeorg Ehrke2012-05-141-0/+8
* | | check user permissions in calendar's unshare.phpGeorg Ehrke2012-05-141-0/+8
| |/ |/|
* | fix another php noticeGeorg Ehrke2012-05-131-0/+1
* | fix php notice and displaying of eventsGeorg Ehrke2012-05-131-1/+1
|/
* Correct undef variable mistake from prev commitBrice Maron2012-05-101-2/+3
* Correct calendar loading when calendar are from hooks. fix oc-619Brice Maron2012-05-101-9/+13
* fix bug in events.phpGeorg Ehrke2012-05-091-1/+1
* fix for previous commitGeorg Ehrke2012-05-081-1/+1
* fix calendar vulnerabilityGeorg Ehrke2012-05-081-1/+7
* ported the oc_template classFrank Karlitschek2012-05-0610-11/+11
* Calendar: Use array_merge to join event arraysBart Visscher2012-05-041-1/+1
* Calendar: Fix repeating eventsBart Visscher2012-05-031-1/+1
* Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloudBart Visscher2012-05-031-1/+0
|\
| * Handle event exceptions in calendar app. Execeptions to recurring events are ...Henning Becker2012-02-171-1/+20
* | ported oc_jsonFrank Karlitschek2012-05-0333-111/+111
* | port checkAppEnabledFrank Karlitschek2012-05-022-2/+2
* | port oc_preferencesFrank Karlitschek2012-05-0210-13/+13
* | porting of OC_User to public API complete.Frank Karlitschek2012-05-013-3/+3
* | ported getUserFrank Karlitschek2012-05-0119-26/+26
* | ported isLoggedInFrank Karlitschek2012-05-012-2/+2
* | finish porting of the LOG calls or the apps to the public apiFrank Karlitschek2012-05-011-2/+2
* | fix a PHP NoticeGeorg Ehrke2012-04-301-6/+9
* | removing executable bit from various filesThomas Mueller2012-04-302-0/+0
* | fix merge conflictsGeorg Ehrke2012-04-264-12/+11
|\ \
| * \ fix merge conflictsGeorg Ehrke2012-04-2113-176/+163
| |\ \
| * \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-158-10/+4
| |\ \ \
| * \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-133-13/+52
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-291-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-251-2/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-195-44/+67
| |\ \ \ \ \ \ \
| * | | | | | | | replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTimeGeorg Ehrke2012-02-244-12/+12
* | | | | | | | | fix merge conflictsGeorg Ehrke2012-04-2213-176/+161
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | fix merge conflictsGeorg Ehrke2012-04-211-62/+72
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | implement shared calendar activation on server sideGeorg Ehrke2012-04-181-0/+12
| * | | | | | | | fix merge conflictsGeorg Ehrke2012-04-158-9/+5
| |\| | | | | | |
| * | | | | | | | fix unsharing of eventsGeorg Ehrke2012-04-131-1/+1
| * | | | | | | | check permission check in share functionGeorg Ehrke2012-04-131-0/+8
| * | | | | | | | fix merge conflictsGeorg Ehrke2012-04-133-13/+53
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | hide share tab in shared eventsGeorg Ehrke2012-04-132-0/+2