summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8017 from Raydiation/masterblizzz2014-04-071-7/+7
|\ | | | | Remove dependency on container, removing service locator antipattern
| * Remove dependency on container, removing service locator antipatternBernhard Posselt2014-04-021-7/+7
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0734-351/+459
| |
* | Merge pull request #8064 from owncloud/remove-not-existing-functionsLukas Reschke2014-04-061-27/+0
|\ \ | | | | | | Removed two unused functions
| * | Removed two unused functionsLukas Reschke2014-04-041-27/+0
| | | | | | | | | These two functions were actually not usable and only a todo since ages. I think it's better to remove it than having dead and unmaintained code.
* | | Update README.mdVolkan Gezer2014-04-061-1/+1
| | | | | | | | | Update to the correct link (version 6.0)
* | | Update README.mdVolkan Gezer2014-04-061-1/+1
| | |
* | | Update README.mdVolkan Gezer2014-04-061-1/+1
| | | | | | | | | Change version.
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0630-123/+146
| | |
* | | Merge pull request #8072 from owncloud/slideshow-buttonsjbtbnl2014-04-061-1/+1
|\ \ \ | | | | | | | | Fix slideshow buttons being invisible
| * | | Fix slideshow buttons being invisibleRobin Appelman2014-04-061-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0512-12/+12
| | | |
* | | | Merge pull request #8061 from owncloud/remove-uneeded-fileTom Needham2014-04-053-62/+0
|\ \ \ \ | |/ / / |/| | | Remove uneeded file
| * | | Delete auth.cssLukas Reschke2014-04-041-39/+0
| | | |
| * | | Delete oauth.cssLukas Reschke2014-04-041-4/+0
| | | |
| * | | Remove uneeded fileLukas Reschke2014-04-041-19/+0
| |/ / | | | | | | This file seems not to be actually used anywhere.
* | | Merge pull request #8062 from owncloud/remove-echoJörn Friedrich Dreyer2014-04-041-5/+5
|\ \ \ | |/ / |/| | Replace echo with `p` or `print_unescaped`
| * | Replace echo with `p` or `print_unescaped`Lukas Reschke2014-04-041-5/+5
|/ / | | | | Using echo instead of `p` or `print_unescaped` is a bad style, to prevent people from copying it I've adjusted it.
* | Merge pull request #8058 from owncloud/preview-highdpiVincent Petry2014-04-042-2/+8
|\ \ | | | | | | Show higher resolution previews for high dpi screens
| * | Show higher resolution previews for high dpi screensRobin Appelman2014-04-042-2/+8
| | |
* | | Merge pull request #8055 from owncloud/getfileinfo-existsicewind19912014-04-041-0/+3
|\ \ \ | | | | | | | | dont scan not existing files in View->getFileInfo
| * | | dont scan not existing files in View->getFileInfoRobin Appelman2014-04-041-0/+3
| |/ /
* | | Merge pull request #8039 from owncloud/chunking-removeexpireinhaskeyVincent Petry2014-04-041-5/+0
|\ \ \ | |/ / |/| | Do not expire chunks while checking for their existence
| * | Do not expire chunks while checking for their existenceVincent Petry2014-04-031-5/+0
| | | | | | | | | | | | | | | The expiration should be done by the gc() function on login, not while isComplete() is calling hasKey() for every chunk.
* | | Merge pull request #8047 from owncloud/jshint-line-length-120Vincent Petry2014-04-041-2/+2
|\ \ \ | | | | | | | | extending javascript line length to 120
| * | | extending javascript line length to 120Thomas Müller2014-04-041-2/+2
| | | | | | | | | | | | | | | | adding xit to globals
* | | | Merge pull request #8015 from owncloud/storageinfo-reuseVincent Petry2014-04-042-5/+8
|\ \ \ \ | |/ / / |/| | | Allow reusing FileInfo for getStorageInfo
| * | | Allow reusing FileInfo for getStorageInfoRobin Appelman2014-04-022-5/+8
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-04245-8779/+7887
| | |
* | | Merge pull request #6968 from owncloud/files-ajaxloadMorris Jobke2014-04-0342-1378/+2449
|\ \ \ | | | | | | | | Ajaxify files list for files + trashbin + public page
| * | | Correctly set svg for crumb dividerVincent Petry2014-04-031-1/+1
| | | |
| * | | Fixed dirInfo check for non existing dir in files ajax callVincent Petry2014-04-031-1/+1
| | | |
| * | | Fixed mime type attribute access in file overwrite dialogVincent Petry2014-04-031-1/+1
| | | |
| * | | Removed redundant free space and upload limit in public pageVincent Petry2014-04-031-4/+0
| | | |
| * | | Files, trashbin, public apps use ajax/JSON for the file listVincent Petry2014-04-0241-1369/+2359
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files app: - removed file list template, now rendering list from JSON response - FileList.addFile/addDir is now FileList.add() and takes a JS map with all required arguments instead of having a long number of function arguments - added unit tests for many FileList operations - fixed newfile.php, newfolder.php and rename.php to return the file's full JSON on success - removed obsolete/unused undo code - removed download_url / loading options, now using Files.getDownloadUrl() for that - server side now uses Helper::getFileInfo() to prepare file JSON response - previews are now client-side only Breadcrumbs are now JS only: - Added BreadCrumb class to handle breadcrumb rendering and events - Added unit test for BreadCrumb class - Moved all relevant JS functions to the BreadCrumb class Public page now uses ajax to load the file list: - Added Helper class in sharing app to make it easier to authenticate and retrieve the file's real path - Added ajax/list.php to retrieve the file list - Fixed FileActions and FileList to work with the ajax list Core: - Fixed file picker dialog to use the same list format as files app
| * | | Fixed parseQueryString to handle empty values and plus signsVincent Petry2014-04-012-7/+92
| | | | | | | | | | | | | | | | | | | | | | | | - now correctly parse query strings with '+' signs - empty values are now parsed either as null or empty string - added unit test for parseQueryString()
* | | | Exclude javascript specs from code analysisThomas Müller2014-04-031-0/+1
| | | |
* | | | Merge pull request #7476 from owncloud/type-hintingThomas Müller2014-04-0318-37/+34
|\ \ \ \ | |_|_|/ |/| | | Type hinting
| * | | Merge branch 'master' into type-hintingBart Visscher2014-03-311700-54653/+94701
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/image.php lib/private/l10n.php lib/private/request.php lib/private/share/mailnotifications.php lib/private/template/base.php
| * | | | More PHPDoc updatesBart Visscher2014-02-285-9/+10
| | | | |
| * | | | Type is with a small letterBart Visscher2014-02-281-1/+1
| | | | |
| * | | | More PHPDoc fixes, using scrutinizer patches as hintsBart Visscher2014-02-2812-22/+20
| | | | |
| * | | | Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10NBart Visscher2014-02-284-27/+26
| | | | |
* | | | | Merge pull request #7969 from Xenopathic/files_external_fixVincent Petry2014-04-031-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix error log spam
| * | | | | Fix error log spamRobin McCorkell2014-04-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Regression from e002b7242cb19a0e028d325cd64b57e67dc48108
* | | | | | Merge pull request #7970 from owncloud/webdav-upload-hashThomas Müller2014-04-032-2/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix uploading files containing a # in the path for webdav
| * | | | | Fix uploading files containing a # in the path for webdavRobin Appelman2014-03-312-2/+21
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0340-119/+145
| | | | | |
* | | | | | Merge pull request #8014 from owncloud/uploadsize-reuseicewind19912014-04-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reuse known free space in the files app
| * | | | | | Reuse known free space in the files appRobin Appelman2014-04-021-1/+1
| | |_|_|_|/ | |/| | | |