summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | 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
* | | | | | | Merge pull request #21782 from owncloud/update-system-addressbook-on-user-cha...Thomas Müller2016-01-2122-138/+207
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Use IUser::setEMailAddress in ldap as wellThomas Müller2016-01-2011-103/+132
| * | | | | | Emit OC\User::changeUser on change of display nameThomas Müller2016-01-201-1/+6
| * | | | | | 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-2011-37/+63
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #21775 from owncloud/apcu-iterator-constructorThomas Müller2016-01-201-1/+1
|\ \ \ \ \ \
| * | | | | | Fix constructor arguments for APCUIteratorRobin Appelman2016-01-181-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #21805 from owncloud/app-dependency-spacingFrank Karlitschek2016-01-201-1/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | remove unneeded margin of app dependencies in app mgmtJan-Christoph Borchardt2016-01-201-1/+0
|/ / / / /
* | | | | Merge pull request #20804 from owncloud/fix-ldap-process-user-wo-displaynameThomas Müller2016-01-205-1/+141
|\ \ \ \ \
| * | | | | LDAP: do not attempt to process user records without display name, fixes fata...Arthur Schiwon2016-01-115-1/+141
* | | | | | Merge pull request #21793 from owncloud/di_shareproviderfactoryThomas Müller2016-01-204-6/+28
|\ \ \ \ \ \
| * | | | | | Properly DI the servercontainerRoeland Jago Douma2016-01-204-6/+28
* | | | | | | Merge pull request #21795 from owncloud/remove-unneeded-markupThomas Müller2016-01-202-10/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove unneeded markup for scan process - ref #20545Morris Jobke2016-01-202-10/+0
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-2026-30/+390
* | | | | | Merge pull request #21785 from owncloud/cron-sync-system-addressbookThomas Müller2016-01-206-5/+102
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Install cron job on install and updateThomas Müller2016-01-193-4/+52