| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #21102 from owncloud/stable8.1_20989 | Vincent Petry | 2015-12-10 | 1 | -0/+38 |
|\ |
|
| * | Update parent when moving share into recieved share | Roeland Jago Douma | 2015-12-10 | 1 | -0/+38 |
* | | Merge pull request #21081 from owncloud/stable8.1-share-computesharepermissio... | Morris Jobke | 2015-12-10 | 10 | -29/+75 |
|\ \
| |/
|/| |
|
| * | Add explicit check for groups excluded from sharing | Vincent Petry | 2015-12-09 | 1 | -1/+1 |
| * | Fix more unit tests to pass a mock storage instead of null to FileInfo | Vincent Petry | 2015-12-09 | 4 | -19/+53 |
| * | Add reshare permission checks | Vincent Petry | 2015-12-09 | 3 | -2/+9 |
| * | Compute share permissions in the view | Vincent Petry | 2015-12-09 | 3 | -8/+13 |
* | | Merge pull request #21085 from owncloud/occ-shall-not-fail-hard-in-maintenanc... | Vincent Petry | 2015-12-09 | 1 | -3/+5 |
|\ \
| |/
|/| |
|
| * | Don't load commands of apps when in maintenance mode - fixes #20939 | Thomas Müller | 2015-12-09 | 1 | -3/+5 |
|/ |
|
* | Merge pull request #21042 from owncloud/backport-21037-stable8.1 | Morris Jobke | 2015-12-08 | 1 | -1/+1 |
|\ |
|
| * | passing an empty base in this diagnosis call will not result in LDAP errors | Arthur Schiwon | 2015-12-08 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #20999 from owncloud/backport-20981-multiple-emails-for-sh... | Morris Jobke | 2015-12-07 | 2 | -4/+22 |
|\ |
|
| * | Add a unit test for single user case as well | Joas Schilling | 2015-12-07 | 1 | -7/+9 |
| * | Allow sending a share email to multiple users | Joas Schilling | 2015-12-07 | 2 | -4/+20 |
* | | Merge pull request #20986 from owncloud/use-proper-logexception-stable8.1 | Thomas Müller | 2015-12-07 | 2 | -2/+2 |
|\ \
| |/
|/| |
|
| * | ILogger has no logException() - fixes #20797 | Thomas Müller | 2015-12-07 | 2 | -2/+2 |
|/ |
|
* | Merge pull request #20795 from owncloud/stable8.1-backport-20790 | Vincent Petry | 2015-12-04 | 3 | -26/+12 |
|\ |
|
| * | Deduplicate queued trashbin expire jobs | Morris Jobke | 2015-11-27 | 3 | -26/+12 |
* | | Merge pull request #20956 from owncloud/stable8.1-backport-20877 | Morris Jobke | 2015-12-04 | 1 | -1/+7 |
|\ \ |
|
| * | | Check the expiration date for null | Morris Jobke | 2015-12-04 | 1 | -1/+7 |
|/ / |
|
* | | Merge pull request #20489 from owncloud/backport-20487-8.1 | Vincent Petry | 2015-12-03 | 2 | -7/+23 |
|\ \ |
|
| * | | Add a unit test that executes the query | Joas Schilling | 2015-11-18 | 1 | -0/+13 |
| * | | Oracle can not return statements but only values | Joas Schilling | 2015-11-13 | 2 | -7/+10 |
* | | | Merge pull request #20831 from owncloud/catch-missing-route-81 | Thomas Müller | 2015-11-30 | 4 | -9/+30 |
|\ \ \
| |_|/
|/| | |
|
| * | | Dont die when we're missing a route | Robin Appelman | 2015-11-30 | 4 | -9/+30 |
|/ / |
|
* | | Merge pull request #20764 from owncloud/scan-eventsource-no-paths-81 | Vincent Petry | 2015-11-26 | 1 | -8/+0 |
|\ \ |
|
| * | | Dont output paths in scan.php | Robin Appelman | 2015-11-26 | 1 | -8/+0 |
| |/ |
|
* | | Merge pull request #20698 from owncloud/stable8.1-backport-19530 | Morris Jobke | 2015-11-25 | 2 | -1/+36 |
|\ \ |
|
| * | | Add a unit test for "share a file inside a folder that is already shared" | Joas Schilling | 2015-11-24 | 1 | -0/+33 |
| * | | Make sure all variables are defined | Joas Schilling | 2015-11-24 | 1 | -0/+2 |
| * | | Make sure the share we found is for the same item | Joas Schilling | 2015-11-24 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #20678 from owncloud/backport-joblist-fix-8.1 | Morris Jobke | 2015-11-23 | 1 | -11/+23 |
|\ \ |
|
| * | | Make the JobList test more robust by sorting the result of getAll before comp... | Joas Schilling | 2015-11-23 | 1 | -11/+23 |
|/ / |
|
* | | Merge pull request #20637 from owncloud/cache-escape-like-81 | Morris Jobke | 2015-11-20 | 4 | -1/+52 |
|\ \
| |/
|/| |
|
| * | escape like parameter in cache move | Robin Appelman | 2015-11-20 | 1 | -1/+2 |
| * | Add test for special character during move | Robin Appelman | 2015-11-20 | 1 | -0/+48 |
| * | define escape character for like statements on oracle | Robin Appelman | 2015-11-20 | 1 | -0/+1 |
| * | define escape character for like statements on sqlite | Robin Appelman | 2015-11-20 | 1 | -0/+1 |
|/ |
|
* | Merge pull request #20307 from owncloud/stable8.1-backport-use-actual-mimetyp... | Morris Jobke | 2015-11-10 | 1 | -9/+9 |
|\ |
|
| * | Use actual mimetype detection instead of extension | Lukas Reschke | 2015-11-10 | 1 | -9/+9 |
* | | Merge pull request #20395 from owncloud/stable8.1-extstorage-gdrive-forceappr... | Morris Jobke | 2015-11-09 | 1 | -0/+1 |
|\ \ |
|
| * | | Force approval in GDrive oauth to get refresh_token | Vincent Petry | 2015-11-09 | 1 | -0/+1 |
* | | | Merge pull request #20367 from owncloud/stable8.1-backport-20346 | Morris Jobke | 2015-11-09 | 1 | -0/+8 |
|\ \ \ |
|
| * | | | Show the language code in personal settings for unknown languages | Morris Jobke | 2015-11-06 | 1 | -0/+8 |
| |/ / |
|
* | | | Merge pull request #20362 from owncloud/backport-20271-stable8.1 | Morris Jobke | 2015-11-06 | 2 | -20/+149 |
|\ \ \
| |/ /
|/| | |
|
| * | | integration tests | Arthur Schiwon | 2015-11-06 | 1 | -0/+118 |
| * | | LDAP: attempt to connect to backup server again, if main server is not availa... | Arthur Schiwon | 2015-11-06 | 1 | -20/+31 |
|/ / |
|
* | | Merge pull request #20246 from owncloud/backport-20192-stable8.1 | Vincent Petry | 2015-11-05 | 2 | -0/+12 |
|\ \ |
|
| * | | if a user that is flag as deleted shows up again, remove that flag. Fixes #20090 | Arthur Schiwon | 2015-11-02 | 2 | -0/+12 |
* | | | Merge pull request #20286 from owncloud/stable8.1-share-preventmovemountpoint... | Vincent Petry | 2015-11-05 | 2 | -27/+141 |
|\ \ \
| |_|/
|/| | |
|