summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3526 from nextcloud/token-save-scopeRoeland Jago Douma2017-04-057-92/+276
|\
| * Add integration tests for token authLukas Reschke2017-04-052-36/+158
| * Save the scope of an auth token in the sessionRobin Appelman2017-04-055-56/+118
* | Merge pull request #3781 from nextcloud/fac-56-log-spam-with-external-storagesRoeland Jago Douma2017-04-051-5/+13
|\ \
| * | Also add the root of external storages to the file id listJoas Schilling2017-03-301-5/+13
* | | Merge pull request #4215 from nextcloud/issue-templateJos Poortvliet2017-04-051-1/+2
|\ \ \ | |_|/ |/| |
| * | Rename config sectionJoas Schilling2017-04-051-1/+2
* | | Merge pull request #4123 from nextcloud/allow-password-reset-with-emailRoeland Jago Douma2017-04-052-23/+101
|\ \ \
| * | | Allow to reset the password with the email as an inputJoas Schilling2017-03-282-23/+101
* | | | Merge pull request #3741 from nextcloud/user-settings-designRoeland Jago Douma2017-04-052-14/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | proper padding for checkboxes in app-settingsJan-Christoph Borchardt2017-04-041-1/+16
| * | | correct sorting of user management settings, wordingJan-Christoph Borchardt2017-04-041-13/+13
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-0540-82/+550
|/ / /
* | | Merge pull request #4138 from nextcloud/resources_match_fullidMorris Jobke2017-04-041-1/+7
|\ \ \
| * | | Match slashes in ../{id} resource routesRoeland Jago Douma2017-04-041-1/+7
* | | | Merge pull request #4192 from nextcloud/fix/custom-default-app-redirect-2fa-s...Morris Jobke2017-04-041-2/+2
|\ \ \ \
| * | | | Redirect to 2FA selection screenChristoph Wurst2017-04-031-2/+2
* | | | | Merge pull request #4204 from nextcloud/append-fixes-swiftRoeland Jago Douma2017-04-041-7/+4
|\ \ \ \ \
| * | | | | fix fseek against string not resource by removing append supportArthur Schiwon2017-04-041-7/+4
|/ / / / /
* | | | | Merge pull request #3310 from duritong/patch-1Morris Jobke2017-04-041-1/+3
|\ \ \ \ \
| * | | | | only chmod logfile if necessaryduritong2017-01-291-1/+3
* | | | | | Merge pull request #4071 from nextcloud/issue-173-database-conversion-failureJoas Schilling2017-04-041-1/+30
|\ \ \ \ \ \
| * | | | | | Use false because null crashes the cacheJoas Schilling2017-03-261-3/+9
| * | | | | | Make sure blob columns are correctly converted as parametersJoas Schilling2017-03-261-1/+24
* | | | | | | Merge pull request #2095 from nextcloud/bruteforcesetttingsLukas Reschke2017-04-046-4/+160
|\ \ \ \ \ \ \
| * | | | | | | Fix testsRoeland Jago Douma2017-04-047-20/+0
| * | | | | | | Move app to own repoRoeland Jago Douma2017-04-0213-876/+0
| * | | | | | | Fixed layout of bruteforcesettingsMorris Jobke2017-04-025-9/+27
| * | | | | | | Fix appRoeland Jago Douma2017-04-021-1/+1
| * | | | | | | Update App Manager testRoeland Jago Douma2017-04-021-0/+2
| * | | | | | | App is always enabledRoeland Jago Douma2017-04-022-1/+4
| * | | | | | | Respect bruteforce settings in the ThrottlerRoeland Jago Douma2017-04-022-1/+154
| * | | | | | | Adds security section to the admin pageRoeland Jago Douma2017-04-022-0/+3
| * | | | | | | Initial commit of the bruteforcesettings appRoeland Jago Douma2017-04-0217-1/+874
* | | | | | | | Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12Roeland Jago Douma2017-04-042-18/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Use master key for public links as wellVincent Petry2017-03-242-23/+35
| * | | | | | | | Add tests for null userVincent Petry2017-03-241-1/+5
| * | | | | | | | Fix public link for master keyVincent Petry2017-03-241-1/+1
* | | | | | | | | Merge pull request #4093 from nextcloud/endorse-password-protectionRoeland Jago Douma2017-04-046-7/+45
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix unit testsBjoern Schiessle2017-04-031-2/+14
| * | | | | | | | | let the user set an empty password for share linkTimo Benk2017-04-031-3/+21
| * | | | | | | | | endorseLinkPassword changed to enableLinkPasswordByDefaultTimo Benk2017-04-032-2/+2
| * | | | | | | | | feature endorse password for share linksTimo Benk2017-04-032-1/+2
| * | | | | | | | | feature endorse password for share linksBjoern Schiessle2017-04-033-1/+8
* | | | | | | | | | Merge pull request #4147 from nextcloud/fix_3890Roeland Jago Douma2017-04-042-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't try to parse empty body if there is no bodyRoeland Jago Douma2017-04-042-1/+6
* | | | | | | | | | | Merge pull request #3896 from nextcloud/xx621998xx-newbranchRoeland Jago Douma2017-04-041-1/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Some more hardeningJoas Schilling2017-04-041-6/+7
| * | | | | | | | | | file-upload.js modified : Remaining upload time correctedSarthikaDhawan2017-04-041-1/+10
|/ / / / / / / / / /
* / / / / / / / / / [tx-robot] updated from transifexNextcloud bot2017-04-0434-38/+962
|/ / / / / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 01:56:14 +0000