Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-27 | 3 | -18/+117 | |
| |\ \ \ | ||||||
| * | | | | verify user password on change | Bjoern Schiessle | 2016-06-27 | 1 | -1/+46 | |
| * | | | | remove old hook, no longer needed | Bjoern Schiessle | 2016-06-27 | 1 | -19/+16 | |
| * | | | | check password for link shares | Bjoern Schiessle | 2016-06-27 | 1 | -6/+14 | |
| * | | | | Merge remote-tracking branch 'upstream/master' into master-upstream-sync | Lukas Reschke | 2016-06-26 | 4 | -107/+338 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-21 | 6 | -7/+313 | |
| |\ \ \ \ | ||||||
| * | | | | | fix unit tests | Morris Jobke | 2016-06-20 | 1 | -3/+3 | |
| * | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 | Arthur Schiwon | 2016-06-14 | 1 | -3/+24 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 | Arthur Schiwon | 2016-06-11 | 4 | -8/+514 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge pull request #19 from nextcloud/files-drop | Lukas Reschke | 2016-06-10 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | add hide file list option | Bjoern Schiessle | 2016-06-09 | 1 | -1/+0 | |
| * | | | | | | | | Downstream 2016-06-09 | Arthur Schiwon | 2016-06-09 | 9 | -56/+317 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Revert "Downstream 2016-06-08" | blizzz | 2016-06-09 | 6 | -173/+24 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Allow to cancel 2FA after login | Joas Schilling | 2016-06-09 | 1 | -4/+17 | |
| * | | | | | | | | dissalow symlinks in local storages that point outside the datadir | Robin Appelman | 2016-06-09 | 1 | -0/+31 | |
| * | | | | | | | | Allow to decrypt user '0' files only | Joas Schilling | 2016-06-09 | 1 | -12/+23 | |
| * | | | | | | | | do not generate device token if 2FA is enable for user | Christoph Wurst | 2016-06-09 | 1 | -7/+33 | |
| * | | | | | | | | Do not allow to store boolean configs, they behave unexpected on postgres | Joas Schilling | 2016-06-09 | 1 | -0/+19 | |
| * | | | | | | | | allow deleting "ghost files" trough the View and Node api | Robin Appelman | 2016-06-09 | 1 | -1/+50 | |
| * | | | | | | | | skip failing tests | Morris Jobke | 2016-06-07 | 3 | -0/+5 | |
* | | | | | | | | | Set content type when downloading log file to force download in some browsers... | Vincent Petry | 2016-07-06 | 1 | -0/+3 | |
* | | | | | | | | | fix swift primary object store test (#25281) | Thomas Müller | 2016-07-05 | 2 | -1/+55 | |
* | | | | | | | | | Merge pull request #25276 from owncloud/delete-own-session-token | Vincent Petry | 2016-07-01 | 1 | -5/+36 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | prevent users from deleting their own session token | Christoph Wurst | 2016-06-28 | 1 | -5/+36 | |
* | | | | | | | | | Various database migration fixes (#25209) | Thomas Müller | 2016-06-29 | 7 | -3/+1599 | |
|/ / / / / / / / | ||||||
* | | | | | | / | Login hooks (#25260) | Christoph Wurst | 2016-06-27 | 1 | -1/+4 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms | Vincent Petry | 2016-06-27 | 2 | -18/+87 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Repair step to adjust link share delete permissions | Vincent Petry | 2016-06-24 | 1 | -0/+87 | |
| * | | | | | | | Add explicit delete permission to link shares | Vincent Petry | 2016-06-24 | 1 | -18/+0 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* / | | | | | | check login name when authenticating with client token | Christoph Wurst | 2016-06-24 | 1 | -0/+30 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #25172 from owncloud/token-login-validation | Vincent Petry | 2016-06-22 | 3 | -107/+97 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix unit test warning/errors | Christoph Wurst | 2016-06-20 | 1 | -15/+16 | |
| * | | | | | | fix DefaultTokenMapperTest | Christoph Wurst | 2016-06-20 | 1 | -0/+4 | |
| * | | | | | | fix default token provider tests | Christoph Wurst | 2016-06-20 | 1 | -26/+0 | |
| * | | | | | | fix user session tests | Christoph Wurst | 2016-06-20 | 1 | -73/+73 | |
| * | | | | | | use token last_activity instead of session value | Christoph Wurst | 2016-06-17 | 1 | -1/+12 | |
* | | | | | | | occ web executor (#24957) | VicDeo | 2016-06-22 | 1 | -0/+143 | |
* | | | | | | | update session token password on user password change | Christoph Wurst | 2016-06-21 | 2 | -0/+98 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | add PasswordLoginForbiddenException | Christoph Wurst | 2016-06-17 | 2 | -2/+33 | |
|/ / / / / | ||||||
* | | | | | assert app is loaded in unit tests | Christoph Wurst | 2016-06-16 | 1 | -0/+7 | |
* | | | | | load 2FA provider apps before querying classes | Christoph Wurst | 2016-06-16 | 1 | -1/+4 | |
* | | | | | Merge pull request #24415 from owncloud/optimize_sharingdisabled_for_user | Vincent Petry | 2016-06-16 | 1 | -0/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix unit tests | Roeland Jago Douma | 2016-06-14 | 1 | -0/+7 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #25075 from owncloud/fix_23265 | Vincent Petry | 2016-06-16 | 1 | -0/+194 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove shares of the root folder | Roeland Jago Douma | 2016-06-13 | 1 | -0/+194 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #25093 from owncloud/issue-12816-clean-tags-from-deleted-u... | Vincent Petry | 2016-06-15 | 1 | -3/+25 | |
|\ \ \ \ \ | ||||||
| * | | | | | Clean up tags of deleted users | Joas Schilling | 2016-06-14 | 1 | -3/+25 | |
| | |/ / / | |/| | | | ||||||
* / | | | | create session token only for clients that support cookies | Christoph Wurst | 2016-06-13 | 1 | -3/+45 | |
|/ / / / | ||||||
* / / / | fail hard if 2fa provider can not be loaded (#25061) | Christoph Wurst | 2016-06-13 | 1 | -3/+24 | |
|/ / / | ||||||
* | | | Merge pull request #24863 from owncloud/propagator-batching | Vincent Petry | 2016-06-10 | 1 | -0/+125 | |
|\ \ \ |