Skip to content

Commit

Permalink
Merge branch 'release/0.1'
Browse files Browse the repository at this point in the history
* release/0.1: (227 commits)
  fix wrong factory for news
  change :file to :string for fastre testing
  fix for wrong  sessions
  add lead to factories for mews
  some fixes
  :photo need for model
  add inflection for news
  add localization news + add flash_erors_show
  Returned to older state
  Add flash error show
  Add save unsaved params of news after wrong safe:)
  fix dropdown menu
  some fix
  add lead precense
  "Add lead to NewsForm"
  "Fix routing for MemberController"
  fix wrong route????
  Add Lead
  Update ReadMe.md
  add position form to admin
  ...
  • Loading branch information
kalashnikovisme committed Mar 12, 2015
2 parents 796e4f5 + fc244cc commit 7eac593
Show file tree
Hide file tree
Showing 280 changed files with 7,259 additions and 0 deletions.
Binary file added .Gemfile.lock.swp
Binary file not shown.
Binary file added .Gemfile.swp
Binary file not shown.
1 change: 1 addition & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
repo_token: tmDKzfJz4n6s5dTpUALNDoi1jRXFWykPg
45 changes: 45 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*
!/log/.keep
config/secrets.yml
config/database.yml
config/oauth.yml
ulmic_test
/.bundle/db/*.sqlite3
/log/*.log
/tmp
*.rbc
*.sassc
.sass-cache
capybara-*.html
.rspec
.rvmrc
/.bundle
/vendor/bundle
/tmp/*
/db/*.sqlite3
/public/system/*
/public/uploads/*
/public/assets/*
/coverage/
/spec/tmp/*
**.orig
rerun.txt
pickle-email-*.html
.project
config/initializers/secret_token.rb
config/database.yml
Gemfile.lock
15 changes: 15 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
language: ruby
rvm:
- 2.1
env:
- DB=postgres
script:
- gem install tilt -v '1.4.1'
- gem install byebug -v '3.5.1'
- gem install sdoc -v '0.4.1'
- cp config/secrets.yml.sample config/secrets.yml
- cp config/database.yml.sample config/database.yml
- cp config/oauth.yml.sample config/oauth.yml
- RAILS_ENV=test bundle exec rake db:create db:migrate test
services:
- redis-server
80 changes: 80 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
source 'https://rubygems.org'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.0'
gem 'pg'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'haml-rails'
gem 'enumerize'
gem 'authority'
gem 'bcrypt', '~> 3.1.7'
gem 'active_form', github: 'rails/actionform', ref: '41ec958'
gem 'simple_form'
gem 'bootstrap-sass'
gem 'state_machine', git: 'https://github.com/seuros/state_machine.git'
gem 'draper'
gem 'russian'
gem 'carrierwave'
gem 'mini_magick'
gem 'datetimepicker-rails', git: 'git://github.com/zpaulovics/datetimepicker-rails.git', branch: 'master', submodules: true
gem 'js-routes'
gem 'i18n-js', git: 'https://github.com/fnando/i18n-js'
gem 'omniauth-google-oauth2'
gem 'omniauth-vkontakte'
gem 'omniauth-twitter'
gem 'omniauth-facebook'
gem 'momentjs-rails', '>= 2.9', :github => 'derekprior/momentjs-rails'
gem 'awesome_print'
gem 'turbolinks'
gem 'wysiwyg-rails'
gem 'font-awesome-rails'

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Unicorn as the app server
# gem 'unicorn'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

group :production do
gem 'unicorn-rails'
end

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'

# Access an IRB console on exception pages or by using <%= console %> in viewr
gem 'web-console', '2.0.0.beta2'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'factory_girl_rails'
gem 'pry-rails'
gem 'pry-byebug'
end

group :test do
gem 'simplecov', require: false
gem 'tconsole', github: 'ulmic/tconsole', branch: 'rails4'
gem 'coveralls', require: false
end
Loading

0 comments on commit 7eac593

Please sign in to comment.