summaryrefslogtreecommitdiff
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-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.
2013-01-14Merge branch 'master' into feature/fixing-routes-with-apiAzul
2013-01-14Merge pull request #15 from leapcode/feature/test-data-with-fakerazul
Test data with faker, using factory girl
2013-01-14minor: further cleanup - try to leave no record behindAzul
2013-01-14little bit of cleanupAzul
* checking records are actually getting created / destroyed * simplify creation where possible
2013-01-14forgot to include the factory for ticketsAzul
2013-01-14tickets controller tests passingAzul
2013-01-14got users controller test to pass - tickets controller test next.Azul
2013-01-13add head and tail scss, for customizationelijah
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-07Ticket comments can be privatejessib
2013-01-07Revert "Merge pull request #12 from leapcode/feature/use-leap_ca-lib"Azul
This reverts commit d2acd205b3c3f0931ce4c453e67b1ba572ec77e9, reversing changes made to e6496b0f45cc0b487da7cb35a34b8e79037034c0. Conflicts: certs/lib/leap_web_certs/engine.rb
2013-01-07attempting to work around server failureAzul
2013-01-07prevent requiring leap_ca database settingsAzul
2013-01-06Merge pull request #13 from leapcode/feature/views_for_postfixazul
views only emit 1 as value now, doc can be included
2013-01-06views only emit 1 as value now, doc can be includedAzul
2013-01-04Merge pull request #12 from leapcode/feature/use-leap_ca-libazul
require leap_ca from leap_web_certs to ensure consistency
2013-01-03Removed unnecessary comment.jessib
2013-01-03Merge pull request #11 from leapcode/feature/ticket-client-side-validationsjessib
Client-side validations, including only validating email address format ...
2013-01-03removed cert unit tests as leap_ca now provides the modelAzul
2013-01-03Merge pull request #9 from leapcode/feature/read-design-from-js-filesazul
moving the js for view definitions into separate files
2013-01-03adding default reduce function to couch views read from filesAzul
2013-01-03using leap_ca for cert model, removing empty dirsAzul
2012-12-31remove commented-out lines.jessib
2012-12-31Small CSS tweakjessib
2012-12-31Client-side validations, including only validating email address format if ↵jessib
something is input for email address.