summaryrefslogtreecommitdiff
path: root/users/app/views
AgeCommit message (Collapse)Author
2013-12-20enable billing engine by default, consolidate APP_CONFIG[:payments] and ↵elijah
APP_CONFIG[:braintree] into APP_CONFIG[:billing][:braintree]
2013-12-16Merge pull request #123 from azul/refactor/standartize-user-routesjessib
refactor: remove Overview controller - we can use Users#show
2013-12-13refactor: remove Overview controller - we can use Users#showAzul
we were only using Users#show to redirect to the edit action. So I replaced that with the overview and we have no more use for the extra controller. This also simplifies linking to the users in question a lot.
2013-12-13make the possible actions for users and admins configurableAzul
with tests
2013-12-13refactor: move edit sections into partialsAzul
2013-12-05We won't want service levels in production mode, and have it so this initial ↵jessib
service level code won't break anything if it isn't set in the config.
2013-12-03Some simplification of code.jessib
2013-12-03Add ServiceLevel class to wrap config and give accessors. Has some hacky ↵jessib
parts, but seems like okay generic start for now.
2013-11-18Start of service level code, which will be tweakedjessib
* stores desired & effective service level * whenever desired level is changed, effective level will be updated * allows user to set their desired service level * allow admin to update desired & effective service level
2013-10-28Fix button to enable account: https://leap.se/code/issues/4246jessib
2013-10-01Allow admins to view past-due subscriptions.jessib
2013-09-25visual feedback when submitting forms (#3164)Azul
This also helps with the failing integration test. We needed a way to tell the ajax request was back. Observing the button state now works for that.
2013-09-24use token auth when accessing the api from webappAzul
One failing integration test still needs to be fixed
2013-09-04fix login form - use api session urlAzul
There's no non api sessions resource anymore.
2013-09-02Remove references to email_settings controller, which has been removed. An ↵jessib
identities controller will replace it.
2013-08-27Not ideal way to do it, but was proving complicated to have a config file ↵jessib
specify which gems for which environments. Here, we have the billing gem included for the development and test environments only, hardcoded in the Gemfile. Then we show the links to billing based on a config file setting. The setting itself could be used to specify different types of billing, but isn't yet.
2013-08-27Merge branch 'master' into billing_with_testsjessib
2013-08-19Change JS warning message per https://leap.se/code/issues/3492jessib
Key must end in _html so the html doesn't get escaped.
2013-08-13Option to disable billing engine and hide billing related links. To actual ↵jessib
disable, must remove billing engine from Gemfile (and re-bundle)
2013-07-25Have navigation link to new customer form if user is not already a braintree ↵jessib
customer.
2013-07-24removed email settings controller and viewsAzul
PGP setting has been moved into account settings. It's using the API now issueing an Ajax request without any visual feedback. This obviously is not what we want but it hopefully suffices for uploading gpg keys for testing purposes before the Identity UI is in place.
2013-07-23Some navigation tweaks.jessib
2013-07-17Adding some links, which will be removed.jessib
2013-07-09Cleanup to show enable/deactivate account functionality in new UI.jessib
2013-07-08Merge branch 'master' into feature/disable_accountjessib
Conflicts: users/app/controllers/users_controller.rb users/app/helpers/users_helper.rb users/app/views/users/edit.html.haml users/app/views/users/show.html.haml users/config/locales/en.yml
2013-07-05remove unused user viewselijah
2013-07-04remove commented out code.elijah
2013-07-04users - make a nice overview page (well, nice enough) and better users ↵elijah
index/search.
2013-07-04fix user typeaheadelijah
2013-07-04users engine changes - rewrite of the views, separate email settings to a ↵elijah
separate controller, make users_controller html only and v1/users_controller json only.
2013-07-04new ui - initial user changeselijah
2013-07-03Accounts can be enabled or not. Admins can edit this property.jessib
2013-06-20For removing account, redirect to root path, and ask confirmation message:jessib
https://leap.se/code/issues/2923
2013-06-17Tweaks to display javascript and cookies warning:jessib
* will only display cookies warning if javascript is enabled. * remove redundant code * tweak noscript html to display better div
2013-06-13Quick way to give warnings if javascript and/or cookies are not enabled. ↵jessib
Will want to tweak so the code isn't redundant, and ideally so check for cookies doesn't rely on javascript. And we'll want to expand the texts.
2013-03-05minor: fixed logout linkAzul
2013-03-01Merge pull request #32 from azul/feature/api-version-1-fixesazul
Feature: API version 1 fixes
2013-02-26Change to language for when updating username/password.jessib
2013-02-26api for sessions fixedAzul
* now we return the user id on login * allow a destroy request for logging out * added test for api sessions controller
2013-02-25Admins cannot update a user. Eventually we will want to allow admins to ↵jessib
update some user fields.
2013-02-25Slight refactoring of partialsjessib
2013-02-25Add hint that password change is optionaljessib
2013-02-19Needs some cleanup, but this has one form where user can change username and ↵jessib
password (they can leave either the same if they just want to change one, but we should make this clearer.)
2013-01-25Merge branch 'feature/webfinger' of https://github.com/leapcode/leap_webAzul
Conflicts: users/app/views/users/edit.html.haml
2013-01-24Removing aliases from webfinger as the link wouldn't work anyway, and don't ↵jessib
want to leak ID information.
2013-01-23added a small test for HostMetaPresenter and using links hash in xml viewAzul
2013-01-23added unit tests for user presenterAzul
changed the way the presenter works. Will need functional testing
2013-01-23not inluding link to key if there is noneAzul
2013-01-22Rough way to allow user to paste in their key, but certainly we will want ↵jessib
different display.
2013-01-22Edit form should show email address for the currently displayed user.jessib