summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* display "<1 kB" for really small filesMorris Jobke2014-06-024-3/+24
| | | | | * added parameters for humanFileSize to trigger that behaviour * add unit tests for that
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-0249-95/+105
|
* Merge pull request #8811 from owncloud/fix-phpdoc-apBernhard Posselt2014-06-011-9/+1
|\ | | | | Fix PHPDoc
| * Fix PHPDocLukas Reschke2014-06-011-9/+1
|/ | | | - Remove not anymore existing parameters - Fix typo
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-01367-2242/+2464
|
* Merge pull request #8798 from owncloud/fix-corejsVincent Petry2014-05-311-3/+3
|\ | | | | Fix undefined JS on login/setup page
| * Fix undefined JS on login/setup pageVincent Petry2014-05-301-3/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-31310-8947/+18171
| |
* | Merge pull request #8800 from owncloud/db-changes-as-required-by-8483Thomas Müller2014-05-314-98/+65
|\ \ | | | | | | Database code cleanup
| * | - fix dropTable() and introduce tableExists()Thomas Müller2014-05-304-98/+65
| |/ | | | | | | | | | | | | - kill replaceDB() - this function is unused and it's implementation obviously wrong - add method annotation OC_DB_StatementWrapper::fetchAll - remove duplicate code in Test_DBSchema and reuse OC_DB::tableExists - remove unused variables
* | Merge pull request #8444 from owncloud/cleanup-list-codeThomas Müller2014-05-303-17/+14
|\ \ | | | | | | Cleanup code of files_sharing/ajax/ a little bit
| * \ Merge branch 'master' into cleanup-list-codeThomas Müller2014-05-191565-36596/+68631
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/ajax/list.php
| * | | Add missing \Lukas Reschke2014-05-041-1/+1
| | | |
| * | | Cleanup code a little bitLukas Reschke2014-05-043-23/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use OCP\Response constants instead of the HTTP error code - Use checkAppEnabled() instead of OC_App::isEnabled with an if statement - Remove uneeded variable $baseURL - Rename $isvalid to $isValid
* | | | Merge pull request #7614 from owncloud/test_annotations_workingThomas Müller2014-05-303-0/+34
|\ \ \ \ | |_|_|/ |/| | | Check if ReflectionMethod::getDocComment is working
| * | | adding annotation check to checkServer()Thomas Müller2014-05-191-0/+6
| | | |
| * | | Merge branch 'master' into test_annotations_workingThomas Müller2014-05-191535-35935/+67372
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: lib/private/util.php
| * | | adopt new settings styleThomas Müller2014-05-091-2/+2
| | | |
| * | | Check if ReflectionMethod::getDocComment is workingThomas Tanghus2014-05-093-0/+28
| | | |
* | | | Merge pull request #8607 from owncloud/filescan_app_hookOwen Winkler2014-05-302-9/+46
|\ \ \ \ | | | | | | | | | | Allow apps to control via a hook skipping add/remove a file during filescan
| * | | | Missed one.ringmaster2014-05-301-1/+1
| | | | |
| * | | | Updates per comments on PR:ringmaster2014-05-302-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use "filesystem_cache_readonly" config setting, update comment in config.sample * Use $this->cacheActive to cache config setting * Add public Scanner::setCacheActive() to set $cacheActive programmatically
| * | | | Prevent apps from affecting the scanner via hook.ringmaster2014-05-281-16/+18
| | | | |
| * | | | Use 'filesystem_check_enable' as a config option.ringmaster2014-05-272-5/+8
| | | | |
| * | | | Allow the default behavior to come from the config.ringmaster2014-05-271-6/+12
| | | | |
| * | | | Rename variable to something more appropriate.ringmaster2014-05-271-3/+3
| | | | |
| * | | | Allow apps to control via a hook to skip adding/removing a file during filescanringmaster2014-05-271-3/+15
| | | | |
* | | | | Merge pull request #8695 from owncloud/jserrorfixesLukas Reschke2014-05-301-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Fixed undefined object error that appears after a delay
| * | | | | Fixed undefined object error that appears after a delayVincent Petry2014-05-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Now binding properly with the file list instance object.
* | | | | | Merge pull request #8779 from owncloud/sel-webdav-onclickVincent Petry2014-05-301-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | select webdav address on click
| * | | | | | select webdav address on clickVolkan Gezer2014-05-301-0/+3
| | | | | | |
* | | | | | | Merge pull request #8793 from owncloud/name-email-enter-preventVolkan Gezer2014-05-301-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | prevent pageload if pressed enter on name email change. fixes #6179
| * | | | | | | prevent pageload if pressed enter on name email changeVolkan Gezer2014-05-301-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #8663 from owncloud/files-dndissueLukas Reschke2014-05-304-6/+156
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed drag and drop from external files, added tests
| * | | | | | | | Fix dropping files below the tableVincent Petry2014-05-224-5/+15
| | | | | | | | |
| * | | | | | | | Fixed drag and drop from external files, added testsVincent Petry2014-05-212-5/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed detection whether the drop zone is inside the currently visible table - Now dragging outside the table does nothing instead of uploading, because the user might drop on the sidebar - Added unit tests for the drop handler
* | | | | | | | | Merge pull request #8781 from owncloud/add-a-warning-to-the-sampleThomas Müller2014-05-301-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a warning to the configuration file
| * | | | | | | | | fix wordingVolkan Gezer2014-05-301-1/+1
| | | | | | | | | |
| * | | | | | | | | Add a warning to the configuration fileLukas Reschke2014-05-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some people believe that they should copy the sample config to the "real" config. I noticed this several times in IRC and on the bugtracker. I guess this warning should be enough to avoid this in the future.
* | | | | | | | | | Merge pull request #5365 from owncloud/filesize-improvements-32bitThomas Müller2014-05-309-93/+338
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add LargeFileHelper / Add CURL filesize workaround / Fix some 32-bit filesize issues
| * | | | | | | | | | Typo: getFileSizeViaDOM -> getFileSizeViaCOMAndreas Fischer2014-05-291-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Document exceptions thrown by \OC\LargeFileHelper.Andreas Fischer2014-05-291-2/+7
| | | | | | | | | | |
| * | | | | | | | | | Use "file size" instead of "filesize", then also apply camel case.Andreas Fischer2014-05-292-40/+40
| | | | | | | | | | |
| * | | | | | | | | | Increase file size limit from 2 GiB to 4 GiB when workarounds are unavailable.Andreas Fischer2014-05-294-9/+31
| | | | | | | | | | |
| * | | | | | | | | | Cast '{DAV:}getcontentlength' to number instead of int.Andreas Fischer2014-05-292-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Cast to number instead of integer in OC\Files\Cache\HomeCacheAndreas Fischer2014-05-291-2/+4
| | | | | | | | | | |
| * | | | | | | | | | Cast to number instead of integer in OC\Files\Cache\CacheAndreas Fischer2014-05-291-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Add LargeFileHelper::__construct() verifying that our assumptions hold.Andreas Fischer2014-05-291-0/+25
| | | | | | | | | | |
| * | | | | | | | | | Add helper method for turning int|float into base-10 unsigned integer string.Andreas Fischer2014-05-292-0/+70
| | | | | | | | | | |
| * | | | | | | | | | Rename: LargeFileHelper -> LargeFileHelperGetFilesizeAndreas Fischer2014-05-291-1/+1
| | | | | | | | | | |