summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* implementation of the federated share providerBjoern Schiessle2016-02-0811-1/+1250
* Merge pull request #22190 from owncloud/fix_22189Thomas Müller2016-02-082-2/+2
|\
| * Even single shares are returned as arrayRoeland Jago Douma2016-02-082-2/+2
* | Merge pull request #22138 from owncloud/comments-collapseThomas Müller2016-02-082-4/+68
|\ \
| * | Collapse long commentsVincent Petry2016-02-082-4/+68
|/ /
* | Merge pull request #22156 from owncloud/share2_unshare_ifexpiredThomas Müller2016-02-083-3/+239
|\ \
| * | Fix exception on deleteRoeland Jago Douma2016-02-061-1/+6
| * | getSharesBy should also expire link sharesRoeland Jago Douma2016-02-063-2/+151
| * | Delete expired share when fetched by idRoeland Jago Douma2016-02-062-0/+35
| * | Delete a link share if it is expired on accessRoeland Jago Douma2016-02-062-1/+48
* | | Merge pull request #22160 from owncloud/files_external-createThomas Müller2016-02-084-0/+358
|\ \ \
| * | | output mount id on createRobin Appelman2016-02-051-0/+5
| * | | verify that the auth backend is valid for the storage backendRobin Appelman2016-02-051-0/+5
| * | | list supported auth backends for storage backendsRobin Appelman2016-02-051-0/+3
| * | | Add occ files_external:create command to add new mountsRobin Appelman2016-02-054-0/+345
* | | | Merge pull request #22161 from owncloud/dav-ie9Thomas Müller2016-02-081-55/+41
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make JS Webdav work again with IE9-IE10Vincent Petry2016-02-051-55/+41
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-0824-0/+76
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-0718-0/+74
| |_|/ |/| |
* | | Merge pull request #22102 from owncloud/ldap_2nddispname-masterThomas Müller2016-02-0611-15/+209
|\ \ \
| * | | Port of test_ldap_2nddispname to masterArthur Schiwon2016-02-0311-15/+209
* | | | Merge pull request #22139 from owncloud/comments-files-cleanupThomas Müller2016-02-0613-34/+257
|\ \ \ \
| * | | | Move casting to IExpressionBuilderJoas Schilling2016-02-058-12/+108
| * | | | Remove old background jobJoas Schilling2016-02-051-0/+1
| * | | | fix pgsqlArthur Schiwon2016-02-051-2/+4
| * | | | cleanup jobs for comments and comment read marksArthur Schiwon2016-02-055-24/+148
| | |/ / | |/| |
* | | | Merge pull request #22163 from owncloud/comments-sizelimitThomas Müller2016-02-063-2/+116
|\ \ \ \
| * | | | Limit comment size to 1000 in UIVincent Petry2016-02-053-2/+116
* | | | | Merge pull request #20618 from owncloud/action-icon-sizeThomas Müller2016-02-061-2/+2
|\ \ \ \ \
| * | | | | Fix image sizing for action icons in EdgeRobin Appelman2015-11-191-2/+2
* | | | | | Merge pull request #22165 from owncloud/comments-markowncommentasreadThomas Müller2016-02-062-0/+9
|\ \ \ \ \ \
| * | | | | | Mark own comments as read after postingVincent Petry2016-02-052-0/+9
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #22166 from owncloud/remove-local-folderThomas Müller2016-02-068-73/+0
|\ \ \ \ \ \
| * | | | | | remove unused Storage->getLocalFolderRobin Appelman2016-02-058-73/+0
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-06174-220/+584
* | | | | | Merge pull request #22169 from owncloud/cache-interface-fixesThomas Müller2016-02-052-10/+8
|\ \ \ \ \ \
| * | | | | | remove unused Storage->searchRobin Appelman2016-02-051-9/+0
| * | | | | | additional phpdoc for searchRobin Appelman2016-02-051-1/+1
| * | | | | | add deprecation notice to search methodsRobin Appelman2016-02-051-0/+7
| |/ / / / /
* | | | | | Merge pull request #22155 from owncloud/use-svg-for-desktopappThomas Müller2016-02-056-4/+167
|\ \ \ \ \ \
| * | | | | | use path instead of text inside desktop app badgeHendrik Leppelsack2016-02-051-2/+32
| * | | | | | update google play and apple badgeHendrik Leppelsack2016-02-055-1/+134
| * | | | | | fix font in desktopapp.svgHendrik Leppelsack2016-02-051-2/+2
| * | | | | | Use SVG for desktop app buttonLukas Reschke2016-02-051-1/+1
| |/ / / / /
* | | | | | Merge pull request #22159 from owncloud/fix_21678Thomas Müller2016-02-051-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Gracefull handle link shares rename hookRoeland Jago Douma2016-02-051-0/+6
| |/ / / /
* | | | | Merge pull request #22157 from owncloud/use-https-instead-of-httpThomas Müller2016-02-051-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Use HTTPS instead of HTTPLukas Reschke2016-02-051-1/+1
| |/ / /
* | | | Merge pull request #22152 from owncloud/activities-for-commentsThomas Müller2016-02-059-8/+572
|\ \ \ \
| * | | | Only dispatch the delete event, when the deletion was successfulJoas Schilling2016-02-051-6/+8