summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Handle invalid ext storage backend to keep mount point visibleVincent Petry2017-09-045-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-nameMorris Jobke2017-09-041-4/+4
|\ | | | | Fix naming of user id in email meta data
| * Fix naming of user id in email meta dataJoas Schilling2017-09-011-4/+4
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #6221 from nextcloud/fav_share_api_fixMorris Jobke2017-09-043-19/+50
|\ \ | | | | | | Correctly format OCS response with favorites
| * | Correctly format OCS response with favoritesRoeland Jago Douma2017-08-293-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-controllerMorris Jobke2017-09-031-1/+2
|\ \ \ | | | | | | | | Rebuild SCSS files if frontend controller value changes
| * | | Rebuild SCSS files if frontend controller value changesJulius Härtl2017-09-031-1/+2
| | | | | | | | | | | | | | | | fixes #6271
* | | | Merge pull request #6341 from nextcloud/jquery-ui-scssMorris Jobke2017-09-037-61/+85
|\ \ \ \ | |/ / / |/| | | Use SCSS for jquery-ui-fixes
| * | | Fix font colorMorris Jobke2017-09-031-7/+6
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Remove unnecessary files for jquery-ui-fixesJulius Härtl2017-09-037-9/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Use SCSS for jquery-ui-fixesJulius Härtl2017-09-023-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-thresholdMorris Jobke2017-09-032-2/+2
|\ \ \ \ | | | | | | | | | | Theming change invertion threshold to 55%
| * | | | Change invertion threshold to 55%Julius Härtl2017-09-022-2/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* / / / [tx-robot] updated from transifexNextcloud bot2017-09-034-2/+38
|/ / /
* | / [tx-robot] updated from transifexNextcloud bot2017-09-0218-4/+106
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2017-09-0110-8/+40
| |
* | Merge pull request #6296 from nextcloud/improve_2faRoeland Jago Douma2017-08-313-21/+266
|\ \ | | | | | | Improve 2FA
| * | Improve 2FARoeland Jago Douma2017-08-293-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-emailsMorris Jobke2017-08-314-0/+38
|\ \ | | | | | | Implement metadata for email templates of remaining emails
| * | Implement metadata for email templates of remaining emailsMorris Jobke2017-08-304-0/+38
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-3144-12/+174
|/ /
* | Merge pull request #6216 from nextcloud/allow-to-sort-groups-by-nameMorris Jobke2017-08-302-10/+21
|\ \ | | | | | | Allow to sort groups by name
| * | Add side effect noteMorris Jobke2017-08-301-0/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Allow to sort groups by nameJoas Schilling2017-08-222-10/+19
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #6273 from nextcloud/move-multiple-filesRoeland Jago Douma2017-08-302-2/+40
|\ \ \ | | | | | | | | Move multiple files
| * | | Move multiple filesThomas Citharel2017-08-272-2/+40
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | Merge pull request #5994 from nextcloud/drone_postgres_71Morris Jobke2017-08-301-0/+12
|\ \ \ \ | | | | | | | | | | Add drone step for postgres with php 7.1
| * | | | Add drone step for postgres with php 7.1Roeland Jago Douma2017-08-301-0/+12
|/ / / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-30104-506/+596
| | | |
* | | | Merge pull request #6303 from nextcloud/background-imageMorris Jobke2017-08-2910-12/+20035
|\ \ \ \ | | | | | | | | | | Adjust background image to the one used on the website
| * | | | Set primary action button color to same as theming colorJan-Christoph Borchardt2017-08-293-6/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Update background image to the one used on the websiteJan-Christoph Borchardt2017-08-298-6/+20030
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #6301 from nextcloud/master-add-share-withMorris Jobke2017-08-292-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Add shareWith to email template metadata
| * | | | | Add shareWith to email template metadataMorris Jobke2017-08-292-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #6302 from nextcloud/comradekingu-patch-1Morris Jobke2017-08-291-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Spelling: Shortening and single please.
| * | | | | Spelling: Shortening and single please.Allan Nordhøy2017-08-291-2/+2
|/ / / / /
* | | | | Merge pull request #6293 from nextcloud/less-user-enumerationJoas Schilling2017-08-292-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Return the user id in case of an error
| * | | | | Return the user id in case of an errorJoas Schilling2017-08-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #4925 from nextcloud/error-stylingMorris Jobke2017-08-295-32/+36
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Improve design and wording of various error messages
| * | | | | Shorten text of untrusted domain errorJan-Christoph Borchardt2017-08-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | fix design of the track traceMorris Jobke2017-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Improve design of various error messagesJan-Christoph Borchardt2017-08-125-31/+35
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #6288 from nextcloud/master-6287Morris Jobke2017-08-292-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Allow the expiration date to be set to null
| * | | | | Allow the expiration date to be set to nullMorris Jobke2017-08-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #6283 from nextcloud/add-new-propfindBjörn Schießle2017-08-291-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | add propfind to detect encryption status
| * | | | | | add propfind to detect encryption statusBjoern Schiessle2017-08-281-1/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* / / / / / [tx-robot] updated from transifexNextcloud bot2017-08-2914-28/+52
|/ / / / /
* | / / / [tx-robot] updated from transifexNextcloud bot2017-08-2812-162/+178
| |/ / / |/| | |
* | | | Merge pull request #6245 from nextcloud/postgresRoeland Jago Douma2017-08-271-1/+1
|\ \ \ \ | | | | | | | | | | [Drone] Properly quote "7.0" in drone so it actually runs tests
| * | | | Properly quote 7.0 so drone handles it rightRoeland Jago Douma2017-08-261-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>