summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19002 from UoM-ResPlat-DevOps/swift-streaming-downloadThomas Müller2016-01-221-16/+13
|\
| * 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
* | Merge pull request #21719 from owncloud/move-notification-api-to-ocpThomas Müller2016-01-222-3/+3
|\ \
| * | Move the notification API to public namespaceJoas Schilling2016-01-222-3/+3
* | | Merge pull request #21814 from owncloud/systemtags-backend-permissionsThomas Müller2016-01-2212-112/+715
|\ \ \
| * | | 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
* | | | Merge pull request #18531 from owncloud/ext-user-credentialsThomas Müller2016-01-2213-16/+160
|\ \ \ \
| * | | | bumb app versionRobin Appelman2016-01-181-1/+1
| * | | | fix testRobin Appelman2016-01-183-2/+3
| * | | | Pass the user when updating external storage statusRobin Appelman2016-01-183-7/+50
| * | | | Introduce 'login credentials' auth mechanismRobin McCorkell2016-01-188-7/+107
* | | | | Merge pull request #21826 from owncloud/dav-fix-user-deletionThomas Müller2016-01-222-2/+49
|\ \ \ \ \
| * | | | | No card ID when deleting is acceptableJoas Schilling2016-01-212-2/+49
* | | | | | Merge pull request #20768 from owncloud/mount-cacheThomas Müller2016-01-229-13/+77
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | clear mount cache when removing applicablesRobin Appelman2016-01-209-13/+77
* | | | | | Merge pull request #21532 from owncloud/share2.0_getSharesThomas Müller2016-01-222-1/+99
|\ \ \ \ \ \
| * | | | | | Comments from VincentRoeland Jago Douma2016-01-211-5/+3
| * | | | | | [Share 2.0] Add subfiles=xRoeland Jago Douma2016-01-211-0/+44
| * | | | | | [Sharing 2.0] Start with getSharesRoeland Jago Douma2016-01-212-1/+57
* | | | | | | Merge pull request #21829 from owncloud/remove-duplicated-valueThomas Müller2016-01-211-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | remove duplicated array valueblizzz2016-01-211-1/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #21761 from owncloud/share2_linkThomas Müller2016-01-214-250/+429
|\ \ \ \ \ \
| * | | | | | Directly get from the server containerRoeland Jago Douma2016-01-203-66/+76
| * | | | | | Do not use deprected activities APIRoeland Jago Douma2016-01-201-21/+33
| * | | | | | Get correct path for activity downloadsRoeland Jago Douma2016-01-201-1/+1
| * | | | | | [Share 2.0] Make public link work without viewRoeland Jago Douma2016-01-201-2/+13
| * | | | | | [Share 2.0] Make link share download use share managerRoeland Jago Douma2016-01-203-72/+79
| * | | | | | [Share 2.0] Move tests over the sharemanagerRoeland Jago Douma2016-01-203-111/+196
| * | | | | | [Share 2.0] Move showing link share to sharing 2.0Roeland Jago Douma2016-01-203-37/+91
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #21808 from owncloud/testing-app-detailsThomas Müller2016-01-212-2/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | testing app: fix app name capitalizationJan-Christoph Borchardt2016-01-211-1/+1
| * | | | | testing app: add max versionJan-Christoph Borchardt2016-01-211-1/+1
| * | | | | testing app: add logoJan-Christoph Borchardt2016-01-211-0/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #21778 from owncloud/share-calendarsThomas Müller2016-01-2122-204/+339
|\ \ \ \ \
| * | | | | Add back the current-user-principal test suiteThomas Müller2016-01-191-1/+1
| * | | | | CalDAV sync testsThomas Müller2016-01-1921-203/+331
| * | | | | Adjust CalDAV testsThomas Müller2016-01-192-2/+9
* | | | | | Merge pull request #20847 from owncloud/systemtags-uiThomas Müller2016-01-218-4/+406
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Adjust system tags app max versionVincent Petry2016-01-201-1/+1
| * | | | | Fix app metadata/test issues for system tags appVincent Petry2016-01-201-2/+1
| * | | | | Fix content type parsing in system tags pluginVincent Petry2016-01-201-1/+1
| * | | | | Added system tags GUI in sidebarVincent Petry2016-01-198-3/+406
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-21130-220/+66
* | | | | Use IUser::setEMailAddress in ldap as wellThomas Müller2016-01-2011-103/+132
* | | | | React on OC_User::changeUser hook and update the user's vcardThomas Müller2016-01-201-0/+9
* | | | | Introduce IUser::setEMailAddress and add hook mechanismThomas Müller2016-01-203-4/+7
| |/ / / |/| | |
* | | | Merge pull request #20804 from owncloud/fix-ldap-process-user-wo-displaynameThomas Müller2016-01-205-1/+141
|\ \ \ \