summaryrefslogtreecommitdiffstats
path: root/apps/calendar
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into share_apiMichael Gapczynski2012-08-1452-509/+578
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2012-08-131-0/+5
| * Calendar: remove not used style rulesBart Visscher2012-08-121-2/+0
| * Change image links to use imagePath functionBart Visscher2012-08-122-3/+3
| * Commented out unused(?) class that interfered with appsettings.Thomas Tanghus2012-08-121-1/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-08-123-0/+133
| * [tx-robot] updated from transifexJenkins for ownCloud2012-08-1146-500/+430
| * Following the code guidelines makes Michael happy :-)Lukas Reschke2012-08-101-1/+3
| * Disable listening, instead checking the ACL to prevent DoSLukas Reschke2012-08-101-6/+5
| * Activate ACLsLukas Reschke2012-08-101-0/+3
| * remove debug code from calendar - thanks michael for pointing that out :)Georg Ehrke2012-08-091-1/+0
* | Calendar: update share backend using contacts backend as templateBart Visscher2012-08-101-11/+58
* | Merge branch 'master' into share_apiMichael Gapczynski2012-08-0911-123/+178
|\|
| * move calendar settings from personal settings to in app settingsGeorg Ehrke2012-08-0911-123/+178
* | Use new sharing API in OC_Calendar_Share::allSharedwithuserBart Visscher2012-08-072-13/+16
* | Add Event share backendBart Visscher2012-08-072-0/+42
* | Initial calendar sharing backendMichael Gapczynski2012-08-073-1/+61
* | Merge branch 'master' into share_apiMichael Gapczynski2012-08-0610-35/+158
|\|
| * Change hardcoded urls to use linkTo functionBart Visscher2012-08-064-7/+16
| * Calendar: remove double html encodingBart Visscher2012-08-031-2/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2012-07-315-26/+140
* | Merge branch 'master' into share_apiMichael Gapczynski2012-07-319-45/+406
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-07-301-7/+43
| * [tx-robot] updated from transifexJenkins for ownCloud2012-07-292-0/+7
| * [tx-robot] updated from transifexJenkins for ownCloud2012-07-281-2/+2
| * Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/ownclou...Georg Ehrke2012-07-271-0/+4
| |\
| | * Server verhindert beim OSX Client einen DeleteSteven2012-02-131-0/+4
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-07-275-30/+167
| * | convert through caldav transmitted rgba calendarcolor to rgbGeorg Ehrke2012-07-261-1/+7
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-07-261-0/+135
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-07-261-7/+43
* | | Merge branch 'master' into share_apiMichael Gapczynski2012-07-2537-210/+829
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-07-251-10/+31
| * | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-2125-16/+59
| |\ \
| | * | some style fixes for calendarGeorg Ehrke2012-07-211-1/+3
| | * | DRY for getting calendar timezone settingBart Visscher2012-07-214-5/+15
| | * | Add CSRF checksLukas Reschke2012-07-203-2/+8
| | * | Added CSRF checks to Calendar. Expect some error messages - and report them ;)Thomas Tanghus2012-07-1714-2/+15
| | * | Added hook for postCreateUser. Probably fix for oc-1265.Thomas Tanghus2012-07-172-1/+13
| | * | stop using of OC_L10N::tAGeorg Ehrke2012-07-161-4/+4
| * | | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-151-1/+1
| |\| |
| | * | fix remote and public.phpRobin Appelman2012-07-131-1/+1
| * | | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-113-1/+8
| |\| |
| * | | comment out some codeGeorg Ehrke2012-07-061-6/+6
| * | | some more work on calendar import - new import is (nearly) doneGeorg Ehrke2012-07-045-7/+44
| * | | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-041-2/+2
| |\ \ \
| * | | | some more work on calendar importGeorg Ehrke2012-07-035-30/+80
| * | | | fix spelling fail in codeGeorg Ehrke2012-07-031-1/+1
| * | | | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-031-1/+1
| |\ \ \ \
| * | | | | some work on calendar import dialogGeorg Ehrke2012-07-036-70/+132
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 20:03:42 +0000