summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #18035 from owncloud/ocs-2.0Bernhard Posselt2015-08-055-196/+135
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Return 200 not null - we should return consistent typesThomas Müller2015-08-051-1/+2
| * | | | | | | | | | Fix unit test within OCSControllerThomas Müller2015-08-031-2/+1
| * | | | | | | | | | Remove duplicate and unused codeThomas Müller2015-08-034-172/+40
| * | | | | | | | | | Fix authorsThomas Müller2015-08-031-7/+1
| * | | | | | | | | | Reduce duplicate codeThomas Müller2015-08-032-15/+44
| * | | | | | | | | | Adding ocs/v2.php with status code mapperThomas Müller2015-08-031-8/+56
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #17961 from owncloud/make_knowledgebase_configurableThomas Müller2015-08-052-1/+21
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | make knowledge base url configurableBjoern Schiessle2015-07-292-1/+21
* | | | | | | | | | Remove "use" statementLukas Reschke2015-08-052-4/+6
* | | | | | | | | | Use StringUtils::equals on CSRF token and add unit testsLukas Reschke2015-08-041-5/+4
* | | | | | | | | | Merge pull request #18024 from owncloud/phpseclib-2.0Thomas Müller2015-08-041-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update phpseclib to 2.0Andreas Fischer2015-08-031-5/+5
* | | | | | | | | | | [PHP 7] Change type hint to also accept ErrorsLukas Reschke2015-08-041-2/+2
* | | | | | | | | | | Merge pull request #17820 from owncloud/dav-exception-log-classMorris Jobke2015-08-031-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | also log the class for dav exceptionsRobin Appelman2015-07-241-0/+1
* | | | | | | | | | | always update file cache, the cache can handle partial data correctly if the ...Bjoern Schiessle2015-07-311-5/+4
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-31100-660/+290
* | | | | | | | | | Merge pull request #17981 from owncloud/correct-regexThomas Müller2015-07-301-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correct regular expressionsLukas Reschke2015-07-301-2/+2
* | | | | | | | | | | Merge pull request #17963 from owncloud/remove-derecated-mysql-functionsMorris Jobke2015-07-307-149/+226
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Check for PDO instead of removed function for PHP 7 compatibilityLukas Reschke2015-07-301-8/+22
| * | | | | | | | | | - more injectionThomas Müller2015-07-305-66/+115
| * | | | | | | | | | Moving mysql setup code over to DoctrineThomas Müller2015-07-295-95/+109
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-3096-168/+72
|/ / / / / / / / / /
* | | / / / / / / / Remove remainings of mssqlThomas Müller2015-07-297-258/+2
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #17950 from owncloud/config-dontdetectfschangesinrootbydef...Robin McCorkell2015-07-291-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Disable filesystem_check_changes by defaultVincent Petry2015-07-291-1/+1
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-292-0/+6
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #15543 from rullzer/mimetypedetectorMorris Jobke2015-07-285-90/+238
|\ \ \ \ \ \ \ \
| * | | | | | | | Pass config dir as parameter to detection classRoeland Jago Douma2015-07-272-8/+15
| * | | | | | | | Proper deprecate methodsRoeland Jago Douma2015-07-272-14/+5
| * | | | | | | | Loading of mapping/aliases is done in classRoeland Jago Douma2015-07-272-25/+48
| * | | | | | | | Move mimetypedetection to files/type/detectionRoeland Jago Douma2015-07-273-168/+60
| * | | | | | | | Added mimetype detectorRoeland Jago Douma2015-07-275-1/+236
* | | | | | | | | Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_fileRoeland Douma2015-07-281-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cannot share the same file multiple times with remote userRoeland Jago Douma2015-07-151-0/+13
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-284-0/+18
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #17902 from owncloud/fix_17898Vincent Petry2015-07-271-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | get header size before we open the file to avoid locking exceptionBjoern Schiessle2015-07-271-1/+2
* | | | | | | | | Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryptionThomas Müller2015-07-271-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Only set is encrypted when encryption is enabledJoas Schilling2015-07-231-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #17879 from owncloud/scan-check-pathThomas Müller2015-07-271-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | check if the user is trying to scan a valid pathRobin Appelman2015-07-271-0/+3
| | |_|/ / / / / | |/| | | | | |
* / | | | | | | Add PHPDoc for classes and interfacesMorris Jobke2015-07-275-0/+12
|/ / / / / / /
* | | | | | | Merge pull request #17838 from owncloud/sharing-password-policy-masterThomas Müller2015-07-242-2/+24
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix PHPDoc on setPasswordThomas Müller2015-07-232-2/+2
| * | | | | | Use a hook to integrate sharing password verificationThomas Müller2015-07-231-0/+22
| |/ / / / /
* | | | | | Merge pull request #17755 from owncloud/alias-container-aliveThomas Müller2015-07-243-51/+55
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | add registerAlias method to shorcut interface registrationBernhard Posselt2015-07-183-51/+55