Andrew Cantino 73e8406d4f Merge branch 'master' into do_not_symbolize ... Conflicts: app/models/agents/human_task_agent.rb spec/models/agents/human_task_agent_spec.rb		2013-12-29 12:45:45 -08:00
..
assets	Fix a bug where JSON was lost when saving invalid options	2013-09-30 21:42:20 -07:00
concerns	globally avoid using symbols since we're moving to json storage	2013-12-24 17:37:26 -05:00
controllers	Allow Events to be re-emitted for testing.	2013-09-07 13:53:58 -07:00
helpers	When an Agent isn't working, the "No" links to either the Agent's details tab, or its Logs tab, depending on if the most recent log is an error.	2013-09-01 17:18:22 -06:00
mailers	Better email formatting for events	2013-08-19 14:24:45 -07:00
models	Merge branch 'master' into do_not_symbolize	2013-12-29 12:45:45 -08:00
views	Fix a bug where JSON was lost when saving invalid options	2013-09-30 21:42:20 -07:00