summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* remove deprecated \OC:$sessionThomas Müller2014-11-262-27/+2
* Merge pull request #12411 from owncloud/unknown-command-windowsLukas Reschke2014-11-261-2/+2
|\
| * Replace some more "command -v" calls with the Helper methodJoas Schilling2014-11-251-2/+2
* | Merge pull request #12438 from owncloud/jenkins-no-new-session-ocs-apiMorris Jobke2014-11-261-16/+22
|\ \
| * | because OC_User::login will create a new session we shall only try to login i...Thomas Müller2014-11-261-16/+22
* | | Merge pull request #12350 from mprokop/link_expirationMorris Jobke2014-11-261-3/+6
|\ \ \ | |/ / |/| |
| * | Consolidate if statement, and update unit testMiguel Prokop2014-11-211-4/+2
| * | fix calculation of expiration date if there is a default expiration date set ...Miguel Prokop2014-11-211-3/+8
* | | Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permissio...Morris Jobke2014-11-2619-75/+97
|\ \ \
| * | | Replace deprecated constant with new class constantJoas Schilling2014-11-2518-72/+72
| * | | Move namespaced constants to namespaced classJoas Schilling2014-11-251-3/+25
* | | | Merge pull request #12420 from owncloud/sqlite-wal-2Morris Jobke2014-11-262-2/+12
|\ \ \ \
| * | | | adding new config parameter for sqlite to specify the journal modeThomas Müller2014-11-252-2/+12
| | |_|/ | |/| |
* | | | Merge pull request #12416 from owncloud/app-info-xml-parser-2Thomas Müller2014-11-255-61/+107
|\ \ \ \ | |_|/ / |/| | |
| * | | handle invalid xml fileThomas Müller2014-11-251-7/+18
| * | | simplify xml parser codeThomas Müller2014-11-251-47/+28
| * | | Introduce app info xml parser including basic unit test - necessary for #10777Thomas Müller2014-11-255-61/+115
| |/ /
* / / The class name is Movie NOT MoviesOlivier Paroz2014-11-252-2/+2
|/ /
* | Merge pull request #12402 from owncloud/fix-phpdocMorris Jobke2014-11-251-25/+17
|\ \
| * | Fix PHPDoc and deprecated codeLukas Reschke2014-11-241-25/+17
* | | Merge pull request #12380 from owncloud/remove-oc-migrateLukas Reschke2014-11-253-924/+0
|\ \ \ | |/ / |/| |
| * | Remove OC_MigrateLukas Reschke2014-11-243-924/+0
* | | Merge pull request #12294 from owncloud/route-postfixThomas Müller2014-11-241-1/+7
|\ \ \
| * | | add postfixBernhard Posselt2014-11-191-1/+7
* | | | Merge pull request #12303 from owncloud/windows-unknown-command-commandMorris Jobke2014-11-242-19/+20
|\ \ \ \
| * | | | Simplify the binary finding code in the movie preview classJoas Schilling2014-11-201-11/+3
| * | | | Deduplicate function by moving it to the OC_HelperJoas Schilling2014-11-202-10/+19
* | | | | 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-242-8/+14
|\ \ \ \ \ \
| * | | | | | also check for the correct owner if it was submittedBjoern Schiessle2014-11-212-8/+14
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-244-2/+6
* | | | | | 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-224-0/+6
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-218-0/+138
* | | | Revert "drop OC_Preferences::getUsers and getApps"Morris Jobke2014-11-202-0/+54
* | | | drop OC_Preferences::getUsers and getAppsMorris Jobke2014-11-202-54/+0
* | | | Merge pull request #12330 from owncloud/jenkins-eat-thatMorris Jobke2014-11-203-15/+10
|\ \ \ \
| * | | | drop dependency of some commands on old config objectMorris Jobke2014-11-203-15/+10
* | | | | Merge pull request #12321 from owncloud/checkForXMLWriterThomas Müller2014-11-201-0/+1
|\ \ \ \ \
| * | | | | Check for XMLWriter classLukas Reschke2014-11-201-0/+1
| | |_|/ / | |/| | |
* | | | | 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-2011-164/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | cleanup languages. closes #11274Volkan Gezer2014-11-2011-164/+0
* | | | | Merge pull request #12226 from owncloud/remove-phpassThomas Müller2014-11-202-5/+2
|\ \ \ \ \
| * | | | | Remove phpass and migrate to new Hasher interfaceLukas Reschke2014-11-172-5/+2
* | | | | | Merge pull request #12297 from owncloud/issue/10991-all-testcaseMorris Jobke2014-11-201-3/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use base class to reset the file mapperJoas Schilling2014-11-191-3/+0
| | |/ / / | |/| | |