Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21892 from owncloud/issue-21890-parameters | Thomas Müller | 2016-01-25 | 6 | -18/+20 |
|\ | | | | | Add parameters types to IQueryBuilder | ||||
| * | Replace other usages | Joas Schilling | 2016-01-25 | 6 | -18/+20 |
| | | |||||
* | | Adding support of -1 as size to be passed into get and getFile | Thomas Müller | 2016-01-25 | 1 | -11/+11 |
|/ | |||||
* | Merge pull request #21424 from owncloud/appversions | Thomas Müller | 2016-01-25 | 2 | -21/+11 |
|\ | | | | | Use appConfig to get app versions | ||||
| * | Faster AppConfig->getValues | Robin Appelman | 2016-01-11 | 1 | -7/+6 |
| | | |||||
| * | Use appconfig for getAppVersions | Robin Appelman | 2016-01-11 | 1 | -14/+5 |
| | | |||||
* | | Merge pull request #21806 from owncloud/mdusher-master | Thomas Müller | 2016-01-25 | 1 | -3/+3 |
|\ \ | | | | | | | [jenkins] Added ' to characters allowed in the username | ||||
| * | | fix error message and comment | Morris Jobke | 2016-01-20 | 1 | -2/+2 |
| | | | |||||
| * | | Added ' to characters allowed in the username | Michael U | 2016-01-20 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #21844 from owncloud/drop-image-path | Thomas Müller | 2016-01-25 | 3 | -28/+16 |
|\ \ \ | | | | | | | | | Remove OC_Helper::imagePath and use the proper public interface | ||||
| * | | | Remove OC_Helper::imagePath and use the proper public interface | Morris Jobke | 2016-01-24 | 3 | -28/+16 |
| | | | | |||||
* | | | | remove unused variable | Morris Jobke | 2016-01-25 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge pull request #21841 from owncloud/share2_deletefromself | Thomas Müller | 2016-01-22 | 3 | -0/+104 |
|\ \ \ | | | | | | | | | [Share 2.0] Add deleteFromSelf method | ||||
| * | | | [Share 2.0] Add deleteFromSelf method | Roeland Jago Douma | 2016-01-22 | 3 | -0/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 10 | -506/+15 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Move the notification API to public namespace | ||||
| * | | | | Allow automatic injection of the Manager | Joas Schilling | 2016-01-22 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Move the notification API to public namespace | Joas Schilling | 2016-01-22 | 9 | -506/+11 |
| | | | | | |||||
* | | | | | Merge pull request #18531 from owncloud/ext-user-credentials | Thomas Müller | 2016-01-22 | 9 | -46/+273 |
|\ \ \ \ \ | | | | | | | | | | | | | External storage 'Login credentials' auth mechanism | ||||
| * | | | | | allow comparing clob using expressionbuilder->eq if you explicitly say ↵ | Robin Appelman | 2016-01-18 | 4 | -5/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | you're comparing strings | ||||
| * | | | | | 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 |
| | | | | | | |||||
| * | | | | | Introduce CredentialsManager for storage of credentials in DB | Robin McCorkell | 2016-01-18 | 3 | -0/+142 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -42/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -4/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add custom marker into htaccess and execute integrity check after installation | ||||
| * | | | | | | Exclude .htaccess modifications from code checker | Lukas Reschke | 2016-01-22 | 4 | -4/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -4/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | 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 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #20768 from owncloud/mount-cache | Thomas Müller | 2016-01-22 | 6 | -20/+456 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | 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 | 1 | -0/+17 |
| | | | | | | | |||||
| * | | | | | | handle changed mount points | Robin Appelman | 2016-01-20 | 1 | -1/+23 |
| | | | | | | | |||||
| * | | | | | | clear mount cache when deleting user | Robin Appelman | 2016-01-20 | 3 | -17/+92 |
| | | | | | | | |||||
| * | | | | | | multiple minor fies | Robin Appelman | 2016-01-20 | 3 | -11/+24 |
| | | | | | | | |||||
| * | | | | | | use getmountmanager | Robin Appelman | 2016-01-20 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | log duplicates | Robin Appelman | 2016-01-20 | 2 | -3/+18 |
| | | | | | | | |||||
| * | | | | | | Filter uncached mounts | Robin Appelman | 2016-01-20 | 1 | -10/+15 |
| | | | | | | | |||||
| * | | | | | | cache mountpoints in the db | Robin Appelman | 2016-01-20 | 5 | -4/+311 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #21824 from owncloud/list-of-notifiers | Thomas Müller | 2016-01-22 | 2 | -7/+50 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make it possible to get a list of notifiers for a potential settings … | ||||
| * | | | | | | Make it possible to get a list of notifiers for a potential settings page | Joas Schilling | 2016-01-22 | 2 | -7/+50 |
| | | | | | | | |||||
* | | | | | | | Fix PHPDoc - @changed is no official tag -> use @since | Morris Jobke | 2016-01-22 | 2 | -8/+4 |
| | | | | | | | |||||
* | | | | | | | [Share 2.0] Fix displaying old shares proplery | Roeland Jago Douma | 2016-01-21 | 1 | -1/+12 |
| | | | | | | | |||||
* | | | | | | | Comments from Vincent | Roeland Jago Douma | 2016-01-21 | 2 | -8/+8 |
| | | | | | | | |||||
* | | | | | | | Add Unit tests for the default share provider | Roeland Jago Douma | 2016-01-21 | 1 | -13/+17 |
| | | | | | | | |||||
* | | | | | | | [Share 2.0] Add subfiles=x | Roeland Jago Douma | 2016-01-21 | 2 | -13/+1 |
| | | | | | | | |||||
* | | | | | | | [Share 2.0] Resolve group shares | Roeland Jago Douma | 2016-01-21 | 1 | -5/+72 |
| | | | | | | | |||||
* | | | | | | | [Sharing 2.0] Start with getShares | Roeland Jago Douma | 2016-01-21 | 3 | -13/+128 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #21761 from owncloud/share2_link | Thomas Müller | 2016-01-21 | 3 | -12/+71 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Share2 link | ||||
| * | | | | | | [Share 2.0] Add fetching link shares to share manager | Roeland Jago Douma | 2016-01-20 | 3 | -12/+71 |
| | |/ / / / | |/| | | | |