Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | moved to apps repository | Frank Karlitschek | 2012-08-26 | 4 | -1200/+0 |
| | |||||
* | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-09 | 2 | -34/+41 |
|\ | | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php | ||||
| * | move calendar settings from personal settings to in app settings | Georg Ehrke | 2012-08-09 | 2 | -34/+41 |
| | | |||||
* | | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-25 | 3 | -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_import | Georg Ehrke | 2012-07-21 | 1 | -1/+3 |
| |\ | |||||
| | * | some style fixes for calendar | Georg Ehrke | 2012-07-21 | 1 | -1/+3 |
| | | | |||||
| * | | some more work on calendar import - new import is (nearly) done | Georg Ehrke | 2012-07-04 | 1 | -2/+21 |
| | | | |||||
| * | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-07-04 | 1 | -2/+2 |
| |\| | |||||
| * | | some more work on calendar import | Georg Ehrke | 2012-07-03 | 1 | -15/+27 |
| | | | |||||
| * | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-07-03 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | some work on calendar import dialog | Georg Ehrke | 2012-07-03 | 1 | -38/+64 |
| | | | | |||||
| * | | | some work on calendar import | Georg Ehrke | 2012-07-01 | 1 | -52/+93 |
| | | | | |||||
| * | | | improvements for dropoimport | Georg Ehrke | 2012-06-30 | 1 | -2/+2 |
| | | | | |||||
| * | | | improve dropimport | Georg Ehrke | 2012-06-30 | 1 | -0/+4 |
| | | | | |||||
| * | | | some work on (drop)import) | Georg Ehrke | 2012-06-30 | 1 | -10/+3 |
| | | | | |||||
* | | | | Make file actions permissions aware | Michael Gapczynski | 2012-07-25 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | replace some direct links with OC.imagePath | Georg Ehrke | 2012-07-03 | 1 | -2/+2 |
| |/ |/| | |||||
* | | fix encoding fail in calendar app - bugfix for oc-1194 | Georg Ehrke | 2012-07-03 | 1 | -1/+1 |
|/ | |||||
* | pass progresskey the correct way during calender import | Robin Appelman | 2012-06-29 | 1 | -1/+1 |
| | |||||
* | date don't change correctly in the view list (bug #973) fixed | Bjoern Schiessle | 2012-06-22 | 1 | -0/+2 |
| | |||||
* | Calendar: Fix caldav url encoding | Bart Visscher | 2012-06-21 | 1 | -2/+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 |
| | | |||||
* | | Calendar: js fix | Georg Ehrke | 2012-06-19 | 1 | -1/+1 |
| | | |||||
* | | fix merge conflicts | Georg Ehrke | 2012-06-15 | 1 | -1/+18 |
|\| | |||||
| * | Update calendar after delete. | Thomas Tanghus | 2012-06-15 | 1 | -0/+1 |
| | | |||||
| * | Calendar: Clicking #datecontrol_date gives datepicker to jump to date | Bart Visscher | 2012-06-13 | 1 | -1/+17 |
| | | |||||
| * | Calendar: Make button of #datecontrol_date | Bart Visscher | 2012-06-13 | 1 | -1/+1 |
| | | |||||
* | | add some information about repeating events caching on personal settings page | Georg Ehrke | 2012-06-11 | 1 | -1/+18 |
| | | |||||
* | | fix merge conflicts | Georg Ehrke | 2012-06-10 | 3 | -10/+11 |
|\| | |||||
| * | increase height of event dialog | Georg Ehrke | 2012-06-09 | 1 | -0/+1 |
| | | |||||
| * | make use of post instead of get | Georg Ehrke | 2012-06-09 | 3 | -10/+10 |
| | | |||||
* | | Merge branch 'master' into calendar_repeat | Georg Ehrke | 2012-06-06 | 1 | -6/+6 |
|\| | |||||
| * | Calendar & Contacts: Store import progress in OC_Cache | Bart Visscher | 2012-06-04 | 1 | -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 cache | Georg Ehrke | 2012-05-29 | 1 | -0/+3 |
|/ | |||||
* | add urlencode for caldav link | Georg Ehrke | 2012-05-28 | 1 | -0/+1 |
| | |||||
* | fix share for users with a point within their name | Georg Ehrke | 2012-05-26 | 1 | -3/+4 |
| | |||||
* | Merge branch 'master' into calendar_dropimport | Georg Ehrke | 2012-05-17 | 1 | -2/+3 |
|\ | |||||
| * | fix paths to images and set height for calendar management dialog | Georg Ehrke | 2012-05-17 | 1 | -2/+3 |
| | | |||||
* | | some little js fixes for drop import | Georg Ehrke | 2012-05-13 | 1 | -2/+2 |
| | | |||||
* | | add first version of drop import | Georg Ehrke | 2012-05-13 | 1 | -0/+45 |
|/ | |||||
* | Calendar: Resize content after creating calendar layout | Bart Visscher | 2012-05-08 | 1 | -0/+1 |
| | | | | The calendar can be higher than the window, this corrects for the scrollbar | ||||
* | make calendar compatible with public.php | Georg Ehrke | 2012-05-07 | 1 | -1/+4 |
| | |||||
* | fix path in calendars geo.js | Georg Ehrke | 2012-04-30 | 1 | -1/+1 |
| | |||||
* | removing executable bit from various files | Thomas Mueller | 2012-04-30 | 1 | -0/+0 |
| | |||||
* | implement shared calendar activation on server side | Georg Ehrke | 2012-04-18 | 1 | -0/+1 |
| | |||||
* | implement shared calendar activation on js-side | Georg Ehrke | 2012-04-18 | 1 | -4/+4 |
| | |||||
* | fix merge conflicts | Georg Ehrke | 2012-04-13 | 1 | -7/+8 |
|\ | |||||
| * | Use the same category input and management as the contacts app | Bart Visscher | 2012-04-12 | 1 | -7/+8 |
| | | |||||
* | | fix address of public shared calendars | Georg Ehrke | 2012-04-13 | 1 | -1/+1 |
| | |