Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Migrate logic to dynamic controller | Lukas Reschke | 2016-06-27 | 3 | -34/+25 |
* | write theme settings to database | Bjoern Schiessle | 2016-06-27 | 1 | -4/+33 |
* | Merge remote-tracking branch 'upstream/master' into master-upstream-sync | Lukas Reschke | 2016-06-26 | 12 | -108/+376 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-24 | 2 | -2/+112 |
| * | Merge pull request #25172 from owncloud/token-login-validation | Vincent Petry | 2016-06-22 | 6 | -96/+174 |
| |\ | |||||
| | * | fix unit test warning/errors | Christoph Wurst | 2016-06-20 | 1 | -11/+9 |
| | * | fix nitpick | Christoph Wurst | 2016-06-20 | 1 | -2/+3 |
| | * | dont create a session token for clients, validate the app password instead | Christoph Wurst | 2016-06-17 | 1 | -8/+24 |
| | * | store last check timestamp in token instead of session | Christoph Wurst | 2016-06-17 | 6 | -76/+150 |
| | * | use token last_activity instead of session value | Christoph Wurst | 2016-06-17 | 3 | -21/+10 |
| * | | occ web executor (#24957) | VicDeo | 2016-06-22 | 2 | -4/+18 |
| * | | Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparents | Vincent Petry | 2016-06-22 | 1 | -1/+22 |
| |\ \ | |||||
| | * | | Fire hooks for mkdir for folder upload | karakayasemi | 2016-06-21 | 1 | -1/+22 |
| * | | | redirect to new login route (#25099) | Christoph Wurst | 2016-06-21 | 1 | -5/+6 |
| * | | | update session token password on user password change | Christoph Wurst | 2016-06-21 | 3 | -0/+44 |
* | | | | some text-changes to nextcloud | Joachim Sokolowski | 2016-06-22 | 1 | -13/+13 |
* | | | | Merge pull request #185 from nextcloud/fix-permission-issue | Lukas Reschke | 2016-06-21 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Show error message if config file is not readable | Morris Jobke | 2016-06-21 | 1 | -3/+3 |
* | | | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-21 | 24 | -65/+430 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-21 | 2 | -0/+6 |
| * | | | Merge pull request #25162 from owncloud/password-login-forbidden-hint | Vincent Petry | 2016-06-20 | 3 | -19/+56 |
| |\ \ \ | |||||
| | * | | | add PasswordLoginForbiddenException | Christoph Wurst | 2016-06-17 | 3 | -19/+56 |
| | | |/ | | |/| | |||||
| * | | | Update ExcludeFileByNameFilterIterator.php (#25184) | Thomas Müller | 2016-06-20 | 1 | -0/+1 |
| * | | | Merge pull request #25174 from owncloud/tokenmapper-close-cursor | Vincent Petry | 2016-06-20 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | close cursor after loading a token | Christoph Wurst | 2016-06-17 | 1 | -0/+1 |
| | |/ / | |||||
| * | | | Merge pull request #25168 from owncloud/capped-user-cache | Vincent Petry | 2016-06-20 | 1 | -2/+4 |
| |\ \ \ | |||||
| | * | | | Capped cache for user config | Jörn Friedrich Dreyer | 2016-06-17 | 1 | -2/+4 |
| | |/ / | |||||
| * | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-20 | 2 | -2/+2 |
| | |/ | |/| | |||||
| * | | Use getLazyRootFolder from RemoveRootShares repair step | Vincent Petry | 2016-06-17 | 1 | -1/+1 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-17 | 2 | -0/+8 |
| * | Merge pull request #25132 from owncloud/2fa-load-apps-before-query | Vincent Petry | 2016-06-16 | 1 | -0/+13 |
| |\ | |||||
| | * | load 2FA provider apps before querying classes | Christoph Wurst | 2016-06-16 | 1 | -0/+13 |
| * | | emit correct signal when disabling an app | Jörn Friedrich Dreyer | 2016-06-16 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #24415 from owncloud/optimize_sharingdisabled_for_user | Vincent Petry | 2016-06-16 | 2 | -16/+39 |
| |\ | |||||
| | * | Fix case with no user | Roeland Jago Douma | 2016-06-14 | 2 | -1/+10 |
| | * | Optimize isSharingDisabledForuser | Roeland Jago Douma | 2016-06-14 | 2 | -16/+30 |
| * | | Merge pull request #25075 from owncloud/fix_23265 | Vincent Petry | 2016-06-16 | 2 | -0/+159 |
| |\ \ | |||||
| | * | | Remove shares of the root folder | Roeland Jago Douma | 2016-06-13 | 2 | -0/+159 |
| * | | | Merge pull request #25056 from owncloud/fs-usermountcache-capped | Vincent Petry | 2016-06-15 | 1 | -3/+14 |
| |\ \ \ | |||||
| | * | | | Capped cache for cache info in UserMountCache | Vincent Petry | 2016-06-13 | 1 | -3/+14 |
| * | | | | Merge pull request #25093 from owncloud/issue-12816-clean-tags-from-deleted-u... | Vincent Petry | 2016-06-15 | 2 | -2/+57 |
| |\ \ \ \ | |||||
| | * | | | | Clean up tags of deleted users | Joas Schilling | 2016-06-14 | 2 | -2/+57 |
| * | | | | | Merge pull request #25102 from owncloud/preview-delete-performance | Vincent Petry | 2016-06-15 | 2 | -12/+27 |
| |\ \ \ \ \ | |||||
| | * | | | | | optimized size propagation on deletes | Robin Appelman | 2016-06-14 | 1 | -4/+14 |
| | * | | | | | propagator batching when removing thumbnails | Robin Appelman | 2016-06-14 | 1 | -7/+13 |
| | * | | | | | remvoe duplicate rmdir | Robin Appelman | 2016-06-14 | 1 | -1/+0 |
| * | | | | | | Merge pull request #25082 from owncloud/fix-sessionless-clients | Vincent Petry | 2016-06-15 | 2 | -3/+17 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | create session token only for clients that support cookies | Christoph Wurst | 2016-06-13 | 1 | -2/+11 |
| | * | | | | | | create session token on all APIs | Christoph Wurst | 2016-06-13 | 2 | -3/+8 |
| | |/ / / / / | |||||
| * | / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-15 | 2 | -0/+2 |
| | |/ / / / | |/| | | | |