Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12664 from owncloud/fix-12164 | Thomas Müller | 2014-12-10 | 5 | -35/+119 |
|\ | | | | | Use httphelper and cache response even when it is empty | ||||
| * | Remove leftover | Victor Dubiniuk | 2014-12-10 | 1 | -1/+0 |
| | | |||||
| * | Inject config | Victor Dubiniuk | 2014-12-10 | 5 | -34/+46 |
| | | |||||
| * | Fix tests. Add two more test cases | Victor Dubiniuk | 2014-12-08 | 2 | -45/+59 |
| | | |||||
| * | Test OC\Updater::check | Victor Dubiniuk | 2014-12-06 | 1 | -2/+58 |
| | | |||||
| * | Use httphelper and cache response even when it empty | Victor Dubiniuk | 2014-12-06 | 4 | -23/+26 |
| | | |||||
* | | Merge pull request #12695 from owncloud/db-drop-table | Morris Jobke | 2014-12-09 | 5 | -47/+139 |
|\ \ | | | | | | | Add dropTable to IDBConnection | ||||
| * | | Quote identifiers for oracle | Robin Appelman | 2014-12-09 | 1 | -0/+27 |
| | | | |||||
| * | | add unit tests for tableExists and dropTable | Robin Appelman | 2014-12-09 | 1 | -0/+69 |
| | | | |||||
| * | | Add tableExists to public db api | Robin Appelman | 2014-12-09 | 3 | -38/+23 |
| | | | |||||
| * | | Add dropTable to IDBConnection | Robin Appelman | 2014-12-09 | 3 | -10/+21 |
| | | | |||||
* | | | Merge pull request #12724 from owncloud/fix-autotest-no-file | Thomas Müller | 2014-12-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix autotest no file | ||||
| * | | | Correctly run all tests again when no file is specified | Joas Schilling | 2014-12-09 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #11214 from owncloud/issue/10836 | Morris Jobke | 2014-12-09 | 6 | -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 users | Joas Schilling | 2014-12-09 | 6 | -6/+29 |
| | | | | | | | | | | | | | | | | Fix #10836 | ||||
* | | | | Merge pull request #12409 from owncloud/tags-getTagsForObjectIds | Joas Schilling | 2014-12-09 | 3 | -1/+89 |
|\ \ \ \ | | | | | | | | | | | Add getTagsForObjects in ITags | ||||
| * | | | | Add getTagsForObjects in ITags | Vincent Petry | 2014-12-08 | 3 | -1/+89 |
| | | | | | | | | | | | | | | | | | | | | Returns the list of tags that are set on the given object ids. | ||||
* | | | | | Merge pull request #12722 from owncloud/autocomplete-for-autotest-jenkins | Thomas Müller | 2014-12-09 | 1 | -1/+5 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Allow autocomplete for test file in autotest.sh | ||||
| * | | | | Allow autocomplete for test file in autotest.sh | Joas Schilling | 2014-12-09 | 1 | -1/+5 |
| | | | | | |||||
* | | | | | Merge pull request #12568 from owncloud/autoload-encryption-classes | Joas Schilling | 2014-12-09 | 43 | -708/+685 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix namespaces of encryption classes and encryption tests | ||||
| * | | | | Correctly namespace encryption tests | Joas Schilling | 2014-12-09 | 12 | -185/+181 |
| | | | | | |||||
| * | | | | Use self:: instead of the class name in encryption tests | Joas Schilling | 2014-12-09 | 10 | -361/+361 |
| | | | | | |||||
| * | | | | Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself | Joas Schilling | 2014-12-09 | 34 | -252/+248 |
| | | | | | |||||
| * | | | | Fix namespace of Files_Encryption outside of the app | Joas Schilling | 2014-12-09 | 5 | -7/+7 |
| | | | | | |||||
| * | | | | Fix namespace of files_encryption classes and autoload them | Joas Schilling | 2014-12-09 | 13 | -27/+12 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #12651 from owncloud/add-requesttoken-to-base-template | Thomas Müller | 2014-12-09 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Add requesttoken to base template | ||||
| * | | | | Add requesttoken to base template | Lukas Reschke | 2014-12-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/12580 | ||||
* | | | | | Merge pull request #12672 from LEDfan/cm-per-unit | Thomas Müller | 2014-12-09 | 2 | -4/+213 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix Contactsmanager permission + unit test | ||||
| * | | | | | Remove config file | LEDfan | 2014-12-08 | 1 | -21/+0 |
| | | | | | | |||||
| * | | | | | Mock interface | LEDfan | 2014-12-08 | 1 | -30/+9 |
| | | | | | | |||||
| * | | | | | Use PHPUnit mocks | LEDfan | 2014-12-07 | 2 | -27/+51 |
| | | | | | | |||||
| * | | | | | Add unit test for contactsmanager | LEDfan | 2014-12-07 | 1 | -0/+227 |
| | | | | | | |||||
| * | | | | | Fix permissions | LEDfan | 2014-12-06 | 1 | -4/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #12708 from owncloud/l10nsaved | Thomas Müller | 2014-12-09 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | translated saved message in files external | ||||
| * | | | | | translated saved message in files external | Volkan Gezer | 2014-12-08 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #12688 from owncloud/rename-alt | Lukas Reschke | 2014-12-09 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | introduce alt text for rename icon - fixes #12067 | ||||
| * | | | | | | introduce alt text for rename icon - fixes #12067 | Morris Jobke | 2014-12-08 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #12715 from owncloud/fix-broken-personal-page | Lukas Reschke | 2014-12-09 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | remove duplicate loaded personal.js - fixes #12674 | ||||
| * | | | | | | | remove duplicate loaded personal.js - fixes #12674 | Morris Jobke | 2014-12-09 | 1 | -1/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #12709 from owncloud/fix-11955 | Morris Jobke | 2014-12-09 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Skip headers that can not be split | ||||
| * | | | | | | | Skip headers that can not be split | Victor Dubiniuk | 2014-12-08 | 1 | -0/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #12406 from owncloud/drop-getApps-getUsers | Thomas Müller | 2014-12-09 | 39 | -841/+1034 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Config cleanup - OC_Preferences refactoring | ||||
| * | | | | | | | drop unused isDebugMode and setDebugMode of OC_Config | Morris Jobke | 2014-12-08 | 2 | -51/+0 |
| | | | | | | | | |||||
| * | | | | | | | reduce OC_Preferences, OC_Config and \OCP\Config usage | Morris Jobke | 2014-12-08 | 21 | -49/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * files_encryption * files_versions * files_trashbin * tests * status.php * core * server container | ||||
| * | | | | | | | Workaround to fix the too early init dilemma | Morris Jobke | 2014-12-08 | 3 | -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-update | Morris Jobke | 2014-12-08 | 6 | -15/+153 |
| | | | | | | | | |||||
| * | | | | | | | Refactoring of OC_Preferences to AllConfig | Morris Jobke | 2014-12-08 | 8 | -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 systems | Morris Jobke | 2014-12-08 | 1 | -25/+25 |
| | | | | | | | | |||||
| * | | | | | | | migrate \OC\AllConfig to \OCP\IConfig | Morris Jobke | 2014-12-08 | 6 | -14/+17 |
| | | | | | | | | |||||
| * | | | | | | | introduce deleteAllUserValues | Morris Jobke | 2014-12-08 | 2 | -0/+16 |
| | | | | | | | |