Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12420 from owncloud/sqlite-wal-2 | Morris Jobke | 2014-11-26 | 2 | -2/+12 |
|\ | | | | | adding new config parameter for sqlite to specify the journal mode | ||||
| * | adding new config parameter for sqlite to specify the journal mode | Thomas Müller | 2014-11-25 | 2 | -2/+12 |
| | | |||||
* | | Merge pull request #12416 from owncloud/app-info-xml-parser-2 | Thomas Müller | 2014-11-25 | 5 | -61/+107 |
|\ \ | | | | | | | App info xml parser 2 | ||||
| * | | handle invalid xml file | Thomas Müller | 2014-11-25 | 1 | -7/+18 |
| | | | |||||
| * | | simplify xml parser code | Thomas Müller | 2014-11-25 | 1 | -47/+28 |
| | | | |||||
| * | | Introduce app info xml parser including basic unit test - necessary for #10777 | Thomas Müller | 2014-11-25 | 5 | -61/+115 |
| |/ | |||||
* / | The class name is Movie NOT Movies | Olivier Paroz | 2014-11-25 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #12402 from owncloud/fix-phpdoc | Morris Jobke | 2014-11-25 | 1 | -25/+17 |
|\ | | | | | Fix PHPDoc and deprecated code | ||||
| * | Fix PHPDoc and deprecated code | Lukas Reschke | 2014-11-24 | 1 | -25/+17 |
| | | | | | | | | Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions. | ||||
* | | Merge pull request #12380 from owncloud/remove-oc-migrate | Lukas Reschke | 2014-11-25 | 3 | -924/+0 |
|\ \ | |/ |/| | Remove OC_Migrate | ||||
| * | Remove OC_Migrate | Lukas Reschke | 2014-11-24 | 3 | -924/+0 |
| | | | | | | | | | | | | This is unused legacy code. Let it die with ~~~honor~~ fire. Fixes https://github.com/owncloud/core/issues/12346 | ||||
* | | Merge pull request #12294 from owncloud/route-postfix | Thomas Müller | 2014-11-24 | 1 | -1/+7 |
|\ \ | | | | | | | Add route postfix to allow url versioning when only the http method changed | ||||
| * | | add postfix | Bernhard Posselt | 2014-11-19 | 1 | -1/+7 |
| | | | | | | | | | | | | add postfix | ||||
* | | | Merge pull request #12303 from owncloud/windows-unknown-command-command | Morris Jobke | 2014-11-24 | 2 | -19/+20 |
|\ \ \ | | | | | | | | | Deduplicate findBinaryPath() and do not try "command -v" on windows | ||||
| * | | | Simplify the binary finding code in the movie preview class | Joas Schilling | 2014-11-20 | 1 | -11/+3 |
| | | | | |||||
| * | | | Deduplicate function by moving it to the OC_Helper | Joas Schilling | 2014-11-20 | 2 | -10/+19 |
| | | | | |||||
* | | | | Merge pull request #12142 from owncloud/DeprecateOldIAPICalls | Morris Jobke | 2014-11-24 | 3 | -0/+7 |
|\ \ \ \ | | | | | | | | | | | Deprecate older API wrappers and calls | ||||
| * | | | | Deprecate older API wrappers and calls | Lukas Reschke | 2014-11-12 | 3 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | Those old classes have now non-static pendants and can be deprecated IMHO. | ||||
* | | | | | Merge pull request #12084 from owncloud/sharing_fix_shared_with_info | Morris Jobke | 2014-11-24 | 2 | -8/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | sharing: make sure that we only find the shares from a given owner | ||||
| * | | | | | also check for the correct owner if it was submitted | Bjoern Schiessle | 2014-11-21 | 2 | -8/+14 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-24 | 4 | -2/+6 |
| | | | | | | |||||
* | | | | | | remove ugly hack and don't use OC\Preview\Image for tiffs and svgs | Georg Ehrke | 2014-11-23 | 2 | -11/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-22 | 4 | -0/+6 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-21 | 8 | -0/+138 |
| | | | | |||||
* | | | | Revert "drop OC_Preferences::getUsers and getApps" | Morris Jobke | 2014-11-20 | 2 | -0/+54 |
| | | | | | | | | | | | | | | | | This reverts commit 09fd34eed908203674721af86ce889bfd0a0ef8d. | ||||
* | | | | drop OC_Preferences::getUsers and getApps | Morris Jobke | 2014-11-20 | 2 | -54/+0 |
| | | | | |||||
* | | | | Merge pull request #12330 from owncloud/jenkins-eat-that | Morris Jobke | 2014-11-20 | 3 | -15/+10 |
|\ \ \ \ | | | | | | | | | | | drop dependency of some commands on old config object | ||||
| * | | | | drop dependency of some commands on old config object | Morris Jobke | 2014-11-20 | 3 | -15/+10 |
| | | | | | |||||
* | | | | | Merge pull request #12321 from owncloud/checkForXMLWriter | Thomas Müller | 2014-11-20 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Check for XMLWriter class | ||||
| * | | | | | Check for XMLWriter class | Lukas Reschke | 2014-11-20 | 1 | -0/+1 |
| | |_|/ / | |/| | | | | | | | | | | | | | This is not installed by default in all cases and will break the DAV features of ownCloud. Lot's of reports such as https://github.com/owncloud/ios-issues/issues/167#issuecomment-63798507 | ||||
* | | | | | Merge pull request #12299 from owncloud/clean-lib-base-config | Morris Jobke | 2014-11-20 | 1 | -23/+29 |
|\ \ \ \ \ | | | | | | | | | | | | | replace all static calls to OC_Config and OC_Preferences to calls to OCP... | ||||
| * | | | | | 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 | 11 | -164/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | cleanup languages. closes #11274 | ||||
| * | | | | cleanup languages. closes #11274 | Volkan Gezer | 2014-11-20 | 11 | -164/+0 |
| | | | | | |||||
* | | | | | Merge pull request #12226 from owncloud/remove-phpass | Thomas Müller | 2014-11-20 | 2 | -5/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove phpass and migrate to new Hasher interface | ||||
| * | | | | | Remove phpass and migrate to new Hasher interface | Lukas Reschke | 2014-11-17 | 2 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR removes phpass and migrates to the new Hasher interface. Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt. Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block. | ||||
* | | | | | | Merge pull request #12297 from owncloud/issue/10991-all-testcase | Morris Jobke | 2014-11-20 | 1 | -3/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Issue/10991 all testcase | ||||
| * | | | | | Use base class to reset the file mapper | Joas Schilling | 2014-11-19 | 1 | -3/+0 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #12253 from owncloud/port-12154 | Vincent Petry | 2014-11-20 | 4 | -11/+47 |
|\ \ \ \ \ | | | | | | | | | | | | | Port 12154 | ||||
| * | | | | | Add repair steps for legacy config files | Lukas Reschke | 2014-11-18 | 2 | -1/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all ports from the trusted domains Conflicts: lib/private/repair.php lib/repair/repairconfig.php | ||||
| * | | | | | Ignore port for trusted domains | Lukas Reschke | 2014-11-18 | 2 | -10/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain) Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975. Conflicts: lib/private/request.php | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-20 | 4 | -2/+6 |
| |/ / / / |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-19 | 4 | -2/+6 |
| | | | | | |||||
* | | | | | drop unneeded var_dump - fixes #9997 | Morris Jobke | 2014-11-18 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge pull request #12261 from oparoz/patch-1 | Morris Jobke | 2014-11-18 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Replace deprecated switches | ||||
| * | | | | | Replace deprecated switches | Olivier Paroz | 2014-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Warning: -convert-to is deprecated. Use --convert-to instead. Warning: -outdir is deprecated. Use --outdir instead. | ||||
* | | | | | | Merge pull request #12224 from owncloud/fix_12211 | Björn Schießle | 2014-11-18 | 1 | -9/+22 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | make sure that we don't find the wrong shares if a user and a group have the same ID | ||||
| * | | | | | only users can have a display name different from the id | Bjoern Schiessle | 2014-11-18 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | make sure that we only find the shares from the correct share type if users ↵ | Bjoern Schiessle | 2014-11-18 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | and groups with the same ID exists |