summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4597 from nextcloud/tooltips-invertMorris Jobke2017-04-291-30/+31
|\ | | | | Invert tooltip color to white, fix #4563
| * Invert tooltip color to white, fix #4563Jan-Christoph Borchardt2017-04-291-30/+31
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | optimize SVGsMorris Jobke2017-04-292-20/+4
| |
* | Implemented visual feedback if a user is disabled in admin user menu.Thomas Pulzer2017-04-292-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented visuals for enabling/disabling user from admin user list. Added the controller functions for enabling/disabling a user. Added the route for changing user status (enabled/disabled) and added an additional route handler in the user controller. Finished the visuals to reflect current user status and changed user status respectively. Changed the single icon for enabling/disabling a user into a menu where deletion and state toggling of a user is selectable. Added displaying of disabled user count. Improved style of user action menu. Added proper counting of disabled users. Removed visual indicator for disabled users. Moved pseudo-group detection for disabled users from frontend to the controller. Changed units for newly introduced css values from em to px. Removed unnecessary png and optimized svg with scour. Changed the userlist template to display the user action menu with correct width. Style fixes for better readability and coding style conformity. Changed the icons for enabling, disabling and deleting a user in the action menu.
* | Add verification iconsJan-Christoph Borchardt2017-04-283-0/+12
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2017-04-294-2/+56
| |
* | Invert new header icons on bright theming colorsJulius Härtl2017-04-281-1/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2017-04-284-20/+20
| |
* | Merge pull request #4521 from nextcloud/custom-mount-typesRoeland Jago Douma2017-04-281-1/+10
|\ \ | | | | | | allow apps to set custom mount types
| * | allow apps to set custom mount typesRobin Appelman2017-04-281-1/+10
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #4574 from nextcloud/rename-extension-pointLukas Reschke2017-04-281-1/+1
|\ \ \ | | | | | | | | Rename extension point
| * | | Rename extension pointLukas Reschke2017-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To align with upstream. Fixes https://github.com/nextcloud/guests/issues/3 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Add sharing types for guestsLukas Reschke2017-04-281-0/+1
|/ / / | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/guests/issues/4 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4562 from nextcloud/contactmenu-second-tooltipJoas Schilling2017-04-281-1/+3
|\ \ \ | |/ / |/| | Show tooltip for second action in contacts menu
| * | Show tooltip for second action.Ivan Sein2017-04-271-1/+3
| |/ | | | | | | Signed-off-by: Ivan Sein <ivan@nextcloud.com>
* | Merge pull request #4570 from ↵Lukas Reschke2017-04-281-7/+3
|\ \ | | | | | | | | | | | | nextcloud/do-not-disable-3rdparty-apps-on-cli-upgrade Do not disable 3rdparty apps on occ upgrade
| * | Do not disable 3rdparty apps on occ upgradeMorris Jobke2017-04-271-7/+3
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / [tx-robot] updated from transifexNextcloud bot2017-04-2818-4/+114
|/
* [tx-robot] updated from transifexNextcloud bot2017-04-2720-4/+274
|
* Merge pull request #4529 from nextcloud/fix-filelist-checkboxesMorris Jobke2017-04-261-3/+2
|\ | | | | Fix filelist and checkbox vertical align
| * Fix filelist and checkbox vertical alignJan-Christoph Borchardt2017-04-261-3/+2
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #4518 from nextcloud/downstream-25838Roeland Jago Douma2017-04-262-0/+75
|\ \ | | | | | | Fix share indicator handling
| * | Fix share indicator handlingVincent Petry2017-04-262-0/+75
| |/ | | | | | | | | Properly update the fileInfoModel with the updated share types, which also updates the file list row indicator properly
* | handle 404 separatelyGeorg Ehrke2017-04-262-2/+24
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | unit test jquery.contactsmenuGeorg Ehrke2017-04-261-0/+198
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | better detection whether or not contactsmenu target was clickedGeorg Ehrke2017-04-261-2/+2
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | add contactsmenu popover to resharer infoboxGeorg Ehrke2017-04-262-0/+9
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Contactsmenu popover: show proper message when server throws errorGeorg Ehrke2017-04-261-2/+8
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | don't toggle sharing popover together with contactsmenu popoverGeorg Ehrke2017-04-261-2/+2
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | close menu again when clicking on avatarGeorg Ehrke2017-04-261-29/+26
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | add contactsmenu popoverGeorg Ehrke2017-04-267-2/+153
|/ | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* [tx-robot] updated from transifexNextcloud bot2017-04-2620-6/+108
|
* Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-268-1/+360
|\ | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Merge pull request #4508 from nextcloud/fix/remove-js-debug-loggingMorris Jobke2017-04-251-1/+0
| |\ | | | | | | Remove js debug logging
| | * Remove js debug loggingChristoph Wurst2017-04-251-1/+0
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Fix auth flow background color and redirect view layoutJan-Christoph Borchardt2017-04-252-4/+11
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | AppToken to 72 charsRoeland Jago Douma2017-04-251-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Do not remove the state token to earlyRoeland Jago Douma2017-04-251-1/+3
| | | | | | | | | | | | | | | | | | | | | we should check the stateToken before we remove it. Else the check will always fail. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Correctly case the stateTokenRoeland Jago Douma2017-04-251-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add new auth flowLukas Reschke2017-04-257-0/+351
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the basics for the new app-password based authentication flow for our clients. The current implementation tries to keep it as simple as possible and works the following way: 1. Unauthenticated client opens `/index.php/login/flow` 2. User will be asked whether they want to grant access to the client 3. If accepted the user has the chance to do so using existing App Token or automatically generate an app password. If the user chooses to use an existing app token then that one will simply be redirected to the `nc://` protocol handler. While we can improve on that in the future, I think keeping this smaller at the moment has its advantages. Also, in the near future we have to think about an automatic migration endpoint so there's that anyways :-) If the user chooses to use the regular login the following happens: 1. A session state token is written to the session 2. User is redirected to the login page 3. If successfully authenticated they will be redirected to a page redirecting to the POST controller 4. The POST controller will check if the CSRF token as well as the state token is correct, if yes the user will be redirected to the `nc://` protocol handler. This approach is quite simple but also allows to be extended in the future. One could for example allow external websites to consume this authentication endpoint as well. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Fix testJan-Christoph Borchardt2017-04-261-1/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Fix emptycontent HTML and wordingJan-Christoph Borchardt2017-04-251-4/+5
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Fix spinner position of Contacts menuJan-Christoph Borchardt2017-04-251-3/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Use HTTP POST to retrieve the list of contactsChristoph Wurst2017-04-252-2/+2
| | | | | | | | | | | | | | | | We do not want to have sensitive information in the URL and therefore also not in the access log. Thus the GET request is replaced by a POST request. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Fix failing contacts menu js test dataChristoph Wurst2017-04-251-2/+12
| | | | | | | | | | | | | | | | When we test wheter action menus in the contacts menu close when clicking other ones, we have to provide test data that actually causes the view to render the menu. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Fix icon of second actionChristoph Wurst2017-04-251-3/+5
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Use absolute URI for action iconsChristoph Wurst2017-04-251-2/+4
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Let apps register contact menu provider via info.xmlChristoph Wurst2017-04-251-6/+7
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Use tooltop for contact's top action titleChristoph Wurst2017-04-251-1/+4
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Contacts menuChristoph Wurst2017-04-2511-21/+988
|/ | | | | | | * load list of contacts from the server * show last message of each contact Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>