summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* no longer show deleted files as selectedRobin Appelman2011-07-261-3/+5
* remove debug alertRobin Appelman2011-07-261-1/+0
* Merge branch 'master' into interfaceRobin Appelman2011-07-261-3/+10
|\
| * fix sorting on newly inserted items in the file listRobin Appelman2011-07-261-3/+10
* | fit player controls in smaller headerRobin Appelman2011-07-261-2/+2
* | some javascript changesRobin Appelman2011-07-262-43/+67
* | merge master into interfaceRobin Appelman2011-07-2628-1750/+1308
|\|
| * some refactoring of the media player codeRobin Appelman2011-07-2611-861/+297
| * updated localization filesJan-Christoph Borchardt2011-07-265-19/+70
| * remove some dummy codeRobin Appelman2011-07-251-4/+0
| * bumb jquery and jquery-ui versionsRobin Appelman2011-07-256-850/+854
| * add js versions of linkTo, imagePath,addScript and addStyleRobin Appelman2011-07-251-0/+38
| * add getSelectedFiles() to files.jsRobin Appelman2011-07-251-10/+28
| * add OC_APP::getCurrentApp() to get the id of the active appRobin Appelman2011-07-251-0/+16
| * Show installed apps as default for the apps entry on the settings page.Robin Appelman2011-07-252-5/+4
| * fix sabredav for sqlite2Robin Appelman2011-07-251-1/+1
* | Merge branch 'master' into interfaceRobin Appelman2011-07-23164-3885/+20687
|\|
| * Merge branch 'sabredav'Jakob Sack2011-07-22162-3882/+20684
| |\
| | * Merge branch 'sabredav' of git://anongit.kde.org/owncloud into sabredavJakob Sack2011-07-221-1/+1
| | |\
| | | * fix problem with removing locksRobin Appelman2011-07-221-1/+1
| | * | Remove HTTP_WebdavJakob Sack2011-07-221-757/+0
| | |/
| | * Update docs, db schemeJakob Sack2011-07-224-259/+91
| | * Properties work fine nowJakob Sack2011-07-222-15/+19
| | * properties nearly workJakob Sack2011-07-222-1/+93
| | * Support for locks, minor changesJakob Sack2011-07-226-12/+156
| | * Use SabreDAV authentication Code!Jakob Sack2011-07-202-28/+47
| | * Integration of SabreDAVJakob Sack2011-07-20155-2851/+20319
| * | remove some debug output and supress some possible errorsRobin Appelman2011-07-222-3/+3
* | | some work on the breadcrumb navigation for filesRobin Appelman2011-07-224-4/+38
* | | show error when trying to upload to large filesRobin Appelman2011-07-223-31/+53
* | | Merge branch 'master' into interfaceRobin Appelman2011-07-221-2/+10
|\| |
| * | fix warning if no username is set in the cookieRobin Appelman2011-07-221-2/+10
* | | show fixed filecontrols over the filelist that can scroll underneath itRobin Appelman2011-07-221-1/+1
* | | Merge branch 'master' into interfaceRobin Appelman2011-07-223-4/+2
|\| |
| * | dont load some javascript files multiply timesRobin Appelman2011-07-222-2/+0
| * | fix resizing images in image viewerRobin Appelman2011-07-211-2/+2
* | | show fileactions inline on hoverRobin Appelman2011-07-225-38/+35
* | | only show actions for selected file if there are selected filesRobin Appelman2011-07-211-0/+2
* | | give the file sizes some more spaceRobin Appelman2011-07-211-2/+5
* | | Merge branch 'master' into interfaceRobin Appelman2011-07-22114-0/+46513
|\| |
| * | import media appRobin Appelman2011-07-22112-0/+46482
| * | add getLocalFile to local storage providerRobin Appelman2011-07-221-0/+4
| * | finally the missing file for moving files from the web interfaceRobin Appelman2011-07-221-0/+27
* | | some work on the updated interfaceRobin Appelman2011-07-219-79/+133
|/ /
* | only remove old sqlite database if it existsRobin Appelman2011-07-211-1/+3
* | forgot to commit css for user managementRobin Appelman2011-07-201-0/+3
* | moved Remember login below password fieldJan-Christoph Borchardt2011-07-201-2/+2
* | fixed file size color calculationJan-Christoph Borchardt2011-07-201-1/+1
* | Allow users to start a new upload before the current upload has finishedRobin Appelman2011-07-203-24/+38
* | Some ui work on user management, but it can still use a lot of improvement.Robin Appelman2011-07-205-89/+84