Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-07-21 | 25 | -16/+59 |
|\ | |||||
| * | some style fixes for calendar | Georg Ehrke | 2012-07-21 | 1 | -1/+3 |
| * | DRY for getting calendar timezone setting | Bart Visscher | 2012-07-21 | 4 | -5/+15 |
| * | Add CSRF checks | Lukas Reschke | 2012-07-20 | 3 | -2/+8 |
| * | Added CSRF checks to Calendar. Expect some error messages - and report them ;) | Thomas Tanghus | 2012-07-17 | 14 | -2/+15 |
| * | Added hook for postCreateUser. Probably fix for oc-1265. | Thomas Tanghus | 2012-07-17 | 2 | -1/+13 |
| * | stop using of OC_L10N::tA | Georg Ehrke | 2012-07-16 | 1 | -4/+4 |
* | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-07-15 | 1 | -1/+1 |
|\| | |||||
| * | fix remote and public.php | Robin Appelman | 2012-07-13 | 1 | -1/+1 |
* | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-07-11 | 3 | -1/+8 |
|\| | |||||
| * | Implemented Sabre iCalendar Export Plugin. | Thomas Tanghus | 2012-07-08 | 3 | -1/+8 |
* | | comment out some code | Georg Ehrke | 2012-07-06 | 1 | -6/+6 |
* | | some more work on calendar import - new import is (nearly) done | Georg Ehrke | 2012-07-04 | 5 | -7/+44 |
* | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-07-04 | 1 | -2/+2 |
|\| | |||||
| * | replace some direct links with OC.imagePath | Georg Ehrke | 2012-07-03 | 1 | -2/+2 |
* | | some more work on calendar import | Georg Ehrke | 2012-07-03 | 5 | -30/+80 |
* | | fix spelling fail in code | Georg Ehrke | 2012-07-03 | 1 | -1/+1 |
* | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-07-03 | 1 | -1/+1 |
|\| | |||||
| * | fix encoding fail in calendar app - bugfix for oc-1194 | Georg Ehrke | 2012-07-03 | 1 | -1/+1 |
* | | some work on calendar import dialog | Georg Ehrke | 2012-07-03 | 6 | -70/+132 |
* | | remove some whitespace | Georg Ehrke | 2012-07-01 | 1 | -2/+0 |
* | | some work on calendar import | Georg Ehrke | 2012-07-01 | 4 | -83/+151 |
* | | use light grey instead of white | Georg Ehrke | 2012-07-01 | 1 | -1/+1 |
* | | fix doc for OC_Calendar_Calendar::generateTextColor() | Georg Ehrke | 2012-07-01 | 1 | -1/+2 |
* | | add algorithm to generate the calendar's text color | Georg Ehrke | 2012-07-01 | 1 | -1/+18 |
* | | improvements for dropoimport | Georg Ehrke | 2012-06-30 | 3 | -7/+25 |
* | | little fix for import | Georg Ehrke | 2012-06-30 | 1 | -1/+2 |
* | | improve dropimport | Georg Ehrke | 2012-06-30 | 3 | -2/+23 |
* | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-06-30 | 6 | -145/+231 |
|\| | |||||
| * | fix documentation style | Georg Ehrke | 2012-06-30 | 6 | -101/+186 |
| * | fix some doc | Georg Ehrke | 2012-06-30 | 1 | -42/+42 |
| * | some improvements for calendar export | Georg Ehrke | 2012-06-30 | 1 | -2/+3 |
* | | import works now for dropimport | Georg Ehrke | 2012-06-30 | 2 | -22/+36 |
* | | some work on (drop)import) | Georg Ehrke | 2012-06-30 | 5 | -86/+94 |
* | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-06-30 | 4 | -26/+120 |
|\| | |||||
| * | fix merge conflicts | Georg Ehrke | 2012-06-30 | 4 | -9/+38 |
| |\ | |||||
| * | | fix for previous commit | Georg Ehrke | 2012-06-28 | 1 | -0/+1 |
| * | | use OC_Calendar_Export for publicly shared calendars | Georg Ehrke | 2012-06-28 | 1 | -13/+21 |
| * | | Calendar Export: replace spaces with dashes in the name of the calendar / event | Georg Ehrke | 2012-06-28 | 1 | -2/+2 |
| * | | some changes and more doc for OC_Calendar_Export class | Georg Ehrke | 2012-06-28 | 1 | -19/+55 |
| * | | fix calendar export for Apple iCal - i hate bloody line ends | Georg Ehrke | 2012-06-28 | 1 | -0/+3 |
| * | | fix style of some doc | Georg Ehrke | 2012-06-27 | 1 | -5/+5 |
| * | | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-27 | 2 | -14/+44 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-27 | 1 | -0/+8 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-26 | 2 | -1/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-22 | 10 | -17/+57 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-20 | 13 | -91/+416 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-20 | 3 | -5/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into calendar_export | Georg Ehrke | 2012-06-16 | 25 | -43/+25 |
| |\ \ \ \ \ \ \ \ \ |