Andrew Cantino: b688c56c67 Merge branch 'master' into dsander-rails41 10 gadi atpakaļ
..
agents b688c56c67 Merge branch 'master' into dsander-rails41 10 gadi atpakaļ
agent.rb b688c56c67 Merge branch 'master' into dsander-rails41 10 gadi atpakaļ
agent_log.rb 7c5b4ff969 fix default log length spec 10 gadi atpakaļ
contact.rb ff758cc679 move user credentials to a primary route, update twitter agents and background job 10 gadi atpakaļ
event.rb 1294d47bba minor fixes 10 gadi atpakaļ
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 gadi atpakaļ
user.rb b7b3460fd3 Update to rails 4.1 10 gadi atpakaļ
user_credential.rb c043a40868 add Ace editor for editing JavaScript in credentials 10 gadi atpakaļ