Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19002 from UoM-ResPlat-DevOps/swift-streaming-download | Thomas Müller | 2016-01-22 | 1 | -16/+13 |
|\ | | | | | Streaming download from Swift in files_external | ||||
| * | Modified swift handling to explicitly set 404 responses to false | Daniel Tosello | 2016-01-12 | 1 | -1/+2 |
| | | |||||
| * | Fixing swift fopen by ensuring stream is a valid resource | Daniel Tosello | 2015-12-10 | 1 | -1/+4 |
| | | |||||
| * | Streaming download from Swift external storage | Tim Dettrick | 2015-12-10 | 1 | -17/+10 |
| | | | | | | | | | | Speeds up downloads as they no longer need to buffer completely on the ownCloud server before being sent to the client. | ||||
* | | Merge pull request #21841 from owncloud/share2_deletefromself | Thomas Müller | 2016-01-22 | 4 | -2/+404 |
|\ \ | | | | | | | [Share 2.0] Add deleteFromSelf method | ||||
| * | | [Share 2.0] Add deleteFromSelf method | Roeland Jago Douma | 2016-01-22 | 4 | -2/+404 |
| | | | | | | | | | | | | | | | | | | | | | This allows recipient to delete a share. For user shares this is the same as deleting (at least for now). But for group shares this means creating a new share with type 2. With permissions set to 0. | ||||
* | | | Merge pull request #21836 from RomanKreisel/master | Thomas Müller | 2016-01-22 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | Solves #21835 (https://github.com/owncloud/core/issues/21835) | ||||
| * | | | Solves # | Roman Kreisel | 2016-01-21 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge pull request #21719 from owncloud/move-notification-api-to-ocp | Thomas Müller | 2016-01-22 | 17 | -149/+143 |
|\ \ \ \ | | | | | | | | | | | Move the notification API to public namespace | ||||
| * | | | | Allow automatic injection of the Manager | Joas Schilling | 2016-01-22 | 2 | -1/+5 |
| | | | | | |||||
| * | | | | Adjust the since on the interface | Joas Schilling | 2016-01-22 | 5 | -48/+48 |
| | | | | | |||||
| * | | | | Move the notification API to public namespace | Joas Schilling | 2016-01-22 | 16 | -100/+90 |
| | | | | | |||||
* | | | | | Merge pull request #21814 from owncloud/systemtags-backend-permissions | Thomas Müller | 2016-01-22 | 12 | -112/+715 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix DAV backend to respect system tags permissions | ||||
| * | | | | Inject user session to check for admin in system tags DAV handlers | Vincent Petry | 2016-01-21 | 6 | -30/+122 |
| | | | | | |||||
| * | | | | Fix DAV to respect system tags permissions | Vincent Petry | 2016-01-21 | 12 | -109/+620 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When queried as regular user, visible tags are not displayed in result sets and queries for existence will return false. Non-assignable or non-visible tags cannot be renamed/assigned/unassigned. User is not allowed to change tag permissions, only to change the name if the tag is also assignable. | ||||
* | | | | | Merge pull request #21850 from owncloud/more-output-for-integrity-check | Thomas Müller | 2016-01-22 | 1 | -0/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Print output for integrity check during ./occ upgrade | ||||
| * | | | | | Print output for integrity check during ./occ upgrade | Morris Jobke | 2016-01-22 | 1 | -0/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #18531 from owncloud/ext-user-credentials | Thomas Müller | 2016-01-22 | 30 | -89/+780 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | External storage 'Login credentials' auth mechanism | ||||
| * | | | | | | allow comparing clob using expressionbuilder->eq if you explicitly say ↵ | Robin Appelman | 2016-01-18 | 5 | -6/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | you're comparing strings | ||||
| * | | | | | | bumb app version | Robin Appelman | 2016-01-18 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | handle bool in setValue | Robin Appelman | 2016-01-18 | 1 | -3/+13 |
| | | | | | | | |||||
| * | | | | | | also handle not null violations | Robin Appelman | 2016-01-18 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix test | Robin Appelman | 2016-01-18 | 5 | -7/+24 |
| | | | | | | | |||||
| * | | | | | | Pass the user when updating external storage status | Robin Appelman | 2016-01-18 | 3 | -7/+50 |
| | | | | | | | |||||
| * | | | | | | Introduce 'login credentials' auth mechanism | Robin McCorkell | 2016-01-18 | 8 | -7/+107 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stores user credentials in the database after user login, uses the new CredentialsManager class | ||||
| * | | | | | | Introduce CredentialsManager for storage of credentials in DB | Robin McCorkell | 2016-01-18 | 7 | -0/+366 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CredentialsManager performs a simple role, of storing and retrieving encrypted credentials from the database. Credentials are stored by user ID (which may be null) and credentials identifier. Credentials themselves may be of any type that can be JSON encoded. The rationale behind this is to avoid further (mis)use of oc_preferences, which was being used for all manner of data not related to user preferences. | ||||
| * | | | | | | Introduce IDBConnection::setValues() | Robin McCorkell | 2016-01-18 | 6 | -68/+179 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setValues() attempts to insert a new row, or failing that, update an existing row. The ability to set preconditions is also available. | ||||
* | | | | | | | Merge pull request #21849 from owncloud/add-custom-marker-into-htaccess | Thomas Müller | 2016-01-22 | 11 | -4/+130 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add custom marker into htaccess and execute integrity check after installation | ||||
| * | | | | | | | Run on installer | Lukas Reschke | 2016-01-22 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Exclude .htaccess modifications from code checker | Lukas Reschke | 2016-01-22 | 10 | -4/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the initial installation ownCloud will write some content into the .htaccess file such as the 404 or 403 directives. This adds a magic marker into the .htaccess file and only the content above this marker will be compared in the integrity checker. | ||||
* | | | | | | | | Merge pull request #21816 from ↵ | Thomas Müller | 2016-01-22 | 5 | -33/+47 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | owncloud/require-a-specific-path-instead-of-autoguessing Use path instead of app id for occ app signing | ||||
| * | | | | | | | Use path instead of app id | Lukas Reschke | 2016-01-20 | 5 | -33/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires the usage of a path instead of the App ID when signing code. This has the advantage that developers can also sign code under a different location to make it easier. (e.g. remove `.git`, …) Also it adds an example command usage as well as a link to the documentation | ||||
* | | | | | | | | Merge pull request #21847 from owncloud/issue-21807-default-app-icon | Thomas Müller | 2016-01-22 | 2 | -0/+9 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Add a default app icon for apps that don't have one | ||||
| * | | | | | | | Add a default app icon for apps that don't have one | Joas Schilling | 2016-01-22 | 2 | -0/+9 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #21843 from owncloud/increase-version | Thomas Müller | 2016-01-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Increase version due to new tables | ||||
| * | | | | | | | Increase version due to new tables | Vincent Petry | 2016-01-22 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #21826 from owncloud/dav-fix-user-deletion | Thomas Müller | 2016-01-22 | 2 | -2/+49 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | No card ID when deleting is acceptable | ||||
| * | | | | | | | No card ID when deleting is acceptable | Joas Schilling | 2016-01-21 | 2 | -2/+49 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #20768 from owncloud/mount-cache | Thomas Müller | 2016-01-22 | 20 | -33/+1037 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | cache mountpoints in the db | ||||
| * | | | | | | | use insertifnotexists | Robin Appelman | 2016-01-20 | 1 | -23/+5 |
| | | | | | | | | |||||
| * | | | | | | | clear mount cache when removing applicables | Robin Appelman | 2016-01-20 | 11 | -13/+113 |
| | | | | | | | | |||||
| * | | | | | | | handle changed mount points | Robin Appelman | 2016-01-20 | 1 | -1/+23 |
| | | | | | | | | |||||
| * | | | | | | | clear mount cache when deleting user | Robin Appelman | 2016-01-20 | 4 | -18/+101 |
| | | | | | | | | |||||
| * | | | | | | | multiple minor fies | Robin Appelman | 2016-01-20 | 7 | -22/+37 |
| | | | | | | | | |||||
| * | | | | | | | sort in tests | Robin Appelman | 2016-01-20 | 1 | -1/+18 |
| | | | | | | | | |||||
| * | | | | | | | use getmountmanager | Robin Appelman | 2016-01-20 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | log duplicates | Robin Appelman | 2016-01-20 | 3 | -4/+20 |
| | | | | | | | | |||||
| * | | | | | | | Filter uncached mounts | Robin Appelman | 2016-01-20 | 1 | -10/+15 |
| | | | | | | | | |||||
| * | | | | | | | cache mountpoints in the db | Robin Appelman | 2016-01-20 | 10 | -4/+768 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #21824 from owncloud/list-of-notifiers | Thomas Müller | 2016-01-22 | 3 | -10/+126 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make it possible to get a list of notifiers for a potential settings … |