summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Correct little typo/bug in log display and remove ending php tagBrice Maron2011-10-181-2/+0
* Fix file sharing : Don't give a unused param to executeBrice Maron2011-10-171-1/+1
* Fix bookmark listing with mysql: limit is binded as string.Brice Maron2011-10-171-2/+2
* catch some edge cases in media playerRobin Appelman2011-10-171-2/+11
* prevent the remaining ob_clean related errorsRobin Appelman2011-10-176-10/+10
* prevent error in media player ajax apiRobin Appelman2011-10-171-1/+1
* Fix bookmarks app to work with postgresql.Brice Maron2011-10-163-20/+49
* use OC_Log instead of error_logRobin Appelman2011-10-1610-48/+31
* Merge branch 'master' of gitorious.org:owncloud/owncloud into calendarGeorg Ehrke2011-10-158-21/+42
|\
| * 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-142-6/+22
| * 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
* | | scrolling in calendarGeorg Ehrke2011-10-141-0/+38
* | | Merge branch 'master' into calendarGeorg Ehrke2011-10-131-1/+1
|\| |
| * | avoiding notice if ['HTTPS'] is not setMichiel@unhosted2011-10-131-1/+1
| |/
* | Merge branch 'master' into calendarGeorg Ehrke2011-10-109-24/+59
|\|
| * 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-0948-928/+267
| |\
| | * 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
| * | use install.php properlyMichiel@unhosted2011-10-093-12/+6
* | | Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editorTom Needham2011-10-0832-842/+154
|\ \ \ | | |/ | |/|
| * | 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-083-23/+16
| * | 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
* | | Fixed editor loading and file saving issueTom Needham2011-10-081-25/+28
* | | Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editorTom Needham2011-10-0717-109/+728
|\| |
| * | disable openid on defaultRobin Appelman2011-10-071-1/+0
| * | Merge branch 'master' of gitorious.org:owncloud/owncloudRobin Appelman2011-10-074-8/+6
| |\ \
| | * | some icon correctionsJan-Christoph Borchardt2011-10-072-3/+3
| | * | Change colorselector to use border for selected colorBart Visscher2011-10-072-5/+3
| * | | Merge branch 'master' of gitorious.org:owncloud/owncloudRobin Appelman2011-10-0715-135/+727
| |\| |
| | * | conflicts solvedMarvin Thomas Rabe2011-10-0610-70/+684
| | |\ \
| | | * | Add icon for calendar color selectorBart Visscher2011-10-061-1/+1
| | | * | Start using OC_JSON in gallery appBart Visscher2011-10-067-34/+17
| | | * | Replace _ in timezone setting with a spaceBart Visscher2011-10-061-1/+1