summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12664 from owncloud/fix-12164Thomas Müller2014-12-105-35/+119
|\ | | | | Use httphelper and cache response even when it is empty
| * Remove leftoverVictor Dubiniuk2014-12-101-1/+0
| |
| * Inject configVictor Dubiniuk2014-12-105-34/+46
| |
| * Fix tests. Add two more test casesVictor Dubiniuk2014-12-082-45/+59
| |
| * Test OC\Updater::checkVictor Dubiniuk2014-12-061-2/+58
| |
| * Use httphelper and cache response even when it emptyVictor Dubiniuk2014-12-064-23/+26
| |
* | Merge pull request #12695 from owncloud/db-drop-tableMorris Jobke2014-12-095-47/+139
|\ \ | | | | | | Add dropTable to IDBConnection
| * | Quote identifiers for oracleRobin Appelman2014-12-091-0/+27
| | |
| * | add unit tests for tableExists and dropTableRobin Appelman2014-12-091-0/+69
| | |
| * | Add tableExists to public db apiRobin Appelman2014-12-093-38/+23
| | |
| * | Add dropTable to IDBConnectionRobin Appelman2014-12-093-10/+21
| | |
* | | Merge pull request #12724 from owncloud/fix-autotest-no-fileThomas Müller2014-12-091-1/+1
|\ \ \ | | | | | | | | Fix autotest no file
| * | | Correctly run all tests again when no file is specifiedJoas Schilling2014-12-091-1/+1
|/ / /
* | | Merge pull request #11214 from owncloud/issue/10836Morris Jobke2014-12-096-6/+29
|\ \ \ | | | | | | | | Add an option to disallow sending sharing emails to non-owncloud users
| * | | Add an option to disallow sending sharing emails to non-owncloud usersJoas Schilling2014-12-096-6/+29
| | | | | | | | | | | | | | | | Fix #10836
* | | | Merge pull request #12409 from owncloud/tags-getTagsForObjectIdsJoas Schilling2014-12-093-1/+89
|\ \ \ \ | | | | | | | | | | Add getTagsForObjects in ITags
| * | | | Add getTagsForObjects in ITagsVincent Petry2014-12-083-1/+89
| | | | | | | | | | | | | | | | | | | | Returns the list of tags that are set on the given object ids.
* | | | | Merge pull request #12722 from owncloud/autocomplete-for-autotest-jenkinsThomas Müller2014-12-091-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | Allow autocomplete for test file in autotest.sh
| * | | | Allow autocomplete for test file in autotest.shJoas Schilling2014-12-091-1/+5
| | | | |
* | | | | Merge pull request #12568 from owncloud/autoload-encryption-classesJoas Schilling2014-12-0943-708/+685
|\ \ \ \ \ | |/ / / / |/| | | | Fix namespaces of encryption classes and encryption tests
| * | | | Correctly namespace encryption testsJoas Schilling2014-12-0912-185/+181
| | | | |
| * | | | Use self:: instead of the class name in encryption testsJoas Schilling2014-12-0910-361/+361
| | | | |
| * | | | Update OCA\Encryption to OCA\Files_Encryption in the encryption app itselfJoas Schilling2014-12-0934-252/+248
| | | | |
| * | | | Fix namespace of Files_Encryption outside of the appJoas Schilling2014-12-095-7/+7
| | | | |
| * | | | Fix namespace of files_encryption classes and autoload themJoas Schilling2014-12-0913-27/+12
| | |/ / | |/| |
* | | | Merge pull request #12651 from owncloud/add-requesttoken-to-base-templateThomas Müller2014-12-091-1/+1
|\ \ \ \ | | | | | | | | | | Add requesttoken to base template
| * | | | Add requesttoken to base templateLukas Reschke2014-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/12580
* | | | | Merge pull request #12672 from LEDfan/cm-per-unitThomas Müller2014-12-092-4/+213
|\ \ \ \ \ | | | | | | | | | | | | Fix Contactsmanager permission + unit test
| * | | | | Remove config fileLEDfan2014-12-081-21/+0
| | | | | |
| * | | | | Mock interfaceLEDfan2014-12-081-30/+9
| | | | | |
| * | | | | Use PHPUnit mocksLEDfan2014-12-072-27/+51
| | | | | |
| * | | | | Add unit test for contactsmanagerLEDfan2014-12-071-0/+227
| | | | | |
| * | | | | Fix permissionsLEDfan2014-12-061-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge pull request #12708 from owncloud/l10nsavedThomas Müller2014-12-091-2/+2
|\ \ \ \ \ | | | | | | | | | | | | translated saved message in files external
| * | | | | translated saved message in files externalVolkan Gezer2014-12-081-2/+2
| | | | | |
* | | | | | Merge pull request #12688 from owncloud/rename-altLukas Reschke2014-12-091-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | introduce alt text for rename icon - fixes #12067
| * | | | | | introduce alt text for rename icon - fixes #12067Morris Jobke2014-12-081-0/+1
| | | | | | |
* | | | | | | Merge pull request #12715 from owncloud/fix-broken-personal-pageLukas Reschke2014-12-091-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove duplicate loaded personal.js - fixes #12674
| * | | | | | | remove duplicate loaded personal.js - fixes #12674Morris Jobke2014-12-091-1/+0
| | | | | | | |
* | | | | | | | Merge pull request #12709 from owncloud/fix-11955Morris Jobke2014-12-091-0/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Skip headers that can not be split
| * | | | | | | Skip headers that can not be splitVictor Dubiniuk2014-12-081-0/+3
| |/ / / / / /
* | | | | | | Merge pull request #12406 from owncloud/drop-getApps-getUsersThomas Müller2014-12-0939-841/+1034
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Config cleanup - OC_Preferences refactoring
| * | | | | | | drop unused isDebugMode and setDebugMode of OC_ConfigMorris Jobke2014-12-082-51/+0
| | | | | | | |
| * | | | | | | reduce OC_Preferences, OC_Config and \OCP\Config usageMorris Jobke2014-12-0821-49/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * files_encryption * files_versions * files_trashbin * tests * status.php * core * server container
| * | | | | | | Workaround to fix the too early init dilemmaMorris Jobke2014-12-083-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * this needs to be properly fixed by a proper organisation of the base.php * introduced fixDIInit() in AllConfig that moves the injection of DatabaseConnection to a later point in time * problems mostly because of the autoconfig setup
| * | | | | | | introduce preCondition for setUserValue to provide atomic check-and-updateMorris Jobke2014-12-086-15/+153
| | | | | | | |
| * | | | | | | Refactoring of OC_Preferences to AllConfigMorris Jobke2014-12-088-681/+600
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * keep old static methods - mapped to new ones and deprecated * removed deleteApp, getUsers, getApps because they are unused * make AllConfig unit tests more robust against not cleaned up environments
| * | | | | | | fix base.php for not installed systemsMorris Jobke2014-12-081-25/+25
| | | | | | | |
| * | | | | | | migrate \OC\AllConfig to \OCP\IConfigMorris Jobke2014-12-086-14/+17
| | | | | | | |
| * | | | | | | introduce deleteAllUserValuesMorris Jobke2014-12-082-0/+16
| | | | | | | |