summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Deduplicate function by moving it to the OC_HelperJoas Schilling2014-11-203-27/+20
| * | | | | Remove exec() call with invalid name on windowsJoas Schilling2014-11-191-1/+1
* | | | | | Merge pull request #12142 from owncloud/DeprecateOldIAPICallsMorris Jobke2014-11-243-0/+7
|\ \ \ \ \ \
| * | | | | | Deprecate older API wrappers and callsLukas Reschke2014-11-123-0/+7
* | | | | | | Merge pull request #12084 from owncloud/sharing_fix_shared_with_infoMorris Jobke2014-11-244-10/+61
|\ \ \ \ \ \ \
| * | | | | | | also check for the correct owner if it was submittedBjoern Schiessle2014-11-214-10/+61
* | | | | | | | Merge pull request #12359 from owncloud/fix-redirect-url-for-password-changeThomas Müller2014-11-241-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Use `/` as redirect location if webroot is set to an empty valueLukas Reschke2014-11-211-1/+5
| |/ / / / / / /
* | | | | | | | Merge pull request #12362 from owncloud/add-ocs-header-per-defaultVincent Petry2014-11-241-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add OCS API header per defaultLukas Reschke2014-11-211-1/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #12374 from owncloud/vagrant_puphpet_gitignoreLukas Reschke2014-11-241-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | add puphpet and vagrant to gitignoreGeorg Ehrke2014-11-231-0/+6
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-2410-4/+18
* | | | | | | | Merge pull request #12372 from owncloud/preview_tiff_fixLukas Reschke2014-11-242-11/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | remove ugly hack and don't use OC\Preview\Image for tiffs and svgsGeorg Ehrke2014-11-232-11/+1
|/ / / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-232-0/+2
* | | | | | | Merge pull request #12348 from owncloud/rename-to-avoid-complaining-ciMorris Jobke2014-11-222-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Rename providers to not begin with testLukas Reschke2014-11-212-4/+4
* | | | | | | | Merge pull request #12328 from owncloud/remove-testcleanuplistenerMorris Jobke2014-11-223-186/+111
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove testcleanuplistener.phpJoas Schilling2014-11-202-181/+0
| * | | | | | | | Clean up the test data in tearDownAfterClass()Joas Schilling2014-11-201-5/+111
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-2242-12/+298
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #12342 from owncloud/fix-master-unit-testsThomas Müller2014-11-211-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | fix unit tests of mdb2scheamreaderMorris Jobke2014-11-201-2/+2
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-21136-78/+1306
* | | | | | | | Merge pull request #12344 from owncloud/fixstypoThomas Müller2014-11-211-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | update grammarVolkan Gezer2014-11-211-1/+1
|/ / / / / / /
* | | | | | | Revert "drop OC_Preferences::getUsers and getApps"Morris Jobke2014-11-203-0/+82
* | | | | | | Merge pull request #12336 from owncloud/drop-getApps-getUsersMorris Jobke2014-11-203-82/+0
|\ \ \ \ \ \ \
| * | | | | | | drop OC_Preferences::getUsers and getAppsMorris Jobke2014-11-203-82/+0
|/ / / / / / /
* | | | | | | Merge pull request #12330 from owncloud/jenkins-eat-thatMorris Jobke2014-11-207-42/+40
|\ \ \ \ \ \ \
| * | | | | | | drop dependency of some commands on old config objectMorris Jobke2014-11-207-42/+40
| |/ / / / / /
* | | | | | | Merge pull request #12321 from owncloud/checkForXMLWriterThomas Müller2014-11-201-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Check for XMLWriter classLukas Reschke2014-11-201-0/+1
* | | | | | | | Fix file upload to ext storage when recovery key is enabledVincent Petry2014-11-202-9/+58
* | | | | | | | Merge pull request #12299 from owncloud/clean-lib-base-configMorris Jobke2014-11-201-23/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | replace double quotes with single quotesMorris Jobke2014-11-191-1/+1
| * | | | | | | | replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfigMorris Jobke2014-11-191-23/+29
* | | | | | | | | Merge pull request #12325 from owncloud/removeunneccessarylangLukas Reschke2014-11-2074-1417/+0
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | cleanup languages. closes #11274Volkan Gezer2014-11-2074-1417/+0
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #12226 from owncloud/remove-phpassThomas Müller2014-11-206-17/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove phpass and migrate to new Hasher interfaceLukas Reschke2014-11-176-17/+42
* | | | | | | | | Merge pull request #12297 from owncloud/issue/10991-all-testcaseMorris Jobke2014-11-20187-359/+644
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Make remaining files extend the test baseJoas Schilling2014-11-1970-117/+191
| * | | | | | | | Make root tests extend the \Test\TestCaseJoas Schilling2014-11-1946-83/+160
| * | | | | | | | Make apps/ extend the \Test\TestCase and fix overwritten methodsJoas Schilling2014-11-1940-91/+161
| * | | | | | | | Use base class to reset the file mapperJoas Schilling2014-11-1933-68/+132
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #12305 from owncloud/sharelist-nodeleteMorris Jobke2014-11-202-12/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | JSHint fixes in sharedfilelistSpec unit test fileVincent Petry2014-11-191-1/+3
| * | | | | | | | Remove delete button in shared with others listVincent Petry2014-11-192-11/+27
| | |_|/ / / / / | |/| | | | | |