summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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 pageJoas Schilling2016-01-223-10/+126
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #21840 from owncloud/fix-phpdocThomas Müller2016-01-225-14/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix PHPDoc - @changed is no official tag -> use @sinceMorris Jobke2016-01-225-14/+7
|/ / / / / / /
* | | | | | | Merge pull request #21532 from owncloud/share2.0_getSharesThomas Müller2016-01-227-89/+734
|\ \ \ \ \ \ \
| * | | | | | | [Share 2.0] Fix displaying old shares propleryRoeland Jago Douma2016-01-211-1/+12
| * | | | | | | Comments from VincentRoeland Jago Douma2016-01-213-13/+11
| * | | | | | | Add Unit tests for the default share providerRoeland Jago Douma2016-01-212-56/+412
| * | | | | | | [Share 2.0] Add subfiles=xRoeland Jago Douma2016-01-213-13/+45
| * | | | | | | Add intergration test for shared_with me and group sharesRoeland Jago Douma2016-01-211-0/+13
| * | | | | | | [Share 2.0] Resolve group sharesRoeland Jago Douma2016-01-211-5/+72
| * | | | | | | Renable intergration testRoeland Jago Douma2016-01-211-17/+14
| * | | | | | | [Sharing 2.0] Start with getSharesRoeland Jago Douma2016-01-215-14/+185
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-22148-1140/+1140
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #21831 from owncloud/move-descriptive-tag-to-coreThomas Müller2016-01-214-3/+99
|\ \ \ \ \ \ \
| * | | | | | | Move getDescriptiveTag to coreJoas Schilling2016-01-214-3/+99
* | | | | | | | 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-219-262/+615
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add Unit testsRoeland Jago Douma2016-01-202-0/+115
| * | | | | | 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
| * | | | | | [Share 2.0] Add fetching link shares to share managerRoeland Jago Douma2016-01-203-12/+71
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #21797 from owncloud/proper-controller-in-coreThomas Müller2016-01-2112-52/+21
|\ \ \ \ \ \
| * | | | | | move lost controller to core/controllerMorris Jobke2016-01-207-42/+11
| * | | | | | move user controller to core/controllerMorris Jobke2016-01-202-2/+2
| * | | | | | move setup controller to core/controllerMorris Jobke2016-01-202-3/+3
| * | | | | | move avatar controller to core/controllerMorris Jobke2016-01-203-5/+5
* | | | | | | 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 #21792 from owncloud/systemtags-managerfactoryThomas Müller2016-01-219-7/+192
|\ \ \ \ \ \ \
| * | | | | | | Allow custom implementation of system tag managersVincent Petry2016-01-209-7/+192
* | | | | | | | Merge pull request #20847 from owncloud/systemtags-uiThomas Müller2016-01-2123-8/+1553
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Adjust system tags app max versionVincent Petry2016-01-201-1/+1
| * | | | | | | Fix app metadata/test issues for system tags appVincent Petry2016-01-202-2/+2
| * | | | | | | Fix content type parsing in system tags pluginVincent Petry2016-01-201-1/+1
| * | | | | | | Added system tags GUI in sidebarVincent Petry2016-01-1922-26/+1512
| * | | | | | | Implement toggleselect extension for select2Vincent Petry2016-01-191-0/+59
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-21134-222/+154