summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-26adding certificate authority dependencyAzul
2013-01-26removing the leap_ca namespacing from certsAzul
2013-01-25Merge branch 'master' into merge_leap_caAzul
2013-01-25Merge branch 'feature/webfinger' of https://github.com/leapcode/leap_webAzul
Conflicts: users/app/views/users/edit.html.haml
2013-01-24Rough start to merging leap_ca into webapp.jessib
2013-01-24Removing aliases from webfinger as the link wouldn't work anyway, and don't ↵jessib
want to leak ID information.
2013-01-24Merge pull request #21 from leapcode/feature/misc_cleanupjessib
Feature/misc cleanup
2013-01-24Use ticket_url to get URL for unauthenticated ticket creation, and only ↵jessib
flash that message if the ticket already has a flash[:message] (and thus was saved successfully)
2013-01-23functional test for webfingerAzul
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-23make raising not found error less confusingAzul
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
2013-01-22Link to users show page rather than edit, now that we have a show view for ↵jessib
users.
2013-01-22More minor cleanup of tickets controllerjessib
2013-01-22Users now have an email_address, not an email.jessib
2013-01-22Makes tickets_controller a bit less complex.jessib
2013-01-22Translate text rather than having it in code directly.jessib
2013-01-22fixing xml and adding json representation for host_metaAzul
2013-01-22removed accidentaily commited filesAzul
2013-01-22adding json jrd responses to webfingerAzul
2013-01-22render 404 if neededAzul
2013-01-22some basic webfinger routes, controller, presenters, viewsAzul
2013-01-20Merge pull request #19 from leapcode/feature/partial-refactorazul
more flexible email partial
2013-01-18more flexible email partialAzul
2013-01-17Merge pull request #18 from leapcode/feature/fixed-email-addressazul
make email address just login@domain.tld
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-17Merge pull request #10 from leapcode/feature/unauthenticated_ticketsjessib
Rough functionality for unauthenticated tickets.
2013-01-17Merge branch 'master' into feature/unauthenticated_ticketsjessib
Conflicts: help/app/views/tickets/_comment.html.haml help/app/views/tickets/_new_comment.html.haml
2013-01-17Merge pull request #14 from leapcode/feature/show_userjessib
Adding 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-15Refactoring of tickets controller to fetch the ticket in a before filter for ↵jessib
relevant actions.
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-14Some fixes to the how we keep track of information about users associated ↵jessib
with a ticket.