leap_web.git - [leap

Age	Commit message (Collapse)	Author
2013-01-24	Rough start to merging leap_ca into webapp.	jessib

2013-01-24	Merge pull request #21 from leapcode/feature/misc_cleanup	jessib
	Feature/misc cleanup
2013-01-24	Use 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-22	Edit form should show email address for the currently displayed user.	jessib

2013-01-22	Link to users show page rather than edit, now that we have a show view for ↵	jessib
	users.
2013-01-22	More minor cleanup of tickets controller	jessib

2013-01-22	Users now have an email_address, not an email.	jessib

2013-01-22	Makes tickets_controller a bit less complex.	jessib

2013-01-22	Translate text rather than having it in code directly.	jessib

2013-01-20	Merge pull request #19 from leapcode/feature/partial-refactor	azul
	more flexible email partial
2013-01-18	more flexible email partial	Azul

2013-01-17	Merge pull request #18 from leapcode/feature/fixed-email-address	azul
	make email address just login@domain.tld
2013-01-18	Merge remote-tracking branch 'origin/master' into feature/fixed-email-address	Azul
	Conflicts: users/app/views/emails/_email.html.haml
2013-01-17	Merge pull request #17 from leapcode/feature/tickets_controllers_simplification	azul
	Refactoring of tickets controller to fetch the ticket in a before filter...
2013-01-17	Merge pull request #16 from leapcode/feature/fixing-routes-with-api	azul
	Fixing routes with api
2013-01-18	minor: smalles fix ever - is_admin? has a questionmark	Azul

2013-01-17	Should 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-17	Merge branch 'master' into feature/tickets_controllers_simplification	jessib
	Conflicts: users/app/controllers/users_controller.rb
2013-01-17	Deal with corner case where we don't have authenticated user. Will write a ↵	jessib
	test after merging in show view for users.
2013-01-17	Merge pull request #10 from leapcode/feature/unauthenticated_tickets	jessib
	Rough functionality for unauthenticated tickets.
2013-01-17	Merge branch 'master' into feature/unauthenticated_tickets	jessib
	Conflicts: help/app/views/tickets/_comment.html.haml help/app/views/tickets/_new_comment.html.haml
2013-01-17	Merge pull request #14 from leapcode/feature/show_user	jessib
	Adding show view for users.
2013-01-17	minor fixes to validation workflow	Azul

2013-01-17	unit tests passing	Azul

2013-01-16	incomplete initial changes to make email address just login@domain.tld	Azul
	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-16	using subdomain for api requests properly	Azul

2013-01-15	For 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-15	Refactoring of tickets controller to fetch the ticket in a before filter for ↵	jessib
	relevant actions.
2013-01-15	Show different ticket characteristics when viewing the users versus when ↵	jessib
	listing the tickets. Give a message if a user has no tickets.
2013-01-15	reverted simplification - not good to have 'none set' in a %ul	Azul

2013-01-15	minor: put emails in unstyled ul and simplify	Azul
	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-14	Use 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-14	Merge branch 'master' into feature/show_user. Added new tests.	jessib
	Conflicts: users/test/functional/users_controller_test.rb
2013-01-14	Some fixes to the how we keep track of information about users associated ↵	jessib
	with a ticket.
2013-01-14	Merge branch 'master' into feature/fixing-routes-with-api	Azul

2013-01-14	Merge pull request #15 from leapcode/feature/test-data-with-faker	azul
	Test data with faker, using factory girl
2013-01-14	minor: further cleanup - try to leave no record behind	Azul

2013-01-14	little bit of cleanup	Azul
	* checking records are actually getting created / destroyed * simplify creation where possible
2013-01-14	forgot to include the factory for tickets	Azul

2013-01-14	tickets controller tests passing	Azul

2013-01-14	got users controller test to pass - tickets controller test next.	Azul

2013-01-13	add head and tail scss, for customization	elijah

2013-01-11	basic dummy data for users	Azul

2013-01-10	Add test for showing user.	jessib

2013-01-10	moved api routes into their own namespace	Azul
	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-08	Adding show view for users.	jessib

2013-01-07	Ticket comments can be private	jessib

2013-01-07	Revert "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-07	attempting to work around server failure	Azul

2013-01-07	prevent requiring leap_ca database settings	Azul