aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19002 from UoM-ResPlat-DevOps/swift-streaming-downloadThomas Müller2016-01-221-16/+13
|\ | | | | Streaming download from Swift in files_external
| * Modified swift handling to explicitly set 404 responses to falseDaniel Tosello2016-01-121-1/+2
| |
| * Fixing swift fopen by ensuring stream is a valid resourceDaniel Tosello2015-12-101-1/+4
| |
| * Streaming download from Swift external storageTim Dettrick2015-12-101-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_deletefromselfThomas Müller2016-01-224-2/+404
|\ \ | | | | | | [Share 2.0] Add deleteFromSelf method
| * | [Share 2.0] Add deleteFromSelf methodRoeland Jago Douma2016-01-224-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/masterThomas Müller2016-01-221-0/+5
|\ \ \ | | | | | | | | Solves #21835 (https://github.com/owncloud/core/issues/21835)
| * | | Solves #Roman Kreisel2016-01-211-0/+5
| | | |
* | | | Merge pull request #21719 from owncloud/move-notification-api-to-ocpThomas Müller2016-01-2217-149/+143
|\ \ \ \ | | | | | | | | | | Move the notification API to public namespace
| * | | | Allow automatic injection of the ManagerJoas Schilling2016-01-222-1/+5
| | | | |
| * | | | Adjust the since on the interfaceJoas Schilling2016-01-225-48/+48
| | | | |
| * | | | Move the notification API to public namespaceJoas Schilling2016-01-2216-100/+90
| | | | |
* | | | | Merge pull request #21814 from owncloud/systemtags-backend-permissionsThomas Müller2016-01-2212-112/+715
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix DAV backend to respect system tags permissions
| * | | | Inject user session to check for admin in system tags DAV handlersVincent Petry2016-01-216-30/+122
| | | | |
| * | | | Fix DAV to respect system tags permissionsVincent Petry2016-01-2112-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-checkThomas Müller2016-01-221-0/+6
|\ \ \ \ \ | | | | | | | | | | | | Print output for integrity check during ./occ upgrade
| * | | | | Print output for integrity check during ./occ upgradeMorris Jobke2016-01-221-0/+6
| | | | | |
* | | | | | Merge pull request #18531 from owncloud/ext-user-credentialsThomas Müller2016-01-2230-89/+780
|\ \ \ \ \ \ | | | | | | | | | | | | | | External storage 'Login credentials' auth mechanism
| * | | | | | allow comparing clob using expressionbuilder->eq if you explicitly say ↵Robin Appelman2016-01-185-6/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | you're comparing strings
| * | | | | | bumb app versionRobin Appelman2016-01-181-1/+1
| | | | | | |
| * | | | | | handle bool in setValueRobin Appelman2016-01-181-3/+13
| | | | | | |
| * | | | | | also handle not null violationsRobin Appelman2016-01-181-1/+1
| | | | | | |
| * | | | | | fix testRobin Appelman2016-01-185-7/+24
| | | | | | |
| * | | | | | Pass the user when updating external storage statusRobin Appelman2016-01-183-7/+50
| | | | | | |
| * | | | | | Introduce 'login credentials' auth mechanismRobin McCorkell2016-01-188-7/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stores user credentials in the database after user login, uses the new CredentialsManager class
| * | | | | | Introduce CredentialsManager for storage of credentials in DBRobin McCorkell2016-01-187-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 McCorkell2016-01-186-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-htaccessThomas Müller2016-01-2211-4/+130
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add custom marker into htaccess and execute integrity check after installation
| * | | | | | | Run on installerLukas Reschke2016-01-221-0/+1
| | | | | | | |
| * | | | | | | Exclude .htaccess modifications from code checkerLukas Reschke2016-01-2210-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üller2016-01-225-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 idLukas Reschke2016-01-205-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-iconThomas Müller2016-01-222-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 oneJoas Schilling2016-01-222-0/+9
|/ / / / / / /
* | | | | | | Merge pull request #21843 from owncloud/increase-versionThomas Müller2016-01-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Increase version due to new tables
| * | | | | | | Increase version due to new tablesVincent Petry2016-01-221-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #21826 from owncloud/dav-fix-user-deletionThomas Müller2016-01-222-2/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | No card ID when deleting is acceptable
| * | | | | | | No card ID when deleting is acceptableJoas Schilling2016-01-212-2/+49
| | | | | | | |
* | | | | | | | Merge pull request #20768 from owncloud/mount-cacheThomas Müller2016-01-2220-33/+1037
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | cache mountpoints in the db
| * | | | | | | use insertifnotexistsRobin Appelman2016-01-201-23/+5
| | | | | | | |
| * | | | | | | clear mount cache when removing applicablesRobin Appelman2016-01-2011-13/+113
| | | | | | | |
| * | | | | | | handle changed mount pointsRobin Appelman2016-01-201-1/+23
| | | | | | | |
| * | | | | | | clear mount cache when deleting userRobin Appelman2016-01-204-18/+101
| | | | | | | |
| * | | | | | | multiple minor fiesRobin Appelman2016-01-207-22/+37
| | | | | | | |
| * | | | | | | sort in testsRobin Appelman2016-01-201-1/+18
| | | | | | | |
| * | | | | | | use getmountmanagerRobin Appelman2016-01-201-1/+1
| | | | | | | |
| * | | | | | | log duplicatesRobin Appelman2016-01-203-4/+20
| | | | | | | |
| * | | | | | | Filter uncached mountsRobin Appelman2016-01-201-10/+15
| | | | | | | |
| * | | | | | | cache mountpoints in the dbRobin Appelman2016-01-2010-4/+768
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #21824 from owncloud/list-of-notifiersThomas Müller2016-01-223-10/+126
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make it possible to get a list of notifiers for a potential settings …