summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Merge pull request #21761 from owncloud/share2_linkThomas Müller2016-01-219-262/+615
|\ | | | | Share2 link
| * Add Unit testsRoeland Jago Douma2016-01-202-0/+115
| |
| * Directly get from the server containerRoeland Jago Douma2016-01-203-66/+76
| | | | | | | | * Updated unit tests
| * 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
| | | | | | | | Nice side effect... pure unit tests!
| * [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 controller in core/ to a common subfolder
| * | move lost controller to core/controllerMorris Jobke2016-01-207-42/+11
| | | | | | | | | | | | | | | | | | | | | * lostpassword.css is unneeded since #11696 is merged - 1b50d4f7ceb92fffe0d38f823f175cf7e419c69e * js is already in core/js * css is moved to core/css/lostpassword * template is moved to core/templates/lostpassword
| * | 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 details
| * | | 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
|\ \ \ \ | | | | | | | | | | More tests for CalDAV
| * | | | 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 managers
| * | | | | Allow custom implementation of system tag managersVincent Petry2016-01-209-7/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added config.php option to replace the default implementation of system tag manager and system tag object mapper. Also adjusted the comments manager factory to inject the server container
* | | | | | Merge pull request #20847 from owncloud/systemtags-uiThomas Müller2016-01-2123-8/+1553
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | System tags sidebar section
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added files details sidebar panel to assign/unassign/rename/delete system tags.
| * | | | | Implement toggleselect extension for select2Vincent Petry2016-01-191-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | To make it possible to toggle selected values inside the dropdown
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-21134-222/+154
| | | | | |
* | | | | | Merge pull request #21782 from ↵Thomas Müller2016-01-2122-138/+207
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | owncloud/update-system-addressbook-on-user-change-2 Introduce IUser::setEMailAddress and add hook mechanism
| * | | | | 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 APCUIterator
| * | | | | 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 mgmt
| * | | | | 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, fi…
| * | | | | LDAP: do not attempt to process user records without display name, fixes ↵Arthur Schiwon2016-01-115-1/+141
| | | | | | | | | | | | | | | | | | | | | | | | fatal error
* | | | | | Merge pull request #21793 from owncloud/di_shareproviderfactoryThomas Müller2016-01-204-6/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Properly DI the servercontainer into share provider factory