delete design folder, move everything in rails/ to repo root

haileys · Jun 18, 2012 · 2bdc5ad · 2bdc5ad
1 parent 64a64d2
commit 2bdc5ad
Show file tree

Hide file tree

Showing 174 changed files with 39 additions and 1,011 deletions.
diff --git a/rails/Gemfile → Gemfile b/rails/Gemfile → Gemfile
diff --git a/rails/Gemfile.lock → Gemfile.lock b/rails/Gemfile.lock → Gemfile.lock
diff --git a/rails/Makefile → Makefile b/rails/Makefile → Makefile
diff --git a/rails/Rakefile → Rakefile b/rails/Rakefile → Rakefile
diff --git a/rails/app/assets/images/design.png → app/assets/images/design.png b/rails/app/assets/images/design.png → app/assets/images/design.png
diff --git a/rails/app/assets/images/grid.png → app/assets/images/grid.png b/rails/app/assets/images/grid.png → app/assets/images/grid.png
diff --git a/...p/assets/images/icons/arrow-big-right.svg → app/assets/images/icons/arrow-big-right.svg b/...p/assets/images/icons/arrow-big-right.svg → app/assets/images/icons/arrow-big-right.svg
diff --git a/rails/app/assets/images/icons/arrow-down.svg → app/assets/images/icons/arrow-down.svg b/rails/app/assets/images/icons/arrow-down.svg → app/assets/images/icons/arrow-down.svg
diff --git a/rails/app/assets/images/icons/download.svg → app/assets/images/icons/download.svg b/rails/app/assets/images/icons/download.svg → app/assets/images/icons/download.svg
diff --git a/rails/app/assets/images/icons/home.svg → app/assets/images/icons/home.svg b/rails/app/assets/images/icons/home.svg → app/assets/images/icons/home.svg
diff --git a/rails/app/assets/images/icons/lock.svg → app/assets/images/icons/lock.svg b/rails/app/assets/images/icons/lock.svg → app/assets/images/icons/lock.svg
diff --git a/rails/app/assets/images/icons/pencil.svg → app/assets/images/icons/pencil.svg b/rails/app/assets/images/icons/pencil.svg → app/assets/images/icons/pencil.svg
diff --git a/rails/app/assets/images/icons/ratio.svg → app/assets/images/icons/ratio.svg b/rails/app/assets/images/icons/ratio.svg → app/assets/images/icons/ratio.svg
diff --git a/...app/assets/images/icons/search-active.svg → app/assets/images/icons/search-active.svg b/...app/assets/images/icons/search-active.svg → app/assets/images/icons/search-active.svg
diff --git a/.../app/assets/images/icons/search-hover.svg → app/assets/images/icons/search-hover.svg b/.../app/assets/images/icons/search-hover.svg → app/assets/images/icons/search-hover.svg
diff --git a/rails/app/assets/images/icons/search.svg → app/assets/images/icons/search.svg b/rails/app/assets/images/icons/search.svg → app/assets/images/icons/search.svg
diff --git a/rails/app/assets/images/icons/showcase.html → app/assets/images/icons/showcase.html b/rails/app/assets/images/icons/showcase.html → app/assets/images/icons/showcase.html
diff --git a/rails/app/assets/images/icons/upload.svg → app/assets/images/icons/upload.svg b/rails/app/assets/images/icons/upload.svg → app/assets/images/icons/upload.svg
diff --git a/rails/app/assets/images/icons/user.svg → app/assets/images/icons/user.svg b/rails/app/assets/images/icons/user.svg → app/assets/images/icons/user.svg
diff --git a/rails/app/assets/images/logo.png → app/assets/images/logo.png b/rails/app/assets/images/logo.png → app/assets/images/logo.png
diff --git a/rails/app/assets/images/sprites.png → app/assets/images/sprites.png b/rails/app/assets/images/sprites.png → app/assets/images/sprites.png
diff --git a/rails/app/assets/javascripts/application.js → app/assets/javascripts/application.js b/rails/app/assets/javascripts/application.js → app/assets/javascripts/application.js
diff --git a/rails/app/assets/javascripts/home.js → app/assets/javascripts/home.js b/rails/app/assets/javascripts/home.js → app/assets/javascripts/home.js
diff --git a/...app/assets/javascripts/password_resets.js → app/assets/javascripts/password_resets.js b/...app/assets/javascripts/password_resets.js → app/assets/javascripts/password_resets.js
diff --git a/...app/assets/javascripts/sessions.js.coffee → app/assets/javascripts/sessions.js.coffee b/...app/assets/javascripts/sessions.js.coffee → app/assets/javascripts/sessions.js.coffee
diff --git a/...s/app/assets/javascripts/toggle.js.coffee → app/assets/javascripts/toggle.js.coffee b/...s/app/assets/javascripts/toggle.js.coffee → app/assets/javascripts/toggle.js.coffee
diff --git a/rails/app/assets/javascripts/torrents.js → app/assets/javascripts/torrents.js b/rails/app/assets/javascripts/torrents.js → app/assets/javascripts/torrents.js
diff --git a/rails/app/assets/javascripts/users.js → app/assets/javascripts/users.js b/rails/app/assets/javascripts/users.js → app/assets/javascripts/users.js
diff --git a/rails/app/assets/javascripts/versions.js → app/assets/javascripts/versions.js b/rails/app/assets/javascripts/versions.js → app/assets/javascripts/versions.js
diff --git a/rails/app/assets/stylesheets/application.css → app/assets/stylesheets/application.css b/rails/app/assets/stylesheets/application.css → app/assets/stylesheets/application.css
diff --git a/rails/app/assets/stylesheets/forms.css.scss → app/assets/stylesheets/forms.css.scss b/rails/app/assets/stylesheets/forms.css.scss → app/assets/stylesheets/forms.css.scss
diff --git a/rails/app/assets/stylesheets/global.css.scss → app/assets/stylesheets/global.css.scss b/rails/app/assets/stylesheets/global.css.scss → app/assets/stylesheets/global.css.scss
diff --git a/...s/app/assets/stylesheets/helpers.css.scss → app/assets/stylesheets/helpers.css.scss b/...s/app/assets/stylesheets/helpers.css.scss → app/assets/stylesheets/helpers.css.scss
diff --git a/rails/app/assets/stylesheets/home.css.scss → app/assets/stylesheets/home.css.scss b/rails/app/assets/stylesheets/home.css.scss → app/assets/stylesheets/home.css.scss
diff --git a/rails/app/assets/stylesheets/layout.css.scss → app/assets/stylesheets/layout.css.scss b/rails/app/assets/stylesheets/layout.css.scss → app/assets/stylesheets/layout.css.scss
diff --git a/...sets/stylesheets/password_resets.css.scss → ...sets/stylesheets/password_resets.css.scss b/...sets/stylesheets/password_resets.css.scss → ...sets/stylesheets/password_resets.css.scss
diff --git a/rails/app/assets/stylesheets/reset.css → app/assets/stylesheets/reset.css b/rails/app/assets/stylesheets/reset.css → app/assets/stylesheets/reset.css
diff --git a/.../app/assets/stylesheets/sessions.css.scss → app/assets/stylesheets/sessions.css.scss b/.../app/assets/stylesheets/sessions.css.scss → app/assets/stylesheets/sessions.css.scss
diff --git a/.../app/assets/stylesheets/torrents.css.scss → app/assets/stylesheets/torrents.css.scss b/.../app/assets/stylesheets/torrents.css.scss → app/assets/stylesheets/torrents.css.scss
diff --git a/...pp/assets/stylesheets/typography.css.scss → app/assets/stylesheets/typography.css.scss b/...pp/assets/stylesheets/typography.css.scss → app/assets/stylesheets/typography.css.scss
diff --git a/rails/app/assets/stylesheets/users.css.scss → app/assets/stylesheets/users.css.scss b/rails/app/assets/stylesheets/users.css.scss → app/assets/stylesheets/users.css.scss
diff --git a/...app/assets/stylesheets/variables.css.scss → app/assets/stylesheets/variables.css.scss b/...app/assets/stylesheets/variables.css.scss → app/assets/stylesheets/variables.css.scss
diff --git a/.../app/assets/stylesheets/versions.css.scss → app/assets/stylesheets/versions.css.scss b/.../app/assets/stylesheets/versions.css.scss → app/assets/stylesheets/versions.css.scss
diff --git a/...s/app/controllers/announces_controller.rb → app/controllers/announces_controller.rb b/...s/app/controllers/announces_controller.rb → app/controllers/announces_controller.rb
diff --git a/...app/controllers/application_controller.rb → app/controllers/application_controller.rb b/...app/controllers/application_controller.rb → app/controllers/application_controller.rb
diff --git a/rails/app/controllers/home_controller.rb → app/controllers/home_controller.rb b/rails/app/controllers/home_controller.rb → app/controllers/home_controller.rb
diff --git a/...controllers/password_resets_controller.rb → ...controllers/password_resets_controller.rb b/...controllers/password_resets_controller.rb → ...controllers/password_resets_controller.rb
diff --git a/rails/app/controllers/sessions_controller.rb → app/controllers/sessions_controller.rb b/rails/app/controllers/sessions_controller.rb → app/controllers/sessions_controller.rb
diff --git a/rails/app/controllers/torrents_controller.rb → app/controllers/torrents_controller.rb b/rails/app/controllers/torrents_controller.rb → app/controllers/torrents_controller.rb
diff --git a/rails/app/controllers/users_controller.rb → app/controllers/users_controller.rb b/rails/app/controllers/users_controller.rb → app/controllers/users_controller.rb
diff --git a/rails/app/controllers/versions_controller.rb → app/controllers/versions_controller.rb b/rails/app/controllers/versions_controller.rb → app/controllers/versions_controller.rb
diff --git a/rails/app/helpers/application_helper.rb → app/helpers/application_helper.rb b/rails/app/helpers/application_helper.rb → app/helpers/application_helper.rb
diff --git a/rails/app/helpers/password_resets_helper.rb → app/helpers/password_resets_helper.rb b/rails/app/helpers/password_resets_helper.rb → app/helpers/password_resets_helper.rb
diff --git a/rails/app/helpers/versions_helper.rb → app/helpers/versions_helper.rb b/rails/app/helpers/versions_helper.rb → app/helpers/versions_helper.rb
diff --git a/rails/app/mailers/.gitkeep → app/mailers/.gitkeep b/rails/app/mailers/.gitkeep → app/mailers/.gitkeep
diff --git a/rails/app/mailers/user_mailer.rb → app/mailers/user_mailer.rb b/rails/app/mailers/user_mailer.rb → app/mailers/user_mailer.rb
diff --git a/rails/app/models/.gitkeep → app/models/.gitkeep b/rails/app/models/.gitkeep → app/models/.gitkeep
diff --git a/rails/app/models/ability.rb → app/models/ability.rb b/rails/app/models/ability.rb → app/models/ability.rb
diff --git a/rails/app/models/app_config.rb → app/models/app_config.rb b/rails/app/models/app_config.rb → app/models/app_config.rb
diff --git a/rails/app/models/category.rb → app/models/category.rb b/rails/app/models/category.rb → app/models/category.rb
diff --git a/rails/app/models/invite.rb → app/models/invite.rb b/rails/app/models/invite.rb → app/models/invite.rb
diff --git a/rails/app/models/metadata.rb → app/models/metadata.rb b/rails/app/models/metadata.rb → app/models/metadata.rb
diff --git a/rails/app/models/metadata/music.rb → app/models/metadata/music.rb b/rails/app/models/metadata/music.rb → app/models/metadata/music.rb
diff --git a/rails/app/models/peer.rb → app/models/peer.rb b/rails/app/models/peer.rb → app/models/peer.rb
diff --git a/rails/app/models/torrent.rb → app/models/torrent.rb b/rails/app/models/torrent.rb → app/models/torrent.rb
diff --git a/rails/app/models/user.rb → app/models/user.rb b/rails/app/models/user.rb → app/models/user.rb
diff --git a/rails/app/models/user_observer.rb → app/models/user_observer.rb b/rails/app/models/user_observer.rb → app/models/user_observer.rb
diff --git a/rails/app/models/version.rb → app/models/version.rb b/rails/app/models/version.rb → app/models/version.rb
diff --git a/rails/app/views/home/error.html.erb → app/views/home/error.html.erb b/rails/app/views/home/error.html.erb → app/views/home/error.html.erb
diff --git a/rails/app/views/home/index.html.erb → app/views/home/index.html.erb b/rails/app/views/home/index.html.erb → app/views/home/index.html.erb
diff --git a/rails/app/views/layouts/application.html.erb → app/views/layouts/application.html.erb b/rails/app/views/layouts/application.html.erb → app/views/layouts/application.html.erb
diff --git a/rails/app/views/layouts/sessions.html.erb → app/views/layouts/sessions.html.erb b/rails/app/views/layouts/sessions.html.erb → app/views/layouts/sessions.html.erb
diff --git a/...s/app/views/metadata/music/_main.html.erb → app/views/metadata/music/_main.html.erb b/...s/app/views/metadata/music/_main.html.erb → app/views/metadata/music/_main.html.erb
diff --git a/...views/metadata/music/_subheading.html.erb → ...views/metadata/music/_subheading.html.erb b/...views/metadata/music/_subheading.html.erb → ...views/metadata/music/_subheading.html.erb
diff --git a/...app/views/password_resets/create.html.erb → app/views/password_resets/create.html.erb b/...app/views/password_resets/create.html.erb → app/views/password_resets/create.html.erb
diff --git a/rails/app/views/password_resets/new.html.erb → app/views/password_resets/new.html.erb b/rails/app/views/password_resets/new.html.erb → app/views/password_resets/new.html.erb
diff --git a/rails/app/views/sessions/new.html.erb → app/views/sessions/new.html.erb b/rails/app/views/sessions/new.html.erb → app/views/sessions/new.html.erb
diff --git a/rails/app/views/torrents/index.html.erb → app/views/torrents/index.html.erb b/rails/app/views/torrents/index.html.erb → app/views/torrents/index.html.erb
diff --git a/rails/app/views/torrents/new.html.erb → app/views/torrents/new.html.erb b/rails/app/views/torrents/new.html.erb → app/views/torrents/new.html.erb
diff --git a/rails/app/views/torrents/show.html.erb → app/views/torrents/show.html.erb b/rails/app/views/torrents/show.html.erb → app/views/torrents/show.html.erb
diff --git a/...user_mailer/password_reset_email.text.erb → ...user_mailer/password_reset_email.text.erb b/...user_mailer/password_reset_email.text.erb → ...user_mailer/password_reset_email.text.erb
diff --git a/.../views/user_mailer/welcome_email.text.erb → app/views/user_mailer/welcome_email.text.erb b/.../views/user_mailer/welcome_email.text.erb → app/views/user_mailer/welcome_email.text.erb
diff --git a/rails/app/views/users/new.html.erb → app/views/users/new.html.erb b/rails/app/views/users/new.html.erb → app/views/users/new.html.erb
diff --git a/rails/app/views/users/show.html.erb → app/views/users/show.html.erb b/rails/app/views/users/show.html.erb → app/views/users/show.html.erb
diff --git a/rails/app/views/versions/show.html.erb → app/views/versions/show.html.erb b/rails/app/views/versions/show.html.erb → app/views/versions/show.html.erb
diff --git a/rails/config.ru → config.ru b/rails/config.ru → config.ru
diff --git a/config/app_config.yml b/config/app_config.yml
@@ -0,0 +1,19 @@
+development:
+  site_name: Voze
+  mail:
+    from: voze@voze.org
+    smtp:
+      # ...
+  default_url_options:
+    host: 127.0.0.1
+  secret_token: 19d557e11414905954e6e8708a0f375f9a0b4458afec11d502e3127ddf80be9c
+  required_ratio:
+    # new users get 5GB free download:
+    free_download: 5
+    # the required ratio stops increasing after 400GB downloaded:
+    capped_at: 400
+    # the maximum required ratio is 1
+    max: 1
+
+test:
+  # ...
diff --git a/rails/config/app_config.yml.sample → config/app_config.yml.sample b/rails/config/app_config.yml.sample → config/app_config.yml.sample
diff --git a/rails/config/application.rb → config/application.rb b/rails/config/application.rb → config/application.rb
diff --git a/rails/config/boot.rb → config/boot.rb b/rails/config/boot.rb → config/boot.rb
diff --git a/config/database.yml b/config/database.yml
@@ -0,0 +1,20 @@
+development:
+  adapter: mysql2
+  database: voze_dev
+  host: 127.0.0.1
+  user: root
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: mysql2
+  database: voze_test
+  host: 127.0.0.1
+  user: root
+
+production:
+  adapter: mysql2
+  database: voze_prod
+  host: 127.0.0.1
+  user: root
diff --git a/rails/config/database.yml.sample → config/database.yml.sample b/rails/config/database.yml.sample → config/database.yml.sample
diff --git a/rails/config/environment.rb → config/environment.rb b/rails/config/environment.rb → config/environment.rb
diff --git a/rails/config/environments/development.rb → config/environments/development.rb b/rails/config/environments/development.rb → config/environments/development.rb
diff --git a/rails/config/environments/production.rb → config/environments/production.rb b/rails/config/environments/production.rb → config/environments/production.rb
diff --git a/rails/config/environments/test.rb → config/environments/test.rb b/rails/config/environments/test.rb → config/environments/test.rb
diff --git a/rails/config/initializers/action_mailer.rb → config/initializers/action_mailer.rb b/rails/config/initializers/action_mailer.rb → config/initializers/action_mailer.rb
diff --git a/rails/config/initializers/mime_types.rb → config/initializers/mime_types.rb b/rails/config/initializers/mime_types.rb → config/initializers/mime_types.rb
diff --git a/rails/config/initializers/secret_token.rb → config/initializers/secret_token.rb b/rails/config/initializers/secret_token.rb → config/initializers/secret_token.rb
diff --git a/rails/config/initializers/session_store.rb → config/initializers/session_store.rb b/rails/config/initializers/session_store.rb → config/initializers/session_store.rb
diff --git a/rails/config/initializers/wrap_parameters.rb → config/initializers/wrap_parameters.rb b/rails/config/initializers/wrap_parameters.rb → config/initializers/wrap_parameters.rb
diff --git a/rails/config/locales/en.yml → config/locales/en.yml b/rails/config/locales/en.yml → config/locales/en.yml
diff --git a/rails/config/routes.rb → config/routes.rb b/rails/config/routes.rb → config/routes.rb
diff --git a/...db/migrate/20120406114459_create_users.rb → db/migrate/20120406114459_create_users.rb b/...db/migrate/20120406114459_create_users.rb → db/migrate/20120406114459_create_users.rb
diff --git a/...6142015_rename_users_login_to_username.rb → ...6142015_rename_users_login_to_username.rb b/...6142015_rename_users_login_to_username.rb → ...6142015_rename_users_login_to_username.rb
diff --git a/...dd_upload_and_download_columns_to_user.rb → ...dd_upload_and_download_columns_to_user.rb b/...dd_upload_and_download_columns_to_user.rb → ...dd_upload_and_download_columns_to_user.rb
diff --git a/.../migrate/20120407055709_create_invites.rb → db/migrate/20120407055709_create_invites.rb b/.../migrate/20120407055709_create_invites.rb → db/migrate/20120407055709_create_invites.rb
diff --git a/...dd_password_reset_token_field_to_users.rb → ...dd_password_reset_token_field_to_users.rb b/...dd_password_reset_token_field_to_users.rb → ...dd_password_reset_token_field_to_users.rb
diff --git a/...0408105841_add_announce_token_to_users.rb → ...0408105841_add_announce_token_to_users.rb b/...0408105841_add_announce_token_to_users.rb → ...0408105841_add_announce_token_to_users.rb
diff --git a/...migrate/20120408122745_create_torrents.rb → db/migrate/20120408122745_create_torrents.rb b/...migrate/20120408122745_create_torrents.rb → db/migrate/20120408122745_create_torrents.rb
diff --git a/...db/migrate/20120408123448_create_peers.rb → db/migrate/20120408123448_create_peers.rb b/...db/migrate/20120408123448_create_peers.rb → db/migrate/20120408123448_create_peers.rb
diff --git a/...o_json_column_to_info_bencoding_column.rb → ...o_json_column_to_info_bencoding_column.rb b/...o_json_column_to_info_bencoding_column.rb → ...o_json_column_to_info_bencoding_column.rb
diff --git a/...eate_versions_and_migrate_torrent_data.rb → ...eate_versions_and_migrate_torrent_data.rb b/...eate_versions_and_migrate_torrent_data.rb → ...eate_versions_and_migrate_torrent_data.rb
diff --git a/...grate/20120425072731_create_categories.rb → ...grate/20120425072731_create_categories.rb b/...grate/20120425072731_create_categories.rb → ...grate/20120425072731_create_categories.rb
diff --git a/...migrate/20120426100433_create_metadata.rb → db/migrate/20120426100433_create_metadata.rb b/...migrate/20120426100433_create_metadata.rb → db/migrate/20120426100433_create_metadata.rb
diff --git a/...e/20120426100627_create_metadata_music.rb → ...e/20120426100627_create_metadata_music.rb b/...e/20120426100627_create_metadata_music.rb → ...e/20120426100627_create_metadata_music.rb
diff --git a/...torrents_about_to_torrents_description.rb → ...torrents_about_to_torrents_description.rb b/...torrents_about_to_torrents_description.rb → ...torrents_about_to_torrents_description.rb
diff --git a/rails/db/schema.rb → db/schema.rb b/rails/db/schema.rb → db/schema.rb
diff --git a/rails/db/seeds.rb → db/seeds.rb b/rails/db/seeds.rb → db/seeds.rb
diff --git a/design/Makefile b/design/Makefile
diff --git a/design/README.md b/design/README.md
diff --git a/design/public/dashboard.html b/design/public/dashboard.html
diff --git a/design/public/login.html b/design/public/login.html
diff --git a/design/public/res/img/homepage_logo.png b/design/public/res/img/homepage_logo.png
diff --git a/design/public/res/img/logo_small.png b/design/public/res/img/logo_small.png
diff --git a/design/public/res/img/seb.jpg b/design/public/res/img/seb.jpg
diff --git a/design/public/res/js/lib/jquery-1.7.2.min.js b/design/public/res/js/lib/jquery-1.7.2.min.js