Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | | Merge pull request #13272 from owncloud/fav-renamekeepfav | Joas Schilling | 2015-01-12 | 2 | -2/+75 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Return path attribute for ajax rename operations | Vincent Petry | 2015-01-12 | 2 | -0/+3 |
| * | | | | | | | | Return tags after rename | Vincent Petry | 2015-01-12 | 2 | -2/+72 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #13285 from owncloud/fix-encryption-check-number-of-parts | Morris Jobke | 2015-01-12 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Check array size, before using the 3rd element from it | Joas Schilling | 2015-01-12 | 1 | -0/+9 |
* | | | | | | | | | Merge pull request #13282 from owncloud/occ-user-warning | Morris Jobke | 2015-01-12 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Check for current user to have the same id then the owner of the config file ... | Thomas Müller | 2015-01-12 | 1 | -0/+11 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #13279 from owncloud/upload-original-name | Morris Jobke | 2015-01-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Send the proper original name for uploaded files | Robin Appelman | 2015-01-12 | 1 | -2/+2 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #13280 from owncloud/fix-12306 | Morris Jobke | 2015-01-12 | 2 | -2/+8 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | fix retrieval of user groups | Arthur Schiwon | 2015-01-12 | 2 | -2/+8 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #13210 from owncloud/use-isset | Morris Jobke | 2015-01-12 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Check for existence of $_GET keys | Lukas Reschke | 2015-01-09 | 1 | -5/+5 |
* | | | | | | | Merge pull request #13268 from owncloud/dnd-files-container | Lukas Reschke | 2015-01-12 | 1 | -1/+10 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Allow dropping files on the table container | Vincent Petry | 2015-01-12 | 1 | -1/+10 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #13182 from owncloud/download_versions | Björn Schießle | 2015-01-12 | 10 | -146/+396 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | make versions of shared files downloadable | Bjoern Schiessle | 2015-01-09 | 10 | -146/+396 |
* | | | | | | Merge pull request #13254 from owncloud/fixsharel10n | Thomas Müller | 2015-01-12 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | make Share button localized again | Volkan Gezer | 2015-01-11 | 2 | -2/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-12 | 326 | -398/+290 |
* | | | | | | Merge pull request #13257 from owncloud/fixrmperm | Thomas Müller | 2015-01-11 | 1 | -2/+2 |
|\ \ \ \ \ \ |