summaryrefslogtreecommitdiff
path: root/users
AgeCommit message (Collapse)Author
2013-01-18Merge remote-tracking branch 'origin/master' into feature/fixed-email-addressAzul
Conflicts: users/app/views/emails/_email.html.haml
2013-01-17Merge pull request #17 from leapcode/feature/tickets_controllers_simplificationazul
Refactoring of tickets controller to fetch the ticket in a before filter...
2013-01-17Merge pull request #16 from leapcode/feature/fixing-routes-with-apiazul
Fixing routes with api
2013-01-18minor: smalles fix ever - is_admin? has a questionmarkAzul
2013-01-17Should be able to create a user when not logged in.jessib
This isn't ready to merge, as there is an issue with logging in as an admin in the test.
2013-01-17Merge branch 'master' into feature/tickets_controllers_simplificationjessib
Conflicts: users/app/controllers/users_controller.rb
2013-01-17Deal with corner case where we don't have authenticated user. Will write a ↵jessib
test after merging in show view for users.
2013-01-17minor fixes to validation workflowAzul
2013-01-17unit tests passingAzul
2013-01-16incomplete initial changes to make email address just login@domain.tldAzul
This involves a number of other changes like making sure the comparison between aliases and emails still works. Will do that by removing the @domain.tld from aliases as well.
2013-01-16using subdomain for api requests properlyAzul
2013-01-15For both users and tickets, if the object is not found and the current user ↵jessib
is an admin, they should see an alert that the object wasn't found, and be redirected to the current controller. If the object isn't found and the current user is not an admin, then we will continue to give an error about no access, so as not to leak information about what IDs do and don't exist.
2013-01-15Show different ticket characteristics when viewing the users versus when ↵jessib
listing the tickets. Give a message if a user has no tickets.
2013-01-15reverted simplification - not good to have 'none set' in a %ulAzul
2013-01-15minor: put emails in unstyled ul and simplifyAzul
Just found out that render(@collection) returns nil for emtpy collections. So that is usefull for putting messages about the emtpy collection in an or clause.
2013-01-14Use partials for displaying details shown when viewing a user. Some of these ↵jessib
partials have specific CSS for another use, so we will likely want to tweak this.
2013-01-14Merge branch 'master' into feature/show_user. Added new tests.jessib
Conflicts: users/test/functional/users_controller_test.rb
2013-01-14Merge branch 'master' into feature/fixing-routes-with-apiAzul
2013-01-14minor: further cleanup - try to leave no record behindAzul
2013-01-14tickets controller tests passingAzul
2013-01-14got users controller test to pass - tickets controller test next.Azul
2013-01-11basic dummy data for usersAzul
2013-01-10Add test for showing user.jessib
2013-01-10moved api routes into their own namespaceAzul
In case we need them at some point - now it's new_api_user_path instead of new_user_path for example. This way they should not conflict with the normal route generation
2013-01-08Adding show view for users.jessib
2013-01-06views only emit 1 as value now, doc can be includedAzul
2012-12-22moving the js for view definitions into separate filesAzul
This way we get syntax highlighting and so on.
2012-12-22Merge pull request #7 from leapcode/feature/validate-email-domainazul
validating email domain and displaying it as the placeholder
2012-12-20render proper tab on updateAzul
2012-12-20fixed tests, testing corner cases, fixed theseAzul
2012-12-20this is what += is there forAzul
2012-12-20validating email domain and displaying it as the placeholderAzul
This even works client side. :)
2012-12-18refactor: using tab partials for user editingAzul
2012-12-18adopted functional tests to new controller designAzul
2012-12-18only destroy user that has been persisted in teardownAzul
2012-12-18make sure we have email_aliases at all before testing for an error on the lastAzul
2012-12-18refactored email_alias creation and validationAzul
using CouchRests user.email_aliases.build so the casted_by method is set in the alias Used this to move the validations into the alias itself. This is where they belong and allows us to render the errors inline along the email field they belong to.
2012-12-18adjusted tests - we now reload the user so invalid records are clearedAzul
Actually that might not be the best idea. Issue at hand was that invalid email aliases were getting displayed when rendering the edit form again. We probably want to solve this different.
2012-12-18display errors on email tab properlyAzul
still needs a bit of refactoring in the view
2012-12-17activate email tab after changing email settingsAzul
2012-12-17enabled destroying email aliases - no ajax yet.Azul
2012-12-17Merge branch 'feature/fixing-signup-and-login-issues'Azul
2012-12-17fixed inclusion of stub record helperAzul
2012-12-17fixed all user functional testsAzul
2012-12-13Merge branch 'master' into developAzul
Conflicts: users/test/unit/user_test.rb
2012-12-13Merge branch 'feature/email-aliases-model'Azul
2012-12-13use the same partial for Email and LocalEmailAzul
2012-12-13refactor: changed add_email to add_email_aliasAzul
that's what it does. Changed all tests to use it instead of the attributes method
2012-12-13refactor: Email constructor now takes string or hashAzul
This allows us to reuse add_email from email_aliases_attributes=
2012-12-13refactor: allow adding email aliases directlyAzul