summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #14805 from nextcloud/fix/backgroundrepairRoeland Jago Douma2019-03-232-7/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Properly inject EventDispatched in BackgroundRepairRoeland Jago Douma2019-03-222-7/+3
| | |/ / | |/| |
* | | | Merge pull request #14798 from nextcloud/fix/collaboration_translation_stringRoeland Jago Douma2019-03-225-5/+5
|\ \ \ \
| * | | | Allow string to be translatedRoeland Jago Douma2019-03-225-5/+5
| | |_|/ | |/| |
* | | | Merge pull request #14810 from nextcloud/feature/create-user-select-usernameRoeland Jago Douma2019-03-223-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Select the username input after creating a user successfullyChristoph Wurst2019-03-223-2/+3
|/ / /
* | | Merge pull request #14802 from nextcloud/print-backupcodes-monospaceRoeland Jago Douma2019-03-223-3/+3
|\ \ \ | |/ / |/| |
| * | Use monospaced font when printing twofactor backup codes.Joachim Bauch2019-03-223-3/+3
|/ /
* | Merge pull request #14573 from nextcloud/version/noid/16.0.0beta1v16.0.0beta1Morris Jobke2019-03-221-2/+2
|\ \ | |/ |/|
| * 16.0.0 Beta 1Morris Jobke2019-03-211-2/+2
|/
* Merge pull request #14058 from vpecinka/masterMorris Jobke2019-03-211-1/+2
|\
| * Store user object later in the codeVlastimil Pecinka2019-03-211-1/+2
|/
* Merge pull request #14315 from nextcloud/feature/12033/calendar-user-address-setMorris Jobke2019-03-215-0/+170
|\
| * implement principal property search for calendar user address set propertyGeorg Ehrke2019-03-215-0/+170
* | Merge pull request #13721 from oole/bug/12729_postgresql_duplicate_key_valueMorris Jobke2019-03-215-12/+52
|\ \
| * | Fix PHPDocMorris Jobke2019-03-212-2/+2
| * | Code cleanup.Ole Ostergaard2019-03-215-15/+16
| * | Add insertIgnoreConflict to IDBConnection interface.Ole Ostergaard2019-03-211-0/+14
| * | Add supression of SqlInjectionChecker.Ole Ostergaard2019-03-212-0/+6
| * | Add PostgreSQL specific implementation for includeIgnoreConflict.Ole Ostergaard2019-03-211-0/+12
| * | Add insertIgnoreConflict to Adapter and use it for for executing the file loc...Ole Ostergaard2019-03-213-11/+18
| |/
* | Merge pull request #14790 from nextcloud/bugfix/noid/fix-ocm/ocs-provider-set...Morris Jobke2019-03-211-2/+2
|\ \
| * | Fix setup checks for ocm/ocs-providerMorris Jobke2019-03-211-2/+2
| |/
* | Merge pull request #14786 from nextcloud/bugfix/noid/remove-unused-memberRoeland Jago Douma2019-03-212-14/+0
|\ \ | |/ |/|
| * Remove unused member "util"Joas Schilling2019-03-212-14/+0
|/
* 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
|\ \ \ | |/ / |/| |