Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Check new and old ways of required oC version for app compatibility | Joas Schilling | 2015-01-14 | 3 | -4/+59 | |
* | | | | | | | Merge pull request #13345 from owncloud/increase-files-external-versions | Morris Jobke | 2015-01-14 | 2 | -2/+5 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Increase files_externals oC required version and its own version | Joas Schilling | 2015-01-14 | 2 | -2/+5 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #13341 from owncloud/update-readversionfromtemplate | Morris Jobke | 2015-01-14 | 2 | -5/+9 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Read version and product name from update template | Vincent Petry | 2015-01-14 | 2 | -5/+9 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #13332 from oparoz/fix-download-button | Thomas Müller | 2015-01-14 | 1 | -1/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | Download the current public folder only | Olivier Paroz | 2015-01-14 | 1 | -1/+6 | |
* | | | | | | Merge pull request #13286 from owncloud/sharing_upgrade | Björn Schießle | 2015-01-14 | 4 | -1/+131 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | set accept to 1 (=true) for all server-to-server shares on update, at this po... | Bjoern Schiessle | 2015-01-13 | 4 | -1/+131 | |
* | | | | | | | Merge pull request #13288 from owncloud/enc_fix_public_download | Lukas Reschke | 2015-01-14 | 3 | -25/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | if we download a public shared file we need to retrieve the user from the path | Bjoern Schiessle | 2015-01-13 | 3 | -25/+14 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #13335 from owncloud/disable-rememberme-files-external | Thomas Müller | 2015-01-14 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | The files_external app might need the password so autologin must be disabled | Joas Schilling | 2015-01-14 | 1 | -0/+1 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #13311 from owncloud/fix_restore_keys | Björn Schießle | 2015-01-14 | 5 | -42/+145 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | adapt decrypt all and restore/delete key backups to the new folder structure ... | Bjoern Schiessle | 2015-01-13 | 5 | -42/+145 | |
* | | | | | | | Merge pull request #13325 from owncloud/kill-strip-slashes | Morris Jobke | 2015-01-14 | 5 | -9/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Get rid of `stripslashes()` | Lukas Reschke | 2015-01-13 | 5 | -9/+8 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-14 | 176 | -12/+452 | |
| |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #13320 from owncloud/fix-php-doc-for-files-view | Morris Jobke | 2015-01-13 | 1 | -1/+11 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | drop unused parameter | Morris Jobke | 2015-01-13 | 1 | -2/+1 | |
| * | | | | | | Fix annotations in file view | Lukas Reschke | 2015-01-13 | 1 | -0/+11 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #13318 from owncloud/fix-annotation | Morris Jobke | 2015-01-13 | 1 | -3/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix PHP doc and enforce type | Lukas Reschke | 2015-01-13 | 1 | -3/+3 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #13316 from owncloud/drop-dead-code | Morris Jobke | 2015-01-13 | 1 | -4/+0 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | drop dead code - ref #13301 | Morris Jobke | 2015-01-13 | 1 | -4/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #13217 from owncloud/make-basic-auth-work-again | Bernhard Posselt | 2015-01-13 | 1 | -13/+15 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add some more sanity checks for maintenance mode | Lukas Reschke | 2015-01-09 | 1 | -1/+3 | |
| * | | | | | Verify authentication before initializing apps and routing | Lukas Reschke | 2015-01-09 | 1 | -13/+13 | |
* | | | | | | Merge pull request #13291 from owncloud/node-searchcommonbasepathfix | Thomas Müller | 2015-01-13 | 2 | -0/+40 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Fix searchCommon to properly match path name | Vincent Petry | 2015-01-12 | 2 | -0/+40 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #13277 from owncloud/pasteurl | Joas Schilling | 2015-01-13 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | add https:// placeholder for From Link feature. closes #13255 | Volkan Gezer | 2015-01-12 | 1 | -1/+1 | |
* | | | | | | Merge pull request #13301 from owncloud/drop-etag-message | Vincent Petry | 2015-01-13 | 1 | -3/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | drop useless "!!! No reuse of etag" - fixes #13187 | Morris Jobke | 2015-01-13 | 1 | -3/+0 | |
* | | | | | | | Merge pull request #13305 from owncloud/remove-stray-minus-and-use-json-encode | Robin McCorkell | 2015-01-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Use json_encode on string | Lukas Reschke | 2015-01-13 | 1 | -1/+1 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #13271 from owncloud/fix-table-prefix-oracle-master | Morris Jobke | 2015-01-13 | 6 | -9/+32 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Use a special filter expression for Oracle to filter the prefix - fixes #13220 | Thomas Müller | 2015-01-12 | 6 | -9/+32 | |
* | | | | | | Merge pull request #13299 from owncloud/fix-ie8 | Thomas Müller | 2015-01-13 | 1 | -1/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | usage of const in JS is supported in IE11+ | Morris Jobke | 2015-01-13 | 1 | -1/+2 | |
* | | | | | | | Merge pull request #13278 from owncloud/repair-step-missing-etags | Morris Jobke | 2015-01-13 | 2 | -1/+44 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Adding repair step to fix missing etags - fixes #12172 | Thomas Müller | 2015-01-12 | 2 | -1/+44 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #13289 from owncloud/fav-keepfavoncancelrename | Morris Jobke | 2015-01-13 | 2 | -6/+41 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Properly update internal file info with updated tags | Vincent Petry | 2015-01-12 | 2 | -6/+41 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-13 | 214 | -270/+442 | |
* | | | | | | Merge pull request #13293 from owncloud/occ-required-posix | Lukas Reschke | 2015-01-12 | 1 | -0/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Check for the posix extension - refs https://github.com/owncloud/core/pull/13... | Thomas Müller | 2015-01-12 | 1 | -0/+4 | |
* | | | | | | | Merge pull request #13154 from owncloud/fix13141 | Thomas Müller | 2015-01-12 | 2 | -7/+122 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | add js tests for filelist filtering | Jörn Friedrich Dreyer | 2015-01-09 | 2 | -6/+119 | |
| * | | | | | | | don't show no files yet when mask is in place, fixes #13141 | Jörn Friedrich Dreyer | 2015-01-07 | 1 | -1/+3 |