summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2021-03-23376-756/+828
* Merge pull request #26198 from nextcloud/unified-search-nodeMorris Jobke2021-03-2211-229/+452
|\
| * use node search api for legacy file search endpointRobin Appelman2021-03-193-23/+33
| * pass order from unified search to file searchRobin Appelman2021-03-191-1/+5
| * handle ordering in folder searchRobin Appelman2021-03-194-55/+98
| * folder filtering in sqlRobin Appelman2021-03-192-17/+20
| * cleanup fileinfo creationRobin Appelman2021-03-192-69/+46
| * formatRobin Appelman2021-03-181-1/+0
| * handle limit and offset in folder file searchRobin Appelman2021-03-182-47/+208
| * only require user to be set in a query that handles tagsRobin Appelman2021-03-184-25/+24
| * unify handling of Folder::search methods into "new" query objectsRobin Appelman2021-03-181-45/+61
| * use "newer" node search api directly in unified searchRobin Appelman2021-03-181-31/+42
* | Merge pull request #25498 from Worteks/feat-federatedfilesharing-loggingMorris Jobke2021-03-223-0/+39
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into feat-federatedfilesharing...Samuel2021-02-16131-2804/+2062
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into feat-federatedfilesharing...Samuel2021-02-114-3/+3
| |\ \ \
| * | | | fix(tests)Samuel2021-02-111-0/+7
| * | | | Merge remote-tracking branch 'upstream/master' into feat-federatedfilesharing...Samuel2021-02-11219-1314/+5347
| |\ \ \ \
| * | | | | fix(sahre20): missing ILogger param instantiating NotificationsSamuel2021-02-091-0/+1
| * | | | | fix(no_unused_imports)Samuel2021-02-091-1/+0
| * | | | | fix(php-cs)Samuel2021-02-091-17/+0
| * | | | | fix(misc)Samuel2021-02-091-5/+7
| * | | | | fix(php-cs)Samuel2021-02-091-4/+7
| * | | | | fix(logger): use logger from constructor argumentsSamuel2021-02-091-1/+14
| * | | | | fix(pebkac): missing `use OC`Samuel2021-02-081-0/+1
| * | | | | fix(logger): set logger in constructorSamuel2021-02-081-5/+10
| * | | | | fix(php-cs): indentation / elseif, maybe braces?Samuel2021-02-051-13/+18
| * | | | | feat(federatedfilesharing): log errors, as suggested by @maxbesSamuel2021-02-051-0/+20
* | | | | | Merge pull request #25529 from nextcloud/fix-non-lgc-glyphs-in-avatars-and-tx...Morris Jobke2021-03-2210-0/+584
|\ \ \ \ \ \
| * | | | | | Add OCC command to reset rendered textsDaniel Calviño Sánchez2021-03-015-0/+210
| * | | | | | Include additional scripts in Noto fontsDaniel Calviño Sánchez2021-03-015-0/+374
* | | | | | | Merge pull request #26149 from nextcloud/fix/ownership-transfer-ready-encryptionRoeland Jago Douma2021-03-221-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Only perform login check during ownership transfer for encryptionChristoph Wurst2021-03-191-2/+5
* | | | | | | | Merge pull request #26247 from nextcloud/bugfix/noid/product-name-on-updaterRoeland Jago Douma2021-03-222-8/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't hardcode the product name to Nextcloud but use the theming valueJoas Schilling2021-03-221-1/+6
| * | | | | | | | Use the product name in the updater screenJoas Schilling2021-03-221-7/+8
|/ / / / / / / /
* | | | | | | | Merge pull request #26231 from nextcloud/Valdnet-patch-6John Molakvoæ2021-03-221-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | l10n: Add changes to text string for userValdnet2021-03-221-1/+1
| * | | | | | | | l10n: Add word user in ShareByMailProvider.phpValdnet2021-03-201-1/+1
* | | | | | | | | Merge pull request #26223 from nextcloud/dependabot/npm_and_yarn/mocha-8.3.2Roeland Jago Douma2021-03-222-16/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump mocha from 8.3.0 to 8.3.2dependabot-preview[bot]2021-03-202-16/+16
* | | | | | | | | | Merge pull request #24364 from nextcloud/fix/sharing-mail-link-parityRoeland Jago Douma2021-03-2222-229/+394
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix sharebymail testsJohn Molakvoæ (skjnldsv)2021-03-223-76/+92
| * | | | | | | | | | Remove duplicated query for email sharesDaniel Calviño Sánchez2021-03-226-102/+100
| * | | | | | | | | | Fix testsJohn Molakvoæ (skjnldsv)2021-03-222-19/+41
| * | | | | | | | | | Sharing link & mail parityJohn Molakvoæ (skjnldsv)2021-03-2213-84/+102
| * | | | | | | | | | Clear the input after adding a new shareJohn Molakvoæ (skjnldsv)2021-03-221-3/+6
| * | | | | | | | | | Handle enforced password for mail shares in the WebUIJohn Molakvoæ (skjnldsv)2021-03-222-6/+60
| * | | | | | | | | | Extract GeneratePassword function to its own fileJohn Molakvoæ (skjnldsv)2021-03-222-35/+60
| * | | | | | | | | | Add labels to mail sharesJohn Molakvoæ (skjnldsv)2021-03-224-10/+39
|/ / / / / / / / / /
* | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2021-03-2236-146/+300