Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Handle invalid ext storage backend to keep mount point visible | Vincent Petry | 2017-09-04 | 5 | -2/+153 |
| | | | | | | | | Keep mount point visible and also ext storage config visible when dealing with configs relating to storage backends or auth mechanisms that were provided by an app that is currently disabled. Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | Merge pull request #6334 from nextcloud/fix-mixup-of-id-and-name | Morris Jobke | 2017-09-04 | 1 | -4/+4 |
|\ | | | | | Fix naming of user id in email meta data | ||||
| * | Fix naming of user id in email meta data | Joas Schilling | 2017-09-01 | 1 | -4/+4 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | Merge pull request #6221 from nextcloud/fav_share_api_fix | Morris Jobke | 2017-09-04 | 3 | -19/+50 |
|\ \ | | | | | | | Correctly format OCS response with favorites | ||||
| * | | Correctly format OCS response with favorites | Roeland Jago Douma | 2017-08-29 | 3 | -19/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The helper funtion did not handle the response correctly and basically only returned the last share with tags. This is a simple rewrite. That is still understandable. Loops maybe more than strictly required. But preformance is not the issue here. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | Merge pull request #6352 from nextcloud/scss-rebuild-frontend-controller | Morris Jobke | 2017-09-03 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Rebuild SCSS files if frontend controller value changes | ||||
| * | | | Rebuild SCSS files if frontend controller value changes | Julius Härtl | 2017-09-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | fixes #6271 | ||||
* | | | | Merge pull request #6341 from nextcloud/jquery-ui-scss | Morris Jobke | 2017-09-03 | 7 | -61/+85 |
|\ \ \ \ | |/ / / |/| | | | Use SCSS for jquery-ui-fixes | ||||
| * | | | Fix font color | Morris Jobke | 2017-09-03 | 1 | -7/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | Remove unnecessary files for jquery-ui-fixes | Julius Härtl | 2017-09-03 | 7 | -9/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | | Use SCSS for jquery-ui-fixes | Julius Härtl | 2017-09-02 | 3 | -55/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move to SCSS so we use theming color values - Apply tab style from files sidebar to ui-tabs (e.g. in user_ldap) - Move select style to the jquery-ui-fixes file and make those only apply to ui-autocomplete elements Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* | | | | Merge pull request #6344 from nextcloud/theming-invert-threshold | Morris Jobke | 2017-09-03 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Theming change invertion threshold to 55% | ||||
| * | | | | Change invertion threshold to 55% | Julius Härtl | 2017-09-02 | 2 | -2/+2 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* / / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-09-03 | 4 | -2/+38 |
|/ / / | |||||
* | / | [tx-robot] updated from transifex | Nextcloud bot | 2017-09-02 | 18 | -4/+106 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-09-01 | 10 | -8/+40 |
| | | |||||
* | | Merge pull request #6296 from nextcloud/improve_2fa | Roeland Jago Douma | 2017-08-31 | 3 | -21/+266 |
|\ \ | | | | | | | Improve 2FA | ||||
| * | | Improve 2FA | Roeland Jago Douma | 2017-08-29 | 3 | -21/+266 |
| |/ | | | | | | | | | | | | | | | * Store the auth state in the session so we don't have to query it every time. * Added some tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #6315 from nextcloud/metadata-for-all-emails | Morris Jobke | 2017-08-31 | 4 | -0/+38 |
|\ \ | | | | | | | Implement metadata for email templates of remaining emails | ||||
| * | | Implement metadata for email templates of remaining emails | Morris Jobke | 2017-08-30 | 4 | -0/+38 |
| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-31 | 44 | -12/+174 |
|/ / | |||||
* | | Merge pull request #6216 from nextcloud/allow-to-sort-groups-by-name | Morris Jobke | 2017-08-30 | 2 | -10/+21 |
|\ \ | | | | | | | Allow to sort groups by name | ||||
| * | | Add side effect note | Morris Jobke | 2017-08-30 | 1 | -0/+2 |
| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | Allow to sort groups by name | Joas Schilling | 2017-08-22 | 2 | -10/+19 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #6273 from nextcloud/move-multiple-files | Roeland Jago Douma | 2017-08-30 | 2 | -2/+40 |
|\ \ \ | | | | | | | | | Move multiple files | ||||
| * | | | Move multiple files | Thomas Citharel | 2017-08-27 | 2 | -2/+40 |
| | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | | | Merge pull request #5994 from nextcloud/drone_postgres_71 | Morris Jobke | 2017-08-30 | 1 | -0/+12 |
|\ \ \ \ | | | | | | | | | | | Add drone step for postgres with php 7.1 | ||||
| * | | | | Add drone step for postgres with php 7.1 | Roeland Jago Douma | 2017-08-30 | 1 | -0/+12 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-30 | 104 | -506/+596 |
| | | | | |||||
* | | | | Merge pull request #6303 from nextcloud/background-image | Morris Jobke | 2017-08-29 | 10 | -12/+20035 |
|\ \ \ \ | | | | | | | | | | | Adjust background image to the one used on the website | ||||
| * | | | | Set primary action button color to same as theming color | Jan-Christoph Borchardt | 2017-08-29 | 3 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | | Update background image to the one used on the website | Jan-Christoph Borchardt | 2017-08-29 | 8 | -6/+20030 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | | | Merge pull request #6301 from nextcloud/master-add-share-with | Morris Jobke | 2017-08-29 | 2 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Add shareWith to email template metadata | ||||
| * | | | | | Add shareWith to email template metadata | Morris Jobke | 2017-08-29 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | | | Merge pull request #6302 from nextcloud/comradekingu-patch-1 | Morris Jobke | 2017-08-29 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Spelling: Shortening and single please. | ||||
| * | | | | | Spelling: Shortening and single please. | Allan Nordhøy | 2017-08-29 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #6293 from nextcloud/less-user-enumeration | Joas Schilling | 2017-08-29 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Return the user id in case of an error | ||||
| * | | | | | Return the user id in case of an error | Joas Schilling | 2017-08-29 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | | Merge pull request #4925 from nextcloud/error-styling | Morris Jobke | 2017-08-29 | 5 | -32/+36 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Improve design and wording of various error messages | ||||
| * | | | | | Shorten text of untrusted domain error | Jan-Christoph Borchardt | 2017-08-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | | | fix design of the track trace | Morris Jobke | 2017-08-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | Improve design of various error messages | Jan-Christoph Borchardt | 2017-08-12 | 5 | -31/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | | | | Merge pull request #6288 from nextcloud/master-6287 | Morris Jobke | 2017-08-29 | 2 | -3/+3 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Allow the expiration date to be set to null | ||||
| * | | | | | Allow the expiration date to be set to null | Morris Jobke | 2017-08-28 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | | | Merge pull request #6283 from nextcloud/add-new-propfind | Björn Schießle | 2017-08-29 | 1 | -1/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | add propfind to detect encryption status | ||||
| * | | | | | | add propfind to detect encryption status | Bjoern Schiessle | 2017-08-28 | 1 | -1/+7 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* / / / / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-29 | 14 | -28/+52 |
|/ / / / / | |||||
* | / / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-28 | 12 | -162/+178 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #6245 from nextcloud/postgres | Roeland Jago Douma | 2017-08-27 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | [Drone] Properly quote "7.0" in drone so it actually runs tests | ||||
| * | | | | Properly quote 7.0 so drone handles it right | Roeland Jago Douma | 2017-08-26 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> |