Andrew Cantino: b688c56c67 Merge branch 'master' into dsander-rails41 10 lat temu
..
agents b688c56c67 Merge branch 'master' into dsander-rails41 10 lat temu
agent.rb b688c56c67 Merge branch 'master' into dsander-rails41 10 lat temu
agent_log.rb 7c5b4ff969 fix default log length spec 10 lat temu
contact.rb ff758cc679 move user credentials to a primary route, update twitter agents and background job 10 lat temu
event.rb 1294d47bba minor fixes 10 lat temu
link.rb 306843de0a Add event_id_at_creation field to links and use it to prevent propagation of events created before the link was made. 10 lat temu
user.rb b7b3460fd3 Update to rails 4.1 10 lat temu
user_credential.rb c043a40868 add Ace editor for editing JavaScript in credentials 10 lat temu