summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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 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-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.
2012-12-24Link to edit page (as show doesn't now exist, and not clear if we will want ↵jessib
it) of user who created ticket.
2012-12-24Rough functionality for unauthenticated tickets.jessib
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-22Merge pull request #8 from leapcode/feature/use-default-config-fileazul
Use two config files - one for defaults that is always present and one to overwrite these
2012-12-21Still much to do, but improvements to CSS.jessib
2012-12-20Slight tweaks to tickets controller.jessib
Only non-comment change is that we will keep an unauthenticated user looking at the same ticket if they have closed it (rather than redirecting to index which they will not be able to access.)
2012-12-20Define ascending method in CouchRest::Model::Designs::View so we can call ↵jessib
the order either way.
2012-12-20render proper tab on updateAzul
2012-12-20fixed tests, testing corner cases, fixed theseAzul
2012-12-20Merge branch 'feature/use-default-config-file' into ↵Azul
feature/validate-email-domain