summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove console.log in apps.jsGeorg Ehrke2014-06-041-1/+0
* use isset() instead of array_key_exists()Georg Ehrke2014-06-031-1/+1
* various fixes as requested by pr reviewersGeorg Ehrke2014-06-025-28/+22
* read ocsid from shipped apps on installGeorg Ehrke2014-05-311-0/+3
* Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-05-311-3/+3
|\
| * Merge pull request #8798 from owncloud/fix-corejsVincent Petry2014-05-311-3/+3
| |\
| | * Fix undefined JS on login/setup pageVincent Petry2014-05-301-3/+3
* | | add button for properly uninstalling appsGeorg Ehrke2014-05-315-11/+48
* | | Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-05-311948-48418/+116556
|\| |
| * | [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
| |\ \
| | * | - fix dropTable() and introduce tableExists()Thomas Müller2014-05-304-98/+65
| | |/
| * | Merge pull request #8444 from owncloud/cleanup-list-codeThomas Müller2014-05-303-17/+14
| |\ \
| | * \ Merge branch 'master' into cleanup-list-codeThomas Müller2014-05-191565-36596/+68631
| | |\ \
| | * | | Add missing \Lukas Reschke2014-05-041-1/+1
| | * | | Cleanup code a little bitLukas Reschke2014-05-043-23/+15
| * | | | Merge pull request #7614 from owncloud/test_annotations_workingThomas Müller2014-05-303-0/+34
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | 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
| | |\ \ \ | | | | |/ | | | |/|
| | * | | 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
| |\ \ \ \
| | * | | | Missed one.ringmaster2014-05-301-1/+1
| | * | | | Updates per comments on PR:ringmaster2014-05-302-8/+22
| | * | | | 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 delayVincent Petry2014-05-231-2/+3
| * | | | | | Merge pull request #8779 from owncloud/sel-webdav-onclickVincent Petry2014-05-301-0/+3
| |\ \ \ \ \ \
| | * | | | | | 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 changeVolkan Gezer2014-05-301-1/+1
| * | | | | | | | Merge pull request #8663 from owncloud/files-dndissueLukas Reschke2014-05-304-6/+156
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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
| * | | | | | | | | Merge pull request #8781 from owncloud/add-a-warning-to-the-sampleThomas Müller2014-05-301-0/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fix wordingVolkan Gezer2014-05-301-1/+1
| | * | | | | | | | | Add a warning to the configuration fileLukas Reschke2014-05-291-0/+6
| * | | | | | | | | | Merge pull request #5365 from owncloud/filesize-improvements-32bitThomas Müller2014-05-309-93/+338
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | 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