Merge branch 'master' of github.com:magnolia-fan/BeatHaven

Conflicts:
	rails/app/views/artist/view.rhtml
	rails/config/routes.rb
	rails/public/stylesheets/beathaven.css

rails/config/mongoid.yml

@@ -0,0 +1,23 @@
+defaults: &defaults
+  host: localhost
+  # slaves:
+  #   - host: slave1.local
+  #     port: 27018
+  #   - host: slave2.local
+  #     port: 27019
+
+development:
+  <<: *defaults
+  database: beathaven
+
+test:
+  <<: *defaults
+  database: beathaven_test
+
+# set these environment variables on your prod server
+production:
+  host: <%= ENV['MONGOID_HOST'] %>
+  port: <%= ENV['MONGOID_PORT'] %>
+  username: <%= ENV['MONGOID_USERNAME'] %>
+  password: <%= ENV['MONGOID_PASSWORD'] %>
+  database: <%= ENV['MONGOID_DATABASE'] %>

rails/config/routes.rb

@@ -58,7 +58,7 @@ Beathaven::Application.routes.draw do
   # This is a legacy wild controller route that's not recommended for RESTful applications.
   # Note: This route will make all actions in every controller accessible via GET requests.
   # match ':controller(/:action(/:id(.:format)))'
-
   match 'artist(/:name)' => 'artist#view'
+  match 'listen/:id' => 'track#listen'
 end
 

rails/config/vk_accounts.yml

@@ -0,0 +1,45 @@
+# Vkontake accounts config
+
+Bach: # Bach himself
+  user_id:  5728795
+  email: chezzzy@yandex.ru
+  password: yabach!
+  remixsid: 47c2f5501b22a3e3aa6947e5e74d1a72381267df2502570eb75c94481ade
+  remixchk: 5
+  user_agent: "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru; rv:1.9.2.13) Gecko/20101203 Firefox/3.6.13"
+
+Mozart: # Hedg
+  user_id: 69139853
+  email: alexgreen1978@gmail.com
+  password: fbcn136
+  remixsid: bc5386a4f49f8bf7df20e11bdd311a7120818d83c23d93cd08177d5d3674
+  remixchk: 5
+  user_agent: "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/532.9 (KHTML, like Gecko) Chrome/5.0.307.9 Safari/532.9"
+
+Schubert: # Chez
+  user_id: 1217744
+  email: phpdev.ru@gmail.com
+  password: yanebach!
+  remixsid: fc27c3a7874bc0b84477015e187e5e0bd3a71bdca02d98327595ef255773
+  remixchk: 5
+  user_agent: "Mozilla/5.0 (Macintosh; U; PPC Max OS X Mach-O; en-US; rv:1.8.0.7) Gecko/200609211 Camino/1.0.3"
+
+Vivaldi: # Flint
+  user_id: 382067
+  remixsid: 9afa6f2e6d352b01d1a3742b2c0f6c09dbefe2158f3dcb61d30fe438dbc2
+  remixchk: 5
+  user_agent: "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"
+
+Prokofiev: # Daddy
+  user_id:24538630
+  remixsid: 832fae47c8dfc8df66551b8c72927ca26f6ee49f5754b24e9a9a317805c5
+  remixchk: 5
+  user_agent: "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; WebMoney Advisor; GTB6.3; InfoPath.2; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022; OfficeLiveConnector.1.3; OfficeLivePatch.0.0; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)"
+
+Paganini: # Tom_Orrow
+  user_id: 1554168
+  email: agent_smith@gmail.ru
+  password: GoTo17db14DB
+  remixsid: cf89c2e8ef6ab2337c3b4ef22bdd38be70c880da7f9ef73ff7d02ff9608e
+  remixchk: 5
+  user_agent: "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16"