summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7629 from owncloud/files-allfileswarningtypoVincent Petry2014-03-101-1/+1
|\
| * Fixed log warning when deleting a single fileVincent Petry2014-03-071-1/+1
* | Merge pull request #7631 from ichEben/masterVincent Petry2014-03-101-1/+1
|\ \
| * | only initialise upload dropZone if public upload is allowedIchEben2014-03-071-1/+1
| |/
* | Merge pull request #7624 from owncloud/enc-encryptedusedspacefixVincent Petry2014-03-105-2/+55
|\ \
| * | Return unencrypted_size of folder when queriedVincent Petry2014-03-074-0/+48
| * | Propagate unencrypted_size up to the file cache rootVincent Petry2014-03-071-2/+7
* | | Merge pull request #7628 from owncloud/fileinfo-typeThomas Tanghus2014-03-092-4/+14
|\ \ \
| * | | Check if value exists before returningRobin Appelman2014-03-071-2/+5
| * | | Fix FileInfo->getType errorsRobin Appelman2014-03-072-2/+9
* | | | Merge pull request #7567 from owncloud/apps-scroll-settingsJan-Christoph Borchardt2014-03-091-0/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | restrict height of settings and make scrollableJan-Christoph Borchardt2014-03-051-0/+3
* | | | Merge pull request #7529 from owncloud/getlocalfile-cacheicewind19912014-03-072-101/+116
|\ \ \ \
| * | | | Add caching for getLocalFile on remote storagesRobin Appelman2014-03-042-101/+116
* | | | | Merge pull request #7583 from owncloud/trusteddomainerrorpageVincent Petry2014-03-073-17/+214
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixed X-Forwarded-Host parsingVincent Petry2014-03-061-1/+2
| * | | | Added unit tests for serverHost and other related functionsVincent Petry2014-03-061-0/+137
| * | | | Added localhost as trusted domainVincent Petry2014-03-061-0/+5
| * | | | Show warning page when accessing server from an untrusted domainVincent Petry2014-03-062-16/+70
| | |_|/ | |/| |
* | | | Merge pull request #7592 from owncloud/fixstoragefreespaceVincent Petry2014-03-064-500/+641
|\ \ \ \
| * | | | Fixed upload issue when free space is not knownVincent Petry2014-03-062-2/+4
| * | | | Added unit tests for "add()" method for file uploadVincent Petry2014-03-062-499/+631
| * | | | Added testArea for JS Unit testsVincent Petry2014-03-061-0/+7
| |/ / /
* | | | Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fixVincent Petry2014-03-061-4/+3
|\ \ \ \
| * | | | Fix imagerotate and move loadFromBase64() one up.kondou2014-02-121-4/+3
* | | | | Revert "adding new javascript function OC.generateUrl(url, params)"Morris Jobke2014-03-061-24/+0
* | | | | Merge pull request #7579 from owncloud/introduce-generateUrl-masterMorris Jobke2014-03-062-0/+33
|\ \ \ \ \
| * | | | | adding js unit tests for OC.generateUrl()Thomas Müller2014-03-061-0/+9
| * | | | | adding new javascript function OC.generateUrl(url, params)Thomas Müller2014-03-061-0/+24
| | |/ / / | |/| | |
* | | | | Merge pull request #7494 from owncloud/fix-7307Vincent Petry2014-03-0617-179/+82
|\ \ \ \ \
| * | | | | Merge branch 'master' into fix-7307Thomas Müller2014-03-0647-229/+480
| |\| | | |
| * | | | | Removed obsolete OC.Router stubs in specHelperVincent Petry2014-03-051-10/+0
| * | | | | fixing js unit testsThomas Müller2014-03-053-11/+5
| * | | | | remove OC.Router.registerLoadedCallback()Thomas Müller2014-03-021-3/+1
| * | | | | fixing download url in files appThomas Müller2014-03-021-1/+1
| * | | | | adding JSDoc + remove unused functionThomas Müller2014-03-021-5/+8
| * | | | | Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-0214-154/+72
* | | | | | Merge pull request #7570 from owncloud/fix_issue_imagick_non_static_4Vincent Petry2014-03-063-62/+80
|\ \ \ \ \ \
| * \ \ \ \ \ fix merge conflictsGeorg Ehrke2014-03-0617-53/+93
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | fix issue with Non-static method Imagick ../..; @ doesn't seem to work in thi...Georg Ehrke2014-03-053-62/+80
* | | | | | | Merge pull request #7588 from owncloud/noise-repeatVincent Petry2014-03-061-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | fix noise not repeatingJan-Christoph Borchardt2014-03-061-1/+1
|/ / / / / /
* | | | | | Merge pull request #7575 from owncloud/issue/7571Vincent Petry2014-03-051-2/+2
|\ \ \ \ \ \
| * | | | | | Do not set #dir when on public.phpJoas Schilling2014-03-051-2/+2
* | | | | | | Merge pull request #7354 from pschmitt/masterLukas Reschke2014-03-055-7/+7
|\ \ \ \ \ \ \
| * | | | | | | Use 'command -v' to detect whether and where software is installed (instead o...Philipp Schmitt2014-02-215-7/+7
* | | | | | | | Merge pull request #7531 from owncloud/dont_create_shared_folderBjörn Schießle2014-03-057-28/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | don't allow to create a file or folder named 'Shared' in the root folder, als...Bjoern Schiessle2014-03-057-28/+66
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #7569 from owncloud/scrutinizer-tabsJan-Christoph Borchardt2014-03-053-16/+16
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | fix some spaces to tabs issues reported by ScrutinizerJan-Christoph Borchardt2014-03-053-16/+16
| | |_|/ / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-03 22:39:06 +0000