Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-04 | 6 | -0/+8 |
| | |||||
* | Merge pull request #16703 from owncloud/fix-ie8-ie9 | Morris Jobke | 2015-06-03 | 1 | -0/+6 |
|\ | | | | | Fix IE8 & IE9 - setup page | ||||
| * | Add min-height to login page for IE8 and IE9 | Morris Jobke | 2015-06-03 | 1 | -0/+1 |
| | | |||||
| * | Revert "fix theme in IE8 and IE9" | Morris Jobke | 2015-06-03 | 1 | -0/+5 |
| | | | | | | | | This reverts commit a4c9688711977376f9d8ad7bf94a1e92d964cd7b. | ||||
* | | Merge pull request #16434 from owncloud/persist-maintenance-state | Thomas Müller | 2015-06-03 | 2 | -5/+13 |
|\ \ | |/ |/| | Persist the state of the maintenance after an upgrade | ||||
| * | Persist the state of the maintenance after an upgrade | Morris Jobke | 2015-05-19 | 2 | -5/+13 |
| | | | | | | | | | | | | * if maintenance mode was enabled before an upgrade it will be enabled afterwards too * fixes #16429 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-03 | 14 | -2/+20 |
| | | |||||
* | | Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-preview | Morris Jobke | 2015-06-02 | 1 | -3/+11 |
|\ \ | | | | | | | Get a 96x96 preview for file conflict resolution | ||||
| * | | Escape single quotes | Olivier Paroz | 2015-05-29 | 1 | -0/+2 |
| | | | |||||
| * | | Fix for parenthesis | Olivier Paroz | 2015-05-29 | 1 | -1/+1 |
| | | | |||||
| * | | Get a 96x96 preview for file conflict resolution | Olivier Paroz | 2015-05-29 | 1 | -3/+9 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-02 | 64 | -64/+2 |
| | | | |||||
* | | | Fix grammar of search results phrase | Tom Needham | 2015-06-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #16650 from owncloud/fix-sqlite-only-setup | Thomas Müller | 2015-06-01 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | [setup] Disable buttons only in the case they are present | ||||
| * | | | [setup] Disable buttons only in the case they are present | Morris Jobke | 2015-06-01 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | * fixes #16648 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-31 | 2 | -2/+2 |
| |/ / |/| | | |||||
* | | | Merge pull request #16517 from owncloud/remove-logo-wide | Thomas Müller | 2015-05-29 | 6 | -20/+8 |
|\ \ \ | | | | | | | | | replace logo-wide on share page as well with better icon + text | ||||
| * | | | also replace logo-mail with new look | Jan-Christoph Borchardt | 2015-05-22 | 1 | -0/+0 |
| | | | | |||||
| * | | | replace logo-wide on share page as well with better icon + text | Jan-Christoph Borchardt | 2015-05-22 | 5 | -20/+8 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-29 | 4 | -4/+8 |
| | | | | |||||
* | | | | Merge pull request #16380 from rullzer/fix_16281 | Morris Jobke | 2015-05-28 | 2 | -15/+117 |
|\ \ \ \ | | | | | | | | | | | Properly format recipients | ||||
| * | | | | Properly format remote recipients | Roeland Jago Douma | 2015-05-27 | 2 | -15/+117 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * A list of recipients can now be properly formatted with remote shares. Before the shares where simply shown in full in the "Shared with others" section. * Unit tests updated and added | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-28 | 28 | -74/+144 |
| | | | | | |||||
* | | | | | Merge pull request #16417 from owncloud/master-16415 | Morris Jobke | 2015-05-27 | 1 | -5/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | fix theme in IE8 and IE9 | ||||
| * | | | | fix theme in IE8 and IE9 | Morris Jobke | 2015-05-18 | 1 | -5/+0 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-27 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #15985 from owncloud/hotfix/fix-encryption-references | Björn Schießle | 2015-05-26 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | [enc2] fix references to legacy encryption app name | ||||
| * | | | | | fix references to legacy encryption app name | Clark Tomlinson | 2015-05-18 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #16565 from owncloud/add-urandom-check | Thomas Müller | 2015-05-26 | 2 | -3/+24 |
|\ \ \ \ \ | | | | | | | | | | | | | Add check for availability of /dev/urandom | ||||
| * | | | | | Add check for availability of /dev/urandom | Lukas Reschke | 2015-05-26 | 2 | -3/+24 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without /dev/urandom being available to read the medium RNG will rely only on the following components on a Linux system: 1. MicroTime: microtime() . memory_get_usage() as seed and then a garbage collected microtime for loop 2. MTRand: chr((mt_rand() ^ mt_rand()) % 256) 3. Rand: chr((rand() ^ rand()) % 256) 4. UniqId: Plain uniqid() An adversary with the possibility to predict the seed used by the PHP process may thus be able to predict future tokens which is an unwanted behaviour. One should note that this behaviour is documented in our documentation to ensure that users get aware of this even without reading our documentation this will add a post setup check to the administrative interface. Thanks to David Black from d1b.org for bringing this again to our attention. | ||||
* | | | | | Merge pull request #16521 from owncloud/unbold-placeholder-image | Vincent Petry | 2015-05-26 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | use normal font weight instead of bold for image placeholders | ||||
| * | | | | | use normal font weight instead of bold for image placeholders | Jan-Christoph Borchardt | 2015-05-22 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #16520 from owncloud/fix-float-spinner-position | Vincent Petry | 2015-05-26 | 1 | -1/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | fix float spinner position | ||||
| * | | | | | fix float spinner position | Jan-Christoph Borchardt | 2015-05-22 | 1 | -1/+4 |
| | |_|/ / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-26 | 2 | -0/+4 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-25 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-24 | 4 | -0/+30 |
| | | | | | |||||
* | | | | | Unit tests for #16511 | Roeland Jago Douma | 2015-05-22 | 1 | -0/+80 |
| |/ / / |/| | | | | | | | | | | | | | | | Make sure that password is updated on focusout of the password field or on pressing enter in the password field. | ||||
* | | | | Merge pull request #16473 from owncloud/occ_16221 | Joas Schilling | 2015-05-21 | 1 | -2/+12 |
|\ \ \ \ | | | | | | | | | | | occ option to update all third party apps without disable | ||||
| * | | | | Skip disable3rdParty Apps | Steffen Lindner | 2015-05-20 | 1 | -2/+12 |
| |/ / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-21 | 22 | -0/+46 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-20 | 2 | -2/+2 |
| | | | |||||
* | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-05-19 | 1 | -1/+0 |
| | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | | Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewith | Thomas Müller | 2015-05-19 | 2 | -4/+6 |
|\ \ \ | |_|/ |/| | | Remove hard coded limit of 15 from getShareWith | ||||
| * | | add support for limit request parameter to getShareWith | Craig Morrissey | 2015-05-15 | 2 | -4/+6 |
| | | | |||||
* | | | Add hint about additional PHP database modules | Morris Jobke | 2015-05-18 | 3 | -1/+11 |
| |/ |/| | | | | | * fixes #16391 | ||||
* | | Merge pull request #15738 from rullzer/fix_15611 | Vincent Petry | 2015-05-18 | 2 | -10/+53 |
|\ \ | | | | | | | Fix to make sure expiration date is properly set | ||||
| * | | Fix to make sure expiration date is properly set | Roeland Jago Douma | 2015-05-18 | 2 | -10/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | This did not happen correctly when the password was enforced since a different code path was taken. * moved generation of the default date string to separate function * added unit test | ||||
* | | | Reset share dialog values so we start out clean | Roeland Jago Douma | 2015-05-18 | 2 | -0/+111 |
|/ / | | | | | | | * Unit test | ||||
* | | Merge pull request #16242 from owncloud/use-oc-webroot | Thomas Müller | 2015-05-15 | 1 | -4/+1 |
|\ \ | |/ |/| | Use OC.webroot instead of calculating the URL |