summaryrefslogtreecommitdiffstats
path: root/apps/calendar/js
Commit message (Collapse)AuthorAgeFilesLines
* moved to apps repositoryFrank Karlitschek2012-08-264-1200/+0
|
* Merge branch 'master' into share_apiMichael Gapczynski2012-08-092-34/+41
|\ | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php
| * move calendar settings from personal settings to in app settingsGeorg Ehrke2012-08-092-34/+41
| |
* | Merge branch 'master' into share_apiMichael Gapczynski2012-07-253-70/+167
|\| | | | | | | | | | | | | | | | | | | Conflicts: apps/calendar/js/loader.js apps/contacts/index.php apps/contacts/js/loader.js apps/files/js/files.js apps/files_sharing/sharedstorage.php lib/filesystemview.php
| * Merge branch 'master' into calendar_importGeorg Ehrke2012-07-211-1/+3
| |\
| | * some style fixes for calendarGeorg Ehrke2012-07-211-1/+3
| | |
| * | some more work on calendar import - new import is (nearly) doneGeorg Ehrke2012-07-041-2/+21
| | |
| * | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-041-2/+2
| |\|
| * | some more work on calendar importGeorg Ehrke2012-07-031-15/+27
| | |
| * | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-031-1/+1
| |\ \
| * | | some work on calendar import dialogGeorg Ehrke2012-07-031-38/+64
| | | |
| * | | some work on calendar importGeorg Ehrke2012-07-011-52/+93
| | | |
| * | | improvements for dropoimportGeorg Ehrke2012-06-301-2/+2
| | | |
| * | | improve dropimportGeorg Ehrke2012-06-301-0/+4
| | | |
| * | | some work on (drop)import)Georg Ehrke2012-06-301-10/+3
| | | |
* | | | Make file actions permissions awareMichael Gapczynski2012-07-251-1/+1
| |_|/ |/| |
* | | replace some direct links with OC.imagePathGeorg Ehrke2012-07-031-2/+2
| |/ |/|
* | fix encoding fail in calendar app - bugfix for oc-1194Georg Ehrke2012-07-031-1/+1
|/
* pass progresskey the correct way during calender importRobin Appelman2012-06-291-1/+1
|
* date don't change correctly in the view list (bug #973) fixedBjoern Schiessle2012-06-221-0/+2
|
* Calendar: Fix caldav url encodingBart Visscher2012-06-211-2/+1
|
* Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-201-1/+1
|\
| * use sanitizeHTML() functionBjoern Schiessle2012-06-201-1/+1
| |
* | Calendar: js fixGeorg Ehrke2012-06-191-1/+1
| |
* | fix merge conflictsGeorg Ehrke2012-06-151-1/+18
|\|
| * Update calendar after delete.Thomas Tanghus2012-06-151-0/+1
| |
| * Calendar: Clicking #datecontrol_date gives datepicker to jump to dateBart Visscher2012-06-131-1/+17
| |
| * Calendar: Make button of #datecontrol_dateBart Visscher2012-06-131-1/+1
| |
* | add some information about repeating events caching on personal settings pageGeorg Ehrke2012-06-111-1/+18
| |
* | fix merge conflictsGeorg Ehrke2012-06-103-10/+11
|\|
| * increase height of event dialogGeorg Ehrke2012-06-091-0/+1
| |
| * make use of post instead of getGeorg Ehrke2012-06-093-10/+10
| |
* | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-061-6/+6
|\|
| * Calendar & Contacts: Store import progress in OC_CacheBart Visscher2012-06-041-6/+6
| | | | | | | | | | | | Convert calendar and contacts import to use a caching system for storing the import progress percentage. OC_Cache can later be made smarter about storing values.
* | add button to clear calendar's cacheGeorg Ehrke2012-05-291-0/+3
|/
* add urlencode for caldav linkGeorg Ehrke2012-05-281-0/+1
|
* fix share for users with a point within their nameGeorg Ehrke2012-05-261-3/+4
|
* Merge branch 'master' into calendar_dropimportGeorg Ehrke2012-05-171-2/+3
|\
| * fix paths to images and set height for calendar management dialogGeorg Ehrke2012-05-171-2/+3
| |
* | some little js fixes for drop importGeorg Ehrke2012-05-131-2/+2
| |
* | add first version of drop importGeorg Ehrke2012-05-131-0/+45
|/
* Calendar: Resize content after creating calendar layoutBart Visscher2012-05-081-0/+1
| | | | The calendar can be higher than the window, this corrects for the scrollbar
* make calendar compatible with public.phpGeorg Ehrke2012-05-071-1/+4
|
* fix path in calendars geo.jsGeorg Ehrke2012-04-301-1/+1
|
* removing executable bit from various filesThomas Mueller2012-04-301-0/+0
|
* implement shared calendar activation on server sideGeorg Ehrke2012-04-181-0/+1
|
* implement shared calendar activation on js-sideGeorg Ehrke2012-04-181-4/+4
|
* fix merge conflictsGeorg Ehrke2012-04-131-7/+8
|\
| * Use the same category input and management as the contacts appBart Visscher2012-04-121-7/+8
| |
* | fix address of public shared calendarsGeorg Ehrke2012-04-131-1/+1
| |