summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8596 from nextcloud/bugfix/8454/sharee-email-matches-not-...Morris Jobke2018-03-061-4/+9
|\
| * Add the users result only when non empty so tests stay the sameJoas Schilling2018-03-021-1/+3
| * Also array_slice wide email matches of local usersJoas Schilling2018-03-011-4/+7
* | Merge pull request #7419 from Abijeet/feature-7175Morris Jobke2018-03-0613-52/+140
|\ \
| * | reuse query builderRobin Appelman2018-01-124-11/+16
| * | refactor user searchingRobin Appelman2017-12-209-52/+101
| * | Added newline to end of htaccess fileAbijeet2017-12-181-1/+1
| * | Adds search by email function on the users screen.Abijeet2017-12-163-4/+38
* | | Merge pull request #8579 from nextcloud/feature/2692/merge-can-i-updateMorris Jobke2018-03-069-18/+277
|\ \ \
| * | | Fix the cursor on the iconJoas Schilling2018-03-061-1/+2
| * | | Add a little arrow to indicate that the list can be openedJoas Schilling2018-03-062-3/+16
| * | | Fix the available listJoas Schilling2018-03-061-1/+0
| * | | Show a loading message while we determinate the status of the updatesJoas Schilling2018-03-062-1/+7
| * | | Check for app updates when there is a new major version availableJoas Schilling2018-02-286-16/+253
| * | | Ignore dev filesJoas Schilling2018-02-281-0/+1
| * | | Also allow to specify the cache file nameJoas Schilling2018-02-282-2/+4
* | | | Merge pull request #5833 from nextcloud/fix_uninstall_rep_stepMorris Jobke2018-03-067-43/+13
|\ \ \ \
| * | | | Remove unused and outdated hookMorris Jobke2018-03-061-3/+0
| * | | | Remove unused $enableAppsCache in OC_AppTobia De Koninck2018-03-061-13/+0
| * | | | Remove OC_App::disable methodTobia De Koninck2018-03-065-19/+5
| * | | | Run repair steps on uninstall in all casesTobia De Koninck2018-03-063-11/+11
* | | | | Merge pull request #8666 from nextcloud/strict_idproofMorris Jobke2018-03-063-10/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make \OC\Security\IdentityProof strictRoeland Jago Douma2018-03-053-10/+13
* | | | | [tx-robot] updated from transifexNextcloud bot2018-03-06258-488/+560
* | | | | Merge pull request #8634 from nextcloud/ldap-no-empty-namesRoeland Jago Douma2018-03-052-6/+59
|\ \ \ \ \
| * | | | | treat iconv issuesArthur Schiwon2018-03-052-5/+13
| * | | | | typo + phpdocArthur Schiwon2018-03-051-1/+2
| * | | | | do not create empty userid when attribute does not have allowed charsArthur Schiwon2018-03-022-3/+47
* | | | | | Merge pull request #8664 from nextcloud/bugfix/noid/add-missing-settings-page...Roeland Jago Douma2018-03-053-8/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Set the correct active navigation entryJoas Schilling2018-03-053-8/+5
* | | | | | Merge pull request #8659 from nextcloud/csrf_token_strictRoeland Jago Douma2018-03-055-14/+17
|\ \ \ \ \ \
| * | | | | | Remove testcaseRoeland Jago Douma2018-03-051-1/+0
| * | | | | | Make \OC\Security\CSRF strictRoeland Jago Douma2018-03-054-13/+17
* | | | | | | Merge pull request #8650 from nextcloud/fix-ie11-datepicker-displayMorris Jobke2018-03-051-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Fixed date/time picker on IE11John Molakvoæ (skjnldsv)2018-03-011-2/+5
* | | | | | | | Merge pull request #8661 from nextcloud/strict_security_cspMorris Jobke2018-03-053-30/+33
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Make OC\Security\CSP strictRoeland Jago Douma2018-03-053-30/+33
|/ / / / / / /
* | | | | | | Merge pull request #8630 from nextcloud/ldap-cachekey-sha256Joas Schilling2018-03-052-2/+2
|\ \ \ \ \ \ \
| * | | | | | | use hash algo that's robust against collisionsArthur Schiwon2018-03-022-2/+2
* | | | | | | | Merge pull request #8601 from nextcloud/theming-fix-background-colorMorris Jobke2018-03-051-7/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Remove to restrict check for background image/colorJulius Härtl2018-03-011-7/+5
* | | | | | | | Merge pull request #8603 from nextcloud/enc-cleanupMorris Jobke2018-03-0517-1485/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | this was a migration step to ownCloud 8.0 to restructure the encryption folde...Bjoern Schiessle2018-03-0217-1485/+8
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #8590 from nextcloud/redirect-to-download-after-shareRoeland Jago Douma2018-03-055-14/+91
|\ \ \ \ \ \ \ \
| * | | | | | | | fixup! fixup! Sharing: redirect to download after authentification if requestedJohn Molakvoæ (skjnldsv)2018-03-011-1/+1
| * | | | | | | | fixup! Sharing: redirect to download after authentification if requestedJohn Molakvoæ (skjnldsv)2018-03-011-1/+1
| * | | | | | | | fixup! Acceptance fixJohn Molakvoæ (skjnldsv)2018-03-011-1/+2
| * | | | | | | | Acceptance fixJohn Molakvoæ (skjnldsv)2018-03-012-1/+37
| * | | | | | | | fixup! Fixed testsJohn Molakvoæ (skjnldsv)2018-02-281-2/+32
| * | | | | | | | Fixed testsJohn Molakvoæ (skjnldsv)2018-02-282-6/+6