summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2284-529/+764
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2111-152/+164
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2015-831/+416
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2035-66/+468
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2023-120/+154
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-194-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-186-10/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1810-263/+217
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1815-97/+261
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-171-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1710-32/+106
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-169-25/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1625-43/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-161-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1625-284/+247
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1522-400/+446
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1539-204/+889
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1350-91/+1221
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1371-955/+6073
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-10151-542/+21826
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-0846-311/+853
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-06630-8675/+29340
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't change events timezone and remove the DTSTART value tagGeorg Ehrke2012-06-041-5/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-042-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-0310-23/+146
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proper export for calendar app - doesn't work with apple ical yet - even thou...Georg Ehrke2012-06-033-14/+62
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some more work on calendar import classGeorg Ehrke2012-06-301-13/+90
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into calendar_importGeorg Ehrke2012-06-2949-269/+482
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix WebDAV external storage opendir() and stat() for directories, bug fix for...Michael Gapczynski2012-06-291-14/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increment user_openid version to load new app typeBart Visscher2012-06-291-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coding style fixesBart Visscher2012-06-292-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitespace fixesBart Visscher2012-06-293-8/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix displaying of eventsGeorg Ehrke2012-06-291-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add some hooks to fix calendar sharingGeorg Ehrke2012-06-292-1/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow multiple Google Drive and Dropbox external storages to be configuredMichael Gapczynski2012-06-292-2/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear the mount point value for the new mount point rowMichael Gapczynski2012-06-291-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide the delete button on new mount point rowMichael Gapczynski2012-06-292-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typo fixedBjoern Schiessle2012-06-291-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix birthday calendarGeorg Ehrke2012-06-292-10/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - when creating a new text file or directory which name already exist use the...Bjoern Schiessle2012-06-292-4/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove leading http[s] to let createBaseUri() generate secure/unsecure base...Bjoern Schiessle2012-06-291-3/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of gitorious.org:owncloud/owncloudFrank Karlitschek2012-06-2924-173/+284
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pass progresskey the correct way during calender importRobin Appelman2012-06-291-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix external storage UI for Admin pageMichael Gapczynski2012-06-284-5/+5
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spelling fixBart Visscher2012-06-281-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gallery: Get all the image information for a directory at onceBart Visscher2012-06-281-4/+20
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remember the app root information.Bart Visscher2012-06-281-1/+5
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant code from OC_Helper::linkToBart Visscher2012-06-281-6/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pg setup enhancementBrice Maron2012-06-281-2/+32
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |