summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | merge master into databaseRobin Appelman2011-10-10582-10787/+26925
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitorious.org:owncloud/owncloudRobin Appelman2011-10-1011-27/+70
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | mimetype icon improvementsRobin Appelman2011-10-086-10/+31
| | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | always use mdb2 for installationRobin Appelman2011-09-181-2/+1
| * | | | | | | | | | | | | merge master into databaseRobin Appelman2011-09-183-9/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | dont use numRows when it's not needed since it can be expensiveRobin Appelman2011-09-174-15/+12
| * | | | | | | | | | | | | | add pdo backend to oc_dbRobin Appelman2011-09-171-135/+215
* | | | | | | | | | | | | | | Add some color in error messages + img for hintsBrice Maron2011-10-163-2/+106
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Remove unused parameterBart Visscher2011-10-151-1/+1
* | | | | | | | | | | | | | Fix calendar colors with new calendarBart Visscher2011-10-154-11/+17
* | | | | | | | | | | | | | Add loading message to image lightbox and tweak eventsBrice Maron2011-10-143-6/+22
* | | | | | | | | | | | | | correct language nameRobin Appelman2011-10-141-1/+1
* | | | | | | | | | | | | | Merge commit 'refs/merge-requests/61' of git://gitorious.org/owncloud/owncloudRobin Appelman2011-10-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Prevent category in jquery-ui on cal. to overflowBrice Maron2011-10-141-0/+1
* | | | | | | | | | | | | | | Merge commit 'refs/merge-requests/57' of git://gitorious.org/owncloud/owncloudRobin Appelman2011-10-142-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Improve handling of calendar export $_GET paramsJohn Kristensen2011-10-121-2/+2
| * | | | | | | | | | | | | | | remove 'description' from OC_Connector_Sabre_CalDAV propertyMapJohn Kristensen2011-10-121-1/+0
* | | | | | | | | | | | | | | | Merge commit 'refs/merge-requests/59' of git://gitorious.org/owncloud/owncloudRobin Appelman2011-10-141-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | made work with http authentication kind of sso loginPatrick Stricker2011-10-131-1/+13
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | / Initialise hasOtherDB var when not true in installationBrice Maron2011-10-141-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | prevent error involving webdav workaroundRobin Appelman2011-10-131-1/+1
* | | | | | | | | | | | | | webdav workaround for apache+php-cgiRobin Appelman2011-10-133-0/+16
* | | | | | | | | | | | | | mimetype icon improvementsRobin Appelman2011-10-136-10/+31
* | | | | | | | | | | | | | avoiding notice if ['HTTPS'] is not setMichiel@unhosted2011-10-131-1/+1
|/ / / / / / / / / / / / /
* | | | / / / / / / / / / Fixed a bug in checkWebserverUserJoar Wandborg2011-10-111-3/+2
| |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | master is now on the way to ownCloud 3v3.0alpha1Frank Karlitschek2011-10-101-2/+2
* | | | | | | | | | | | Merge branch 'master' of gitorious.org:owncloud/owncloudGeorg Ehrke2011-10-101-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add owncloud autosetup optionThomas Schmidt2011-10-101-1/+9
* | | | | | | | | | | | | reload calendar automaticallyGeorg Ehrke2011-10-101-0/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | fix webfinger install scriptMichiel@unhosted2011-10-091-1/+2
* | | | | | | | | | | | Merge branch 'master' of gitorious.org:owncloud/owncloudMichiel@unhosted2011-10-0996-975/+357
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move contact delete button to top right cornerBart Visscher2011-10-092-1/+2
| * | | | | | | | | | | | Show add contact form on opening contacts pageBart Visscher2011-10-092-8/+1
| * | | | | | | | | | | | apps/bookmarks: remove unused variableFlorian Pritz2011-10-081-2/+0
| * | | | | | | | | | | | apps/bookmarks: follow redirects when fetching titleFlorian Pritz2011-10-081-1/+48
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | webkit searchfield bug fixedMarvin Thomas Rabe2011-10-081-0/+1
| * | | | | | | | | | | removed description. changed target to _blank. removed sorting. updated layout.Marvin Thomas Rabe2011-10-0811-105/+41
| * | | | | | | | | | | removed description field for calendarMarvin Thomas Rabe2011-10-089-41/+15
| * | | | | | | | | | | added missing filesMarvin Thomas Rabe2011-10-082-0/+27
| * | | | | | | | | | | moved bookmarklet to personal. username must be provided when adding a new user.Marvin Thomas Rabe2011-10-084-23/+20
| * | | | | | | | | | | added code and license links next to version numberJan-Christoph Borchardt2011-10-082-3/+2
| * | | | | | | | | | | Revert "support of RRULE in calendar app"Jan-Christoph Borchardt2011-10-081-665/+34
| * | | | | | | | | | | Fixes for adding contact propertyBart Visscher2011-10-074-3/+4
| * | | | | | | | | | | Display contact name without label and in boldBart Visscher2011-10-071-2/+2
| * | | | | | | | | | | Save the right contact propertyBart Visscher2011-10-071-1/+1
| * | | | | | | | | | | Fix saving properties with a new contactBart Visscher2011-10-071-0/+11
| * | | | | | | | | | | Fix name when adding contactBart Visscher2011-10-071-1/+2
| * | | | | | | | | | | fix amapache urlRobin Appelman2011-10-071-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | fixes for the mimetype iconsRobin Appelman2011-10-0713-7/+7
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | disable openid on defaultRobin Appelman2011-10-071-1/+0