Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #12348 from owncloud/rename-to-avoid-complaining-ci | Morris Jobke | 2014-11-22 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Rename providers to not begin with test | Lukas Reschke | 2014-11-21 | 2 | -4/+4 | |
* | | | | | | | | Merge pull request #12328 from owncloud/remove-testcleanuplistener | Morris Jobke | 2014-11-22 | 3 | -186/+111 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove testcleanuplistener.php | Joas Schilling | 2014-11-20 | 2 | -181/+0 | |
| * | | | | | | | | Clean up the test data in tearDownAfterClass() | Joas Schilling | 2014-11-20 | 1 | -5/+111 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-22 | 42 | -12/+298 | |
| |_|/ / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #12342 from owncloud/fix-master-unit-tests | Thomas Müller | 2014-11-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | fix unit tests of mdb2scheamreader | Morris Jobke | 2014-11-20 | 1 | -2/+2 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-21 | 136 | -78/+1306 | |
* | | | | | | | | Merge pull request #12344 from owncloud/fixstypo | Thomas Müller | 2014-11-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | update grammar | Volkan Gezer | 2014-11-21 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Revert "drop OC_Preferences::getUsers and getApps" | Morris Jobke | 2014-11-20 | 3 | -0/+82 | |
* | | | | | | | Merge pull request #12336 from owncloud/drop-getApps-getUsers | Morris Jobke | 2014-11-20 | 3 | -82/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | drop OC_Preferences::getUsers and getApps | Morris Jobke | 2014-11-20 | 3 | -82/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #12330 from owncloud/jenkins-eat-that | Morris Jobke | 2014-11-20 | 7 | -42/+40 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | drop dependency of some commands on old config object | Morris Jobke | 2014-11-20 | 7 | -42/+40 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #12321 from owncloud/checkForXMLWriter | Thomas Müller | 2014-11-20 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Check for XMLWriter class | Lukas Reschke | 2014-11-20 | 1 | -0/+1 | |
* | | | | | | | | Fix file upload to ext storage when recovery key is enabled | Vincent Petry | 2014-11-20 | 2 | -9/+58 | |
* | | | | | | | | Merge pull request #12299 from owncloud/clean-lib-base-config | Morris Jobke | 2014-11-20 | 1 | -23/+29 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | replace double quotes with single quotes | Morris Jobke | 2014-11-19 | 1 | -1/+1 | |
| * | | | | | | | | replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfig | Morris Jobke | 2014-11-19 | 1 | -23/+29 | |
* | | | | | | | | | Merge pull request #12325 from owncloud/removeunneccessarylang | Lukas Reschke | 2014-11-20 | 74 | -1417/+0 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | cleanup languages. closes #11274 | Volkan Gezer | 2014-11-20 | 74 | -1417/+0 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #12226 from owncloud/remove-phpass | Thomas Müller | 2014-11-20 | 6 | -17/+42 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove phpass and migrate to new Hasher interface | Lukas Reschke | 2014-11-17 | 6 | -17/+42 | |
* | | | | | | | | | Merge pull request #12297 from owncloud/issue/10991-all-testcase | Morris Jobke | 2014-11-20 | 187 | -359/+644 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Make remaining files extend the test base | Joas Schilling | 2014-11-19 | 70 | -117/+191 | |
| * | | | | | | | | Make root tests extend the \Test\TestCase | Joas Schilling | 2014-11-19 | 46 | -83/+160 | |
| * | | | | | | | | Make apps/ extend the \Test\TestCase and fix overwritten methods | Joas Schilling | 2014-11-19 | 40 | -91/+161 | |
| * | | | | | | | | Use base class to reset the file mapper | Joas Schilling | 2014-11-19 | 33 | -68/+132 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #12305 from owncloud/sharelist-nodelete | Morris Jobke | 2014-11-20 | 2 | -12/+30 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | JSHint fixes in sharedfilelistSpec unit test file | Vincent Petry | 2014-11-19 | 1 | -1/+3 | |
| * | | | | | | | | Remove delete button in shared with others list | Vincent Petry | 2014-11-19 | 2 | -11/+27 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #12253 from owncloud/port-12154 | Vincent Petry | 2014-11-20 | 6 | -14/+54 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add repair steps for legacy config files | Lukas Reschke | 2014-11-18 | 2 | -1/+31 | |
| * | | | | | | | | Ignore port for trusted domains | Lukas Reschke | 2014-11-18 | 4 | -13/+23 | |
* | | | | | | | | | Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjs | Vincent Petry | 2014-11-20 | 3 | -2/+106 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix l10n promises | Vincent Petry | 2014-11-19 | 2 | -6/+11 | |
| * | | | | | | | | | Better use of promise in OC.L10N.load() | Vincent Petry | 2014-11-19 | 1 | -13/+8 | |
| * | | | | | | | | | Remove stray generateUrl | Vincent Petry | 2014-11-19 | 1 | -5/+0 | |
| * | | | | | | | | | Added function to load translations from JS | Vincent Petry | 2014-11-18 | 3 | -2/+111 | |
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-20 | 174 | -774/+406 | |
| |_|_|/ / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2 | Lukas Reschke | 2014-11-19 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Show warning when invalid user was passed | Vincent Petry | 2014-11-14 | 1 | -0/+8 | |
* | | | | | | | | | Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword | Lukas Reschke | 2014-11-19 | 15 | -150/+388 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | center spinner | Morris Jobke | 2014-11-18 | 2 | -1/+7 | |
| * | | | | | | | | Show spinner | Lukas Reschke | 2014-11-17 | 2 | -0/+2 | |
| * | | | | | | | | fix unreadable label in warning box | Morris Jobke | 2014-11-17 | 1 | -0/+6 | |
| * | | | | | | | | Hide submit button after password change | Lukas Reschke | 2014-11-17 | 1 | -0/+3 |