summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14385 from nextcloud/feature/noid/add-event-to-allow-to-f...Joas Schilling2019-02-265-8/+134
|\
| * Add an event to the Autocomplete Controller to allow to filter the resultsJoas Schilling2019-02-265-8/+134
* | Merge pull request #14342 from nextcloud/bugfix/13911-occ-files-scan-elapsedt...Morris Jobke2019-02-262-8/+6
|\ \
| * | Fix occ files:scan-app-data elapsed timeJoel S2019-02-222-5/+4
| * | Fix-13911-occ-files-scan-elapsed-timeJoel S2019-02-221-4/+3
* | | Merge pull request #14346 from tomaski/masterMorris Jobke2019-02-261-0/+1
|\ \ \
| * | | changed order of methodsTomasz Paluszkiewicz2019-02-261-1/+1
| * | | fix(EMailTemplate): malformed HTML in some casesTomasz Paluszkiewicz2019-02-241-0/+1
| |/ /
* | | Merge pull request #14251 from tomasz-grobelny/upload_reliability_improvementsRoeland Jago Douma2019-02-263-68/+120
|\ \ \
| * | | Fix unit testsTomasz Grobelny2019-02-201-49/+95
| * | | Limit number of simultaneous MKCOL requests to server to increase upload reli...Tomasz Grobelny2019-02-162-19/+25
* | | | Merge pull request #14227 from nextcloud/enh/comments_to_webpackRoeland Jago Douma2019-02-2629-29/+69
|\ \ \ \
| * | | | Move comments to webpackRoeland Jago Douma2019-02-2629-29/+69
| | |_|/ | |/| |
* / | | [tx-robot] updated from transifexNextcloud bot2019-02-266-0/+48
|/ / /
* | | Merge pull request #14322 from nextcloud/users-management-enhancementsRoeland Jago Douma2019-02-269-24/+4077
|\ \ \
| * | | Compile assetsRoeland Jago Douma2019-02-259-9/+9
| * | | Merge remote-tracking branch 'origin/master' into users-management-enhancementsRoeland Jago Douma2019-02-25163-1557/+3501
| |\ \ \
| * | | | Focus new group input on showJohn Molakvoæ (skjnldsv)2019-02-211-0/+4
| * | | | Fix app-navigation loadingJohn Molakvoæ (skjnldsv)2019-02-211-4/+1
| * | | | update settings buildJohn Molakvoæ (skjnldsv)2019-02-2115-23/+4048
| * | | | Fix group form reset after new userJohn Molakvoæ (skjnldsv)2019-02-211-1/+3
| * | | | Automatically select newly created groupJohn Molakvoæ (skjnldsv)2019-02-211-0/+6
| * | | | Fix infiniteLoading state after user add/removeJohn Molakvoæ (skjnldsv)2019-02-211-4/+23
* | | | | [tx-robot] updated from transifexNextcloud bot2019-02-2616-0/+16
* | | | | Merge pull request #14198 from nextcloud/bugfix/8647-exclude-file-name-patternsMorris Jobke2019-02-262-8/+123
|\ \ \ \ \
| * | | | | Use more precise regexDaniel Kesselberg2019-02-142-3/+3
| * | | | | Apply code style fixes from owncloud, revert regexDaniel Kesselberg2019-02-142-30/+35
| * | | | | Fix test caseRomain Rivière2019-02-141-2/+2
| * | | | | Exclude file name patterns; ignore gentoo webapp filesRomain Rivière2019-02-142-7/+117
* | | | | | Merge pull request #14377 from nextcloud/fix/noid/typoMorris Jobke2019-02-251-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix typo in info log for autoconfigMorris Jobke2019-02-251-1/+1
* | | | | | Merge pull request #14314 from nextcloud/enh/save_queryMorris Jobke2019-02-251-1/+2
|\ \ \ \ \ \
| * | | | | | No need to check 2fa state on apptoken loginsRoeland Jago Douma2019-02-201-1/+2
* | | | | | | Merge pull request #14347 from nextcloud/hide-collaboration-groupsRoeland Jago Douma2019-02-257-1/+79
|\ \ \ \ \ \ \
| * | | | | | | Update autoloader filesMorris Jobke2019-02-252-0/+2
| * | | | | | | allow group backends to mark that a group should now be shown in search dialogsRobin Appelman2019-02-255-1/+77
* | | | | | | | Merge pull request #14025 from nextcloud/fix/authtoken_idx_lengthMorris Jobke2019-02-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix authtoken index lengthRoeland Jago Douma2019-02-051-1/+1
* | | | | | | | | Merge pull request #13514 from nextcloud/fix-public-grid-toggleMorris Jobke2019-02-252-7/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix grid toggle button on public pageJohn Molakvoæ (skjnldsv)2019-02-212-7/+11
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #14365 from nextcloud/enh/npm-makefileMorris Jobke2019-02-253-9/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Exclude Makefile from checkMorris Jobke2019-02-251-0/+1
| * | | | | | | Makefile to root folderRoeland Jago Douma2019-02-242-9/+2
* | | | | | | | Merge pull request #14369 from nextcloud/update-cabundleMorris Jobke2019-02-251-1107/+465
|\ \ \ \ \ \ \ \
| * | | | | | | | Use latest ca-bundle.crt from https://curl.haxx.se/docs/caextract.htmlDaniel Kesselberg2019-02-251-1107/+465
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #14325 from nextcloud/fix/always_query_lookup_server_in_gs...Roeland Jago Douma2019-02-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Always query lookup server in GS modeRoeland Jago Douma2019-02-211-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #14366 from nextcloud/3rdparty/symfony/4.2.3Roeland Jago Douma2019-02-251-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | [3rdparty] Bump symfony to 4.2.3Roeland Jago Douma2019-02-251-0/+0
* | | | | | | | | Merge pull request #14180 from nextcloud/feature/sharing-recommendationsRoeland Jago Douma2019-02-256-4/+471
|\ \ \ \ \ \ \ \ \