summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Delete oauth.cssLukas Reschke2014-04-041-4/+0
* Remove uneeded fileLukas Reschke2014-04-041-19/+0
* Merge pull request #8058 from owncloud/preview-highdpiVincent Petry2014-04-042-2/+8
|\
| * 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->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 existenceVincent Petry2014-04-031-5/+0
* | Merge pull request #8047 from owncloud/jshint-line-length-120Vincent Petry2014-04-041-2/+2
|\ \
| * | extending javascript line length to 120Thomas Müller2014-04-041-2/+2
* | | Merge pull request #8015 from owncloud/storageinfo-reuseVincent Petry2014-04-042-5/+8
|\ \ \ | |/ / |/| |
| * | 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
|\ \ \
| * | | 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
| * | | Fixed parseQueryString to handle empty values and plus signsVincent Petry2014-04-012-7/+92
* | | | 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into type-hintingBart Visscher2014-03-311700-54653/+94701
| |\ \ \
| * | | | 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 spamRobin McCorkell2014-04-031-4/+4
* | | | | | Merge pull request #7970 from owncloud/webdav-upload-hashThomas Müller2014-04-032-2/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 appRobin Appelman2014-04-021-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #7978 from owncloud/enc_cleanupVincent Petry2014-04-021-45/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | there is no need to re-calculate the shares after a touchBjoern Schiessle2014-03-311-45/+0
| | |_|/ / | |/| | |
* | | | | Merge pull request #7995 from owncloud/fix-h3-stylesMorris Jobke2014-04-022-2/+3
|\ \ \ \ \
| * | | | | fix h3 style, move out from settings to apps CSSJan-Christoph Borchardt2014-04-022-2/+3
* | | | | | Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclibVincent Petry2014-04-0227-723/+1287
|\ \ \ \ \ \
| * | | | | | Upgraded phpseclib to version 0.3.6Vincent Petry2014-04-0227-723/+1287
* | | | | | | Merge pull request #8006 from wakeup/masterMorris Jobke2014-04-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix admin-dir_permissions redirection when cannot write warningVolkan Gezer2014-04-021-1/+1
* | | | | | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-023-13/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | always encrypt files to ownerBjoern Schiessle2014-03-313-13/+11
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #7968 from owncloud/core-overwritewebrootwithrootVincent Petry2014-04-022-3/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Allow using "/" in "overwritewebroot"Vincent Petry2014-03-312-3/+4
| |/ / / / / /
* | | | | | | Merge pull request #7979 from owncloud/core-fixfilegetcontentsloopVincent Petry2014-04-023-8/+48
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Added missing fclose in file_get_contents and file_put_contentsVincent Petry2014-04-011-1/+4
| * | | | | | Correctly read the full stream in file_get_contentsVincent Petry2014-04-013-7/+44
| | |_|/ / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-02180-3035/+3004
| |_|_|_|/ |/| | | |