summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* implement principal property search for calendar user address set propertyGeorg Ehrke2019-03-215-0/+170
* Merge pull request #14778 from nextcloud/user_ldap_createuser_fixMorris Jobke2019-03-214-4/+15
|\
| * LDAP plugin: force createUser to return new user's DNVinicius Cubas Brand2019-03-211-1/+2
| * Cache cleaning when subadmin adds user to groupVinicius Cubas Brand2019-03-211-0/+2
| * fix user creation using LDAP PluginVinicius Cubas Brand2019-03-213-4/+12
|/
* Merge pull request #14776 from nextcloud/fix/files/size-colorMorris Jobke2019-03-211-7/+30
|\
| * Use max contrast variable to cap the generated coloursJohn Molakvoæ (skjnldsv)2019-03-211-7/+30
* | Merge pull request #14695 from nextcloud/enhancement/grid/sharing-in-menuMorris Jobke2019-03-2113-22/+18910
|\ \
| * | Add link icon for public link tooJohn Molakvoæ (skjnldsv)2019-03-215-10/+14
| * | Put sharing entry all aboveJohn Molakvoæ (skjnldsv)2019-03-211-1/+1
| * | Show sharing in menu in grid viewJohn Molakvoæ (skjnldsv)2019-03-219-13/+18897
| |/
* | Merge pull request #14606 from nextcloud/bugfix/stricter-check-trusted-proxyMorris Jobke2019-03-211-1/+1
|\ \ | |/ |/|
| * Trigger warning if empty array or false and X-Forwarded-Host is presentDaniel Kesselberg2019-03-201-1/+1
| * Make check for empty trusted proxies more strictDaniel Kesselberg2019-03-201-1/+1
* | [tx-robot] updated from transifexNextcloud bot2019-03-211434-20488/+2574
* | Merge pull request #14774 from nextcloud/fix/bundle_enable_testsMorris Jobke2019-03-201-8/+8
|\ \
| * | Temp disable bundle testsRoeland Jago Douma2019-03-201-8/+8
|/ /
* | Merge pull request #14578 from nextcloud/enh/force_enable_appsRoeland Jago Douma2019-03-2031-6070/+3115
|\ \
| * | Remove unused IUserSessionJoas Schilling2019-03-202-8/+1
| * | Do not ignore the max-version for the "update-available" checkJoas Schilling2019-03-202-3/+12
| * | Remove apps from the list which have no release at allJoas Schilling2019-03-201-0/+5
| * | allow enforcing apps to ignore the max versionRoeland Jago Douma2019-03-2028-6063/+3101
* | | Merge pull request #14753 from nextcloud/revert-13097-feature/11319/where-is-...Roeland Jago Douma2019-03-2022-766/+181
|\ \ \
| * | | Revert "Do not register unexisting section"Roeland Jago Douma2019-03-201-0/+1
| * | | Revert "Where is your data?"Roeland Jago Douma2019-03-2021-766/+180
| |/ /
* | | Merge pull request #14766 from nextcloud/backport/14709/masterMorris Jobke2019-03-201-2/+2
|\ \ \ | |/ / |/| |
| * | Update lib/private/Share20/Manager.php Morris Jobke2019-03-201-1/+1
| * | Update lib/private/Share20/Manager.php Morris Jobke2019-03-201-1/+1
| * | groupname like username - allow share with bothChristian Aigner2019-03-201-2/+2
|/ /
* | Merge pull request #14713 from nextcloud/fix/admin-2fa-collapse-disableMorris Jobke2019-03-205-65/+93
|\ \ | |/ |/|
| * Collapse 2FA admin detail settings if disabledChristoph Wurst2019-03-205-65/+93
|/
* Merge pull request #14674 from CamilionEU/masterMorris Jobke2019-03-201-4/+3
|\
| * [app:files] Use current directory for hashing.Evilham2019-03-131-4/+3
* | Merge pull request #14691 from nextcloud/rename-mountpoint-within-mountpointRoeland Jago Douma2019-03-201-11/+6
|\ \
| * | always allow moving mountpoints inside the same mountpointRobin Appelman2019-03-191-11/+6
* | | [tx-robot] updated from transifexNextcloud bot2019-03-2036-64/+78
* | | Merge pull request #14664 from nextcloud/bugfix/noid/absolute-paths-of-images...Roeland Jago Douma2019-03-1928-200/+695
|\ \ \
| * | | Return 200 instead of 404 when asking for collections of a resourceJoas Schilling2019-03-191-1/+1
| * | | Bump bundlesJulius Härtl2019-03-1912-11/+599
| * | | Bump nextcloud-vue-collectionsJulius Härtl2019-03-192-8/+14
| * | | Adjust gitattributes to ignore all files_sharing scripts in diffJulius Härtl2019-03-191-2/+2
| * | | Adjust resource type to fileJulius Härtl2019-03-193-3/+2
| * | | Dispatch event to allow apps to load their script for collectionsJulius Härtl2019-03-195-17/+26
| * | | Use rich objects instead of name, link and iconJoas Schilling2019-03-196-161/+49
| * | | Replace the icon-class with an absolute link to an imageJoas Schilling2019-03-196-16/+21
* | | | Merge pull request #14747 from nextcloud/fix/access_list_external_storageMorris Jobke2019-03-191-1/+7
|\ \ \ \
| * | | | Fix getting the access list on external storageRoeland Jago Douma2019-03-191-1/+7
| |/ / /
* | | | Merge pull request #14744 from nextcloud/bugfix/noid/fix-push-notifications-f...Christoph Wurst2019-03-191-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Always register the NotifierJoas Schilling2019-03-191-5/+5
| |/ /
* | | Merge pull request #14739 from nextcloud/bugfix/noid/header-link-navigation-s...Roeland Jago Douma2019-03-192-2/+3
|\ \ \ | |/ / |/| |