Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-09 | 2 | -0/+2 |
| | |||||
* | Merge pull request #25027 from owncloud/fix-22746-narrowtooltip | Vincent Petry | 2016-06-08 | 1 | -1/+1 |
|\ | | | | | Added width of the tooltip | ||||
| * | Added width of the tooltip | Sergio Bertolín | 2016-06-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2fa | Vincent Petry | 2016-06-08 | 5 | -1/+21 |
|\ \ | | | | | | | Allow to cancel 2FA after login | ||||
| * | | Allow to cancel 2FA after login | Joas Schilling | 2016-06-07 | 5 | -1/+21 |
| |/ | |||||
* | | Merge pull request #24991 from owncloud/2fa-do-not-generate-token | Vincent Petry | 2016-06-08 | 2 | -12/+27 |
|\ \ | | | | | | | do not generate device token if 2FA is enable for user | ||||
| * | | do not generate device token if 2FA is enable for user | Christoph Wurst | 2016-06-07 | 2 | -12/+27 |
| |/ | |||||
* | | Merge pull request #24992 from owncloud/fix_decrypt_message | Vincent Petry | 2016-06-08 | 1 | -1/+10 |
|\ \ | | | | | | | Fix Decrypt message via occ | ||||
| * | | Fixed reviews | Sergio Bertolín | 2016-06-07 | 1 | -2/+2 |
| | | | |||||
| * | | Comments fixed | davitol | 2016-06-06 | 1 | -3/+2 |
| | | | |||||
| * | | Fix Decrypt message via occ | davitol | 2016-06-06 | 1 | -1/+11 |
| | | | |||||
* | | | Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only | Vincent Petry | 2016-06-08 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Allow to decrypt user '0' files only | ||||
| * | | | Allow to decrypt user '0' files only | Joas Schilling | 2016-06-07 | 1 | -1/+2 |
| | |/ | |/| | |||||
* / | | darker background image for better font contrast | Christoph Wurst | 2016-06-08 | 1 | -0/+0 |
|/ / | |||||
* / | Remove background from curved logo (#24980) | William Bargent | 2016-06-06 | 1 | -0/+0 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-04 | 2 | -0/+4 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-03 | 2 | -150/+150 |
| | |||||
* | Merge pull request #24947 from owncloud/2fa-remember-redirect-url | Vincent Petry | 2016-06-02 | 4 | -8/+38 |
|\ | | | | | remember redirect_url when solving the 2FA challenge | ||||
| * | remember redirect_url when solving the 2FA challenge | Christoph Wurst | 2016-06-01 | 4 | -8/+38 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-02 | 2 | -14/+40 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-01 | 2 | -0/+44 |
| | |||||
* | Merge pull request #24795 from ↵ | Vincent Petry | 2016-05-31 | 2 | -2/+3 |
|\ | | | | | | | | | owncloud/issue-24789-reset-password-link-new-window Allow opening the password reset link in a new window when its a URL | ||||
| * | Allow opening the password reset link in a new window when its a URL | Joas Schilling | 2016-05-24 | 2 | -2/+3 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-31 | 2 | -0/+8 |
| | | |||||
* | | Merge pull request #20150 from pellaeon/pr-droppable-hover-visual-cue | Vincent Petry | 2016-05-30 | 1 | -1/+3 |
|\ \ | | | | | | | Add visual cue when moving draggable item over droppable item, | ||||
| * | | Fix breadcrumb background right arrow due to incorrect background-image syntax | Pellaeon Lin | 2016-05-21 | 1 | -1/+3 |
| | | | |||||
| * | | Add visual cue when moving draggable item over droppable item, | Pellaeon Lin | 2016-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | ie. breadcrumb and filenameTd | ||||
* | | | Allow setting debug as loglevel via occ log_manage (#24834) | Joas Schilling | 2016-05-30 | 1 | -1/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-29 | 2 | -0/+6 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-28 | 2 | -0/+10 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-27 | 8 | -0/+36 |
| | | | |||||
* | | | Update license headers | Lukas Reschke | 2016-05-26 | 36 | -38/+43 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-26 | 8 | -2/+36 |
| | | | |||||
* | | | Merge pull request #24735 from juliushaertl/passwordreset-invalid | Vincent Petry | 2016-05-25 | 1 | -15/+35 |
|\ \ \ | | | | | | | | | Show error messages if a password reset link is invalid or expired | ||||
| * | | | Show error messages if a password reset link is invalid or expired | Julius Haertl | 2016-05-23 | 1 | -15/+35 |
| | | | | | | | | | | | | | | | | | | | | - Moved token validation to method checkPasswordResetToken - Render error with message from exceptions | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-25 | 6 | -0/+18 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-24 | 8 | -0/+84 |
| | | | | |||||
* | | | | when generating browser/device token, save the login name for later password ↵ | Christoph Wurst | 2016-05-24 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | | checks | ||||
* | | | | generate device token for UID, not login name | Christoph Wurst | 2016-05-24 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | fixes #24785 | ||||
* | | | | login explicitly | Christoph Wurst | 2016-05-24 | 1 | -0/+3 |
| |_|/ |/| | | |||||
* | | | Merge pull request #24559 from owncloud/2fa | Vincent Petry | 2016-05-23 | 11 | -3/+465 |
|\ \ \ | |/ / |/| | | two factor auth | ||||
| * | | add OCC command to enable/disable 2FA for a user | Christoph Wurst | 2016-05-23 | 4 | -0/+141 |
| | | | |||||
| * | | Add two factor auth to core | Christoph Wurst | 2016-05-23 | 8 | -3/+324 |
| | | | |||||
* | | | Merge pull request #24613 from owncloud/chunked-convert-database-queries | Vincent Petry | 2016-05-23 | 1 | -14/+56 |
|\ \ \ | |/ / |/| | | Chunk the "db:convert-type" select queries, to not run out of memory … | ||||
| * | | Chunk the "db:convert-type" select queries, to not run out of memory so fast | Joas Schilling | 2016-05-13 | 1 | -14/+56 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-23 | 10 | -0/+10 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-22 | 58 | -64/+6 |
| | | | |||||
* | | | Merge pull request #24307 from owncloud/systemtags-perminterface | Vincent Petry | 2016-05-21 | 6 | -27/+67 |
|\ \ \ | | | | | | | | | Add interface methods for permission check for system tags | ||||
| * | | | Rename "not-assignble" to "restricted" | Vincent Petry | 2016-05-20 | 3 | -3/+3 |
| | | | | |||||
| * | | | Add app to shipped.json | Vincent Petry | 2016-05-20 | 1 | -0/+1 |
| | | | |