Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard | Thomas Müller | 2014-09-22 | 1 | -2/+10 |
|\ | |||||
| * | Append port to trusted domain in case it's not 80 or 443 | Lukas Reschke | 2014-09-08 | 1 | -2/+10 |
* | | Merge pull request #10499 from owncloud/mkcol-headers-afterbind | Thomas Müller | 2014-09-22 | 1 | -1/+1 |
|\ \ | |||||
| * | | Use afterBind to send fileId header for files and directories | Vincent Petry | 2014-08-18 | 1 | -1/+1 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-22 | 1 | -1/+6 |
* | | | Merge pull request #11199 from owncloud/delete_bogus_previews | Morris Jobke | 2014-09-21 | 2 | -1/+43 |
|\ \ \ | |||||
| * | | | delete old previews | Georg Ehrke | 2014-09-21 | 2 | -1/+43 |
* | | | | make sure preview prop is instanceof OC_Image before using it in showPreview | Georg Ehrke | 2014-09-21 | 1 | -1/+3 |
|/ / / | |||||
* | | | Merge pull request #11196 from owncloud/sqlite-migration-smallint-master | Morris Jobke | 2014-09-21 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | adding 'smallint unsigned' to type mapping for sqlite | Thomas Müller | 2014-09-20 | 1 | -0/+1 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-21 | 2 | -2/+17 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-20 | 1 | -0/+4 |
* | | | Merge pull request #11178 from owncloud/throw-error-on-preview-instead-in-the... | Morris Jobke | 2014-09-19 | 1 | -7/+7 |
|\ \ \ | |||||
| * | | | Throw error in showPreview instead the constructor | Lukas Reschke | 2014-09-19 | 1 | -7/+7 |
* | | | | Merge pull request #11158 from owncloud/fix_basic_auth | Lukas Reschke | 2014-09-19 | 2 | -34/+9 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Move BasicAuth check to "isLoggedIn()" | Lukas Reschke | 2014-09-18 | 2 | -34/+9 |
* | | | | Merge pull request #11119 from owncloud/removeOldUpgradeRoutines | Vincent Petry | 2014-09-19 | 1 | -20/+0 |
|\ \ \ \ | |||||
| * | | | | Remove old upgrade routines | Lukas Reschke | 2014-09-16 | 1 | -20/+0 |
* | | | | | Merge pull request #11163 from owncloud/check-for-updates-between-major-versions | Vincent Petry | 2014-09-19 | 1 | -1/+23 |
|\ \ \ \ \ | |||||
| * | | | | | Prevent updates between multiple major versions | Lukas Reschke | 2014-09-18 | 1 | -1/+23 |
* | | | | | | Merge pull request #10958 from owncloud/db-ilike | Robin Appelman | 2014-09-19 | 7 | -19/+73 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix ILIKE without wildcards for oracle | Robin Appelman | 2014-09-18 | 1 | -1/+1 |
| * | | | | | | Use ILIKE in cache search | Robin Appelman | 2014-09-17 | 1 | -13/+1 |
| * | | | | | | Implement ILIKE for sqlite | Robin Appelman | 2014-09-17 | 1 | -1/+1 |
| * | | | | | | Make sqlite LIKE case sensitive on default | Robin Appelman | 2014-09-17 | 2 | -0/+45 |
| * | | | | | | adding ILIKE to AdapterSQLSrv | Thomas Müller | 2014-09-16 | 1 | -0/+1 |
| * | | | | | | Introduce cross-db ILIKE | Robin Appelman | 2014-09-16 | 4 | -6/+26 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-19 | 2 | -0/+6 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #11151 from owncloud/removeOverflowingFunction | Lukas Reschke | 2014-09-18 | 2 | -24/+0 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Remove unused and overflowing function | Lukas Reschke | 2014-09-18 | 2 | -24/+0 |
* | | | | | | Merge pull request #11130 from owncloud/moveBasicAuthCheck | Lukas Reschke | 2014-09-18 | 1 | -12/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Move basic auth check | Lukas Reschke | 2014-09-17 | 1 | -12/+4 |
* | | | | | | Merge pull request #11143 from owncloud/improve-404 | Morris Jobke | 2014-09-18 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make 404 page easier to understand | Lukas Reschke | 2014-09-17 | 1 | -1/+0 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-18 | 1 | -0/+3 |
* | | | | | | | Error needs to push body-id for new guest layout | Remco Brenninkmeijer | 2014-09-17 | 1 | -0/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #9554 from owncloud/fix_preview_orientation | Lukas Reschke | 2014-09-17 | 2 | -2/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | fix orientation in image-backend, not in preview system itself | Georg Ehrke | 2014-07-09 | 2 | -2/+1 |
* | | | | | | Merge pull request #10622 from owncloud/recursive-delete-forbidden | Lukas Reschke | 2014-09-17 | 4 | -15/+41 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix mapping of relative paths | Lukas Reschke | 2014-09-17 | 2 | -15/+31 |
| * | | | | | | Also check if the file itself is updatable | Robin Appelman | 2014-09-17 | 1 | -2/+2 |
| * | | | | | | Check if a folder is deletable before we try to recursively delete it | Robin Appelman | 2014-09-17 | 2 | -0/+6 |
| * | | | | | | Check if the parent is writable to check if a file is deletable | Robin Appelman | 2014-09-17 | 1 | -1/+5 |
* | | | | | | | Merge pull request #10932 from owncloud/issue/10926 | Morris Jobke | 2014-09-17 | 2 | -1/+22 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add a method to get the absolute url for a route | Joas Schilling | 2014-09-08 | 2 | -1/+22 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #11092 from owncloud/conceal_sabredav_version | Lukas Reschke | 2014-09-17 | 1 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Conceal or display SabreDAV version number in browser and http response headers. | scolebrook | 2014-09-16 | 1 | -0/+8 |
* | | | | | | | Merge pull request #11009 from owncloud/tobiasKaminsky-route | Lukas Reschke | 2014-09-16 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Route for thumbnail generation | tobiasKaminsky | 2014-09-16 | 1 | -0/+6 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #11102 from owncloud/visit1985-issue_108 | Lukas Reschke | 2014-09-16 | 1 | -24/+38 |
|\ \ \ \ \ \ \ |