| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix federation icon menu and container paddings. | Marin Treselj | 2017-08-04 | 2 | -48/+11 |
| | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| * | Reintroduce a more compact grid. | Marin Treselj | 2017-08-03 | 1 | -0/+5 |
| | | | | | | | Overrides core `.section` values. Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| * | Clean up HTML structure, fix labels. | Marin Treselj | 2017-08-03 | 2 | -60/+26 |
| | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| * | Merge branch 'clean-settings-layout' of ↵ | Andreas Jacobsen | 2017-07-24 | 672 | -8160/+15570 |
| |\ | | | | | | | https://github.com/andreasjacobsen93/server into clean-settings-layout | ||||
| | * | Merge branch 'master' into clean-settings-layout | Andreas Jacobsen | 2017-07-15 | 672 | -8160/+15570 |
| | |\ | |||||
| | | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-15 | 158 | -4126/+4134 |
| | | | | |||||
| | | * | Merge pull request #5724 from nextcloud/fix-drone | Morris Jobke | 2017-07-14 | 4 | -19/+25 |
| | | |\ | | | | | | | | | Fix drone | ||||
| | | | * | Temporarily disable acceptance and object storage tests | Morris Jobke | 2017-07-14 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | | | * | Fix drone | Morris Jobke | 2017-07-14 | 4 | -9/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix service container host name check current folder fix redis for integration test Fix more hostnames Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | | * | | Merge pull request #5699 from nextcloud/bruteforce_capability | Lukas Reschke | 2017-07-14 | 5 | -0/+125 |
| | | |\ \ | | | | | | | | | | | Add bruteforce capabilities | ||||
| | | | * | | Update autoloader | Roeland Jago Douma | 2017-07-13 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | | | * | | Add bruteforce capabilities | Roeland Jago Douma | 2017-07-13 | 3 | -0/+123 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | | * | | | Merge pull request #5725 from nextcloud/remove-legacy-files | Björn Schießle | 2017-07-14 | 1 | -409/+0 |
| | | |\ \ \ | | | |_|/ | | |/| | | this template file is no longer needed | ||||
| | | | * | | this template file is no longer needed | Bjoern Schiessle | 2017-07-14 | 1 | -409/+0 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | since https://github.com/nextcloud/server/pull/4890 the templates are located at settings/templates/settings/personal/ Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | | * | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-14 | 30 | -258/+406 |
| | | | | | |||||
| | | * | | Merge pull request #5708 from nextcloud/nested-permissions-mask | Morris Jobke | 2017-07-13 | 2 | -1/+16 |
| | | |\ \ | | | | | | | | | | | Fix scan permissions with nested permissions masks | ||||
| | | | * | | Fix scan permissions with nested permissions masks | Robin Appelman | 2017-07-13 | 2 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| | | * | | | Merge pull request #5715 from nextcloud/master-5655 | Morris Jobke | 2017-07-13 | 2 | -25/+104 |
| | | |\ \ \ | | | | | | | | | | | | | Fixed repair step | ||||
| | | | * | | | chunk getting invalid paths and reuse queries | Robin Appelman | 2017-07-13 | 2 | -27/+99 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| | | | * | | | use a generator instead of fetching all rows at once | Robin Appelman | 2017-07-13 | 1 | -2/+9 |
| | | | | |/ | | | |/| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| | | * | | | Merge pull request #5070 from nextcloud/theming-vs-themes | Joas Schilling | 2017-07-13 | 5 | -42/+77 |
| | | |\ \ \ | | | |_|/ | | |/| | | Prefer custom theme over the theming app | ||||
| | | | * | | Prefer custom theme over theming app | Julius Härtl | 2017-07-12 | 5 | -42/+77 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| | | * | | | Merge pull request #5695 from nextcloud/dont-error-when-the-table-doesnt-exist | Roeland Jago Douma | 2017-07-13 | 1 | -0/+3 |
| | | |\ \ \ | | | |_|/ | | |/| | | Don't throw an error when the table doesn't exist | ||||
| | | | * | | Don't throw an error when the table doesn't exist | Joas Schilling | 2017-07-12 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Merge pull request #5703 from nextcloud/autoloader_fix | Morris Jobke | 2017-07-13 | 2 | -0/+2 |
| | | |\ \ \ | | | | | | | | | | | | | Fix autoloader | ||||
| | | | * | | | Fix autoloader | Roeland Jago Douma | 2017-07-13 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | | * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-13 | 56 | -270/+376 |
| | | |/ / / | |||||
| | | * | | | Merge pull request #4984 from nextcloud/tmpcertfile | Roeland Jago Douma | 2017-07-12 | 3 | -7/+45 |
| | | |\ \ \ | | | | | | | | | | | | | Create a temp certfile | ||||
| | | | * | | | Write cert bundle to tmp file first | Roeland Jago Douma | 2017-07-12 | 3 | -7/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | | * | | | | Merge pull request #5690 from nextcloud/files-checker | Lukas Reschke | 2017-07-12 | 2 | -0/+112 |
| | | |\ \ \ \ | | | |/ / / | | |/| | | | Add test to check if new files are added to the root of the repository | ||||
| | | | * | | | Add test to check if new files are added to the root of the repository | Morris Jobke | 2017-07-12 | 2 | -0/+112 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | | * | | | | Merge pull request #5567 from nextcloud/public-capabilities | Roeland Jago Douma | 2017-07-12 | 8 | -6/+112 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Public capabilities API | ||||
| | | | * | | | | Update autoloader | Morris Jobke | 2017-07-04 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | | | * | | | | Simplify if condition for public capabilities | Julius Härtl | 2017-06-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| | | | * | | | | Add tests for public capabilties | Julius Härtl | 2017-06-30 | 2 | -0/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| | | | * | | | | Expose theming capabilities to public | Julius Härtl | 2017-06-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| | | | * | | | | Add public capabilities API | Julius Härtl | 2017-06-30 | 3 | -4/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| | | * | | | | | Merge pull request #5685 from nextcloud/jail-propagator | Roeland Jago Douma | 2017-07-12 | 3 | -26/+27 |
| | | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | Fix propagating changes within jail wrapper | ||||
| | | | * | | | | Fix propagating changes within jail wrapper | Robin Appelman | 2017-07-11 | 3 | -26/+27 |
| | | | | |/ / | | | |/| | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| | | * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-12 | 154 | -1636/+1896 |
| | | | | | | | |||||
| | | * | | | | Merge pull request #5657 from nextcloud/select-error-text | Lukas Reschke | 2017-07-11 | 1 | -0/+4 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | [Small] warning is now selecteable | ||||
| | | | * | | | | warning is now selecteable | Maxence Lange | 2017-07-08 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com> | ||||
| | | * | | | | | Merge pull request #5681 from nextcloud/upstream-fix-circles | Morris Jobke | 2017-07-11 | 4 | -9/+15 |
| | | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | upstream fix circles | ||||
| | | | * | | | | upstream | Maxence Lange | 2017-07-11 | 4 | -9/+15 |
| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com> | ||||
| | | * | | | | | Merge pull request #5672 from nextcloud/upload-hidden-filelist | Morris Jobke | 2017-07-11 | 2 | -9/+13 |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | properly block file upload to non-active filelist | ||||
| | | | * | | | | fix test | Robin Appelman | 2017-07-11 | 1 | -9/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| | | | * | | | | properly block file upload to non-active filelist | Robin Appelman | 2017-07-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| | | * | | | | | Merge pull request #5662 from nextcloud/comradekingu-patch-1 | Morris Jobke | 2017-07-11 | 1 | -5/+5 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Spelling: No shouting at user, and Facebook | ||||
| | | | * | | | | | Spelling: No shouting at user, and Facebook | Allan Nordhøy | 2017-07-09 | 1 | -5/+5 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge pull request #5656 from ↵ | Morris Jobke | 2017-07-10 | 9 | -41/+394 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-unselecting-items-on-multi-select-dropdowns Fix unselecting items on multi select dropdowns | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |