summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-31Merge pull request #23 from leapcode/feature/rest_apijessib
Allow PUT API to update user.
2013-01-31Remove public key if the key is passed as nil, but not otherwise.jessib
There was a weird case with reloading the user in the test if the public key had been unset.
2013-01-31config key is not ca_cert_path anymore - client_ca_certAzul
2013-01-31Merge pull request #22 from leapcode/feature/merge_leap_caazul
merge leap ca
2013-01-29A user's public_key is the only attribute they should be able to update via API.jessib
2013-01-29Allow PUT API to update user.jessib
2013-01-26no need to store the cert anymore - just new initialize and send itAzul
2013-01-26adopting tests to the way certs work now. should pass.Azul
* We now generate cert and key on validate. * we don't expect the controller to pick from the pool anymore - just create instead
2013-01-26we're not using a cert pool anymore - remove anything relatedAzul
2013-01-26moving leap_ca configs into defaults.ymlAzul
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