Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Detect old NSS and OpenSSL versions | Lukas Reschke | 2015-07-28 | 4 | -11/+221 |
* | Merge pull request #15543 from rullzer/mimetypedetector | Morris Jobke | 2015-07-28 | 6 | -90/+521 |
|\ | |||||
| * | Pass config dir as parameter to detection class | Roeland Jago Douma | 2015-07-27 | 3 | -12/+214 |
| * | Proper deprecate methods | Roeland Jago Douma | 2015-07-27 | 2 | -14/+5 |
| * | Loading of mapping/aliases is done in class | Roeland Jago Douma | 2015-07-27 | 3 | -34/+48 |
| * | Move mimetypedetection to files/type/detection | Roeland Jago Douma | 2015-07-27 | 4 | -172/+64 |
| * | Added mimetype detector | Roeland Jago Douma | 2015-07-27 | 6 | -1/+333 |
* | | Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_file | Roeland Douma | 2015-07-28 | 2 | -0/+49 |
|\ \ | |||||
| * | | Added test | Roeland Jago Douma | 2015-07-15 | 1 | -0/+36 |
| * | | Cannot share the same file multiple times with remote user | Roeland Jago Douma | 2015-07-15 | 1 | -0/+13 |
* | | | Merge pull request #17910 from owncloud/fix-modified-tooltip | Morris Jobke | 2015-07-28 | 2 | -2/+3 |
|\ \ \ | |||||
| * | | | fixed tooltip for modified date | Hendrik Leppelsack | 2015-07-27 | 2 | -2/+3 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-28 | 28 | -6/+226 |
* | | | | Merge pull request #17902 from owncloud/fix_17898 | Vincent Petry | 2015-07-27 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | get header size before we open the file to avoid locking exception | Bjoern Schiessle | 2015-07-27 | 1 | -1/+2 |
* | | | | | Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryption | Thomas Müller | 2015-07-27 | 5 | -4/+159 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | add condition to update query | Bjoern Schiessle | 2015-07-27 | 1 | -1/+1 |
| * | | | | Add an update script to reset the value | Joas Schilling | 2015-07-24 | 3 | -2/+98 |
| * | | | | Add a unit test for the disabled encryption case | Joas Schilling | 2015-07-23 | 1 | -1/+60 |
| * | | | | Only set is encrypted when encryption is enabled | Joas Schilling | 2015-07-23 | 1 | -1/+1 |
* | | | | | Merge pull request #17879 from owncloud/scan-check-path | Thomas Müller | 2015-07-27 | 2 | -0/+31 |
|\ \ \ \ \ | |||||
| * | | | | | Add unit tests | Lukas Reschke | 2015-07-27 | 1 | -0/+28 |
| * | | | | | check if the user is trying to scan a valid path | Robin Appelman | 2015-07-27 | 1 | -0/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #17894 from owncloud/since-check-for-classes-and-interfaces | Morris Jobke | 2015-07-27 | 6 | -6/+28 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Implement OCP Since Check for classes and interfaces | Morris Jobke | 2015-07-27 | 1 | -6/+16 |
| * | | | | Add PHPDoc for classes and interfaces | Morris Jobke | 2015-07-27 | 5 | -0/+12 |
|/ / / / | |||||
* | | | | Merge pull request #17878 from owncloud/fix-tipsy-fallback-title | Morris Jobke | 2015-07-27 | 1 | -3/+1 |
|\ \ \ \ | |||||
| * | | | | remove title option from tipsy shim | Hendrik Leppelsack | 2015-07-26 | 1 | -3/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #17882 from owncloud/allow-classes-in-titles | Morris Jobke | 2015-07-27 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Allow classes in <h2> tags | Lukas Reschke | 2015-07-26 | 2 | -4/+4 |
| |/ / / | |||||
* | | | | Merge pull request #17804 from owncloud/update-sabredav-2.1.6-master | Morris Jobke | 2015-07-27 | 1 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | Update sabre-dav to 2.1.6 | Joas Schilling | 2015-07-22 | 1 | -0/+0 |
* | | | | | Merge pull request #17526 from owncloud/fix-17516 | Morris Jobke | 2015-07-27 | 4 | -2/+96 |
|\ \ \ \ \ | |||||
| * | | | | | LDAP: when checking group for matching filter, also take base DN into conside... | Arthur Schiwon | 2015-07-09 | 4 | -2/+96 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-27 | 6 | -0/+42 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #17871 from owncloud/add-fallback-to-shim | Hendrik Leppelsack | 2015-07-26 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Add `fallback` to shim | Lukas Reschke | 2015-07-25 | 1 | -0/+2 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-26 | 8 | -4/+16 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-25 | 6 | -14/+28 |
* | | | | | Merge pull request #17838 from owncloud/sharing-password-policy-master | Thomas Müller | 2015-07-24 | 2 | -2/+24 |
|\ \ \ \ \ | |||||
| * | | | | | Fix PHPDoc on setPassword | Thomas Müller | 2015-07-23 | 2 | -2/+2 |
| * | | | | | Use a hook to integrate sharing password verification | Thomas Müller | 2015-07-23 | 1 | -0/+22 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #17755 from owncloud/alias-container-alive | Thomas Müller | 2015-07-24 | 4 | -51/+68 |
|\ \ \ \ \ | |||||
| * | | | | | add registerAlias method to shorcut interface registration | Bernhard Posselt | 2015-07-18 | 4 | -51/+68 |
* | | | | | | Merge pull request #17849 from owncloud/remove-commented-code | Roeland Douma | 2015-07-24 | 1 | -2/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove commented code | Morris Jobke | 2015-07-24 | 1 | -2/+0 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-24 | 10 | -0/+24 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #17075 from owncloud/bootstrap-tooltip | Bernhard Posselt | 2015-07-23 | 10 | -274/+705 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix tipsy dependency | Hendrik Leppelsack | 2015-07-08 | 1 | -2/+2 |
| * | | | | | | fix tipsy not updating on reinitialization | Hendrik Leppelsack | 2015-07-08 | 1 | -2/+5 |