Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit bb4ab3d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 9 16:54:31 2014 +0200

    [BUGFIX] asset_path for logo on splash screen

commit d62f50d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 9 15:58:57 2014 +0200

    [DOMINA] updated feature_tasks.yml

commit 5f19a4f
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Apr 9 15:34:13 2014 +0200

    Make sure the tmp directory exists.

commit 5782e46
Author: nadjaweisskopf <nadja.weisskopf@zhdk.ch>
Date:   Wed Apr 9 15:09:59 2014 +0200

    [#69177404] Software-Inventarliste

commit 35bb973
Author: nadjaweisskopf <nadja.weisskopf@zhdk.ch>
Date:   Wed Apr 9 14:51:26 2014 +0200

    [#69176406] SW-erstellen

commit 25e959c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 16:39:55 2014 +0200

    [FIX] remove duplicate ids from ajax params

commit f9059de
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 15:36:57 2014 +0200

    [TEST] remove binding.pry

commit b37af10
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 14:45:00 2014 +0200

    [DOMINA] updated diverse_features.yml

commit 157b939
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 14:40:32 2014 +0200

    [FIX] localize suspended_until only if present

commit c3f377c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 13:33:46 2014 +0200

    [DOMINA] add space in commands

commit c5bdea7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 13:32:35 2014 +0200

    [RAKE FIX] generate structure with views with db drop create and migrate

commit 404e3f8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 12:03:19 2014 +0200

    update structure_with_views.sql

commit d47d1ff
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 11:30:55 2014 +0200

    [FIX] asset_path for logo

commit a007d53
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Apr 8 10:45:54 2014 +0200

    Give a temp dir that makes sense.

commit 1c33f3c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Apr 7 17:05:02 2014 +0200

    [#68170636] hslu auth controller: don't give access rights to all pools automatically

commit f08bfe2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Apr 7 17:03:07 2014 +0200

    fix date format for suspended until

commit 586057b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Apr 7 16:44:15 2014 +0200

    fix translation for automatic access

commit a7ba0a5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Apr 7 16:40:37 2014 +0200

    [#68170636] rspec test for ldap controller

commit c206f81
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Apr 7 14:14:46 2014 +0200

    [#64817854] show settings instance address in contract

commit 485347e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Sun Apr 6 23:23:26 2014 +0200

    #68170636 fix wrong indentation

commit 01d4f7b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Sun Apr 6 22:59:14 2014 +0200

    #68170636 merging fs_automatic_access_ip for demo

commit 6d302f1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Apr 4 16:43:01 2014 +0200

    [DOMINA] make a new commit in order to bypass the unique execution id constraint

commit 7fde00a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Apr 4 16:32:20 2014 +0200

    [FEATURE #62691666] automatic suspension for late take backs

commit ab3010f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 2 16:31:38 2014 +0200

    [DOMINA] updated rspec_tasks.yml

commit cdd9eaf
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 2 14:57:39 2014 +0200

    remove binding.pry

commit b6fb261
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 2 14:38:55 2014 +0200

    [#33044661] test implemented

commit 58413aa
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 2 14:13:07 2014 +0200

    [#33044661] remove trailing comma and white space from user address in contract

commit 4353fbf
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 2 12:25:28 2014 +0200

    upgrading to Rails 4.0.4, upgrading gems and fixing ci

    Squashed commit of the following:

    commit a6749d983cd5ddcaf96b953b60c08d0a2cab74f8
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Apr 2 12:24:54 2014 +0200

        [FIX CI]

    commit 8e975bb
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Apr 1 16:54:09 2014 +0200

        [FIX CI] capybara dom

    commit d753fe6
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Apr 1 16:49:26 2014 +0200

        [FIX CI] jump to the next availability change date

    commit 3a5b6f8
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Apr 1 14:43:40 2014 +0200

        downgrade font-awesome-rails gem and removing thin gem

    commit 482086d
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Mar 31 18:39:36 2014 +0200

        downgrade jquery-rails gem

    commit d3e74d5
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Mar 31 18:31:47 2014 +0200

        removing deprecation warning

    commit ce99fab
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Mar 31 18:21:15 2014 +0200

        downgrade jquery-rails gem

    commit fcccfc2
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Mar 31 18:13:34 2014 +0200

        downgrade paperclip gem

    commit 15f904f
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Mar 31 18:03:14 2014 +0200

        upgrading to Rails 4.0.4 and upgrading gems

commit bc256c2
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Mar 31 17:24:31 2014 +0200

    [BUGFIX] upgrading to Rails 4: asset precompile for simile timeline

commit 331cfff
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Mar 31 15:37:09 2014 +0200

    Revert "[BUGFIX] proper precompilation of timeline assets"

    This reverts commit 2455ff9.

commit 2455ff9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Mar 31 15:09:01 2014 +0200

    [BUGFIX] proper precompilation of timeline assets

commit 4ea6831
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Mar 27 16:34:42 2014 +0100

    Making LDAP config path configurable again.

commit 3ae9a5b
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Mar 27 10:40:42 2014 +0100

    More solid error messages, hardcoding LDAP config file location.

commit 4263332
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Mar 26 15:22:41 2014 +0100

    Add secret key base.

commit c18400c
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Mar 26 14:53:45 2014 +0100

    Cleaning up some dead code.

commit 4e240be
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Mar 26 14:50:16 2014 +0100

    Working generic LDAP adapter.

commit 743a6a6
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Mar 26 13:56:28 2014 +0100

    Generic LDAP controller works, TODO: admin group membership.

commit 8acd71d
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Mar 25 17:32:11 2014 +0100

    Forgot that file.

commit feab77b
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Mar 25 17:14:40 2014 +0100

    No need to list port twice.

commit 6fe1d8c
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Mar 25 17:06:57 2014 +0100

    LDAP, wheeee.

commit 41c5b1d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Mar 28 16:48:34 2014 +0100

    [TEST] make model factory use better Faker names

commit 63db7c0
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Mar 28 11:05:19 2014 +0100

    Drop Faker in production.

commit f5a16e4
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Mar 28 10:13:43 2014 +0100

    Removing deprecation warning about i18n.

commit 0d35e42
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Mar 27 17:49:53 2014 +0100

    Deploy using Ruby 2.1.0 in production.

commit 30605a9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Mar 27 15:45:36 2014 +0100

    [FIX CI] features/examples/geraetepark_grundinformationen3.feature:30 @upcoming

commit d120ba0
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Mar 27 15:42:10 2014 +0100

    Config linking: Damn, you so stupid.

commit a743f95
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Mar 27 13:32:33 2014 +0100

    [DEPRECATION] update secret token

commit e642a1d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Mar 27 12:44:51 2014 +0100

    [FIX CI] comment out not yet implemented steps

commit 10824a4
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Mar 27 12:18:28 2014 +0100

    [DEPRECATION] act-as-dag gem from github with rails4 patches

commit ce8c7eb
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Mar 27 10:32:09 2014 +0100

    [DEPRECATION] change count(distinct: true) to distinct.count

commit 2bc1807
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Mar 27 10:08:36 2014 +0100

    [DEPRACATION] default scope uses block instead of lambda

commit 8c055b9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Mar 26 18:04:27 2014 +0100

    [#64817854] partial test implementation

commit dbae923
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Mar 26 15:48:22 2014 +0100

    That option shouldn't be necessary anymore.

commit b990cb1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Mar 26 14:11:54 2014 +0100

    [#68186532] adjusted error message
  • Loading branch information
@nimaai
nimaai committed Apr 9, 2014
1 parent 421aa88 commit 688680d
Show file tree
Hide file tree
Showing 87 changed files with 1,235 additions and 857 deletions.
37 changes: 18 additions & 19 deletions Gemfile
View file
@@ -1,18 +1,19 @@
source 'http://rubygems.org'

gem 'rails', '4.0.3'
gem 'rails', '4.0.4'


gem 'active_hash', '~> 0.9'
gem 'active_hash', '~> 1.3'
gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
gem 'acts-as-dag', '~> 3.0' # TOOD use instead ?? gem 'dagnabit', '2.2.6'
gem 'acts-as-dag', :git => 'https://github.com/jheiss/acts-as-dag.git', :branch => 'rails4' # TOOD use instead ?? gem 'dagnabit', '2.2.6'
gem 'barby', '~> 0.5.0'
gem 'better_errors', :group => :development
gem 'binding_of_caller', :group => :development
gem 'capistrano', '~> 2.15', :group => :development
gem 'capistrano-ext', :group => :development
gem 'rvm-capistrano', :group => :development

gem "jasminerice", :git => 'https://github.com/bradphelan/jasminerice.git', :group => [:test, :development] # needed for implement coffeescript, fixtures and asset pipeline serverd css into jasmine
gem "rack_session_access", "~> 0.1.1", group: :test
gem 'capybara', '~> 2.2', :group => [:test, :development]
gem 'capybara-screenshot', :group => [:test, :development]
gem 'chunky_png', '~> 1.2'
Expand All @@ -23,35 +24,35 @@ gem 'compass-rails', '~> 1.1'
gem 'cucumber-rails', '~> 1.3', :group => [:test, :development], :require => false
gem 'database_cleaner', :group => [:test, :development]
gem 'execjs'
gem 'factory_girl', '~> 4.1' # factories also in production mode to seed our demo data on the demo server
gem 'factory_girl_rails', '~> 4.1'
gem 'faker'
gem 'font-awesome-rails', '~> 3.2.1'
gem 'factory_girl', '~> 4.1', :groups => [:test, :development]
gem 'factory_girl_rails', '~> 4.1', :groups => [:test, :development]
gem 'faker', :groups => [:test, :development]
gem 'font-awesome-rails', '~> 3.2.1' # NOTE in order to upgrade to '~> 4.0', use .fa css class instead of .icon
gem 'geocoder', '~> 1.1'
gem 'gettext_i18n_rails', '~> 0.8'
gem 'guard-jasmine', '~> 1.11', :group => [:test, :development]
gem 'gettext_i18n_rails', '~> 1.0'
gem 'guard-jasmine', '~> 1.19', :group => [:test, :development]
gem 'haml', '~> 3.1'
gem 'haml_assets', '~> 0.2'
gem "jasminerice", :git => 'https://github.com/bradphelan/jasminerice.git', :group => [:test, :development] # needed for implement coffeescript, fixtures and asset pipeline serverd css into jasmine
gem 'jquery-rails', '2.1.3' # '~> 2.1' FIXME the version 2.1.4 clashes with underscore-rails 1.4.2.1
gem 'jquery-rails', '2.1.3' # '~> 2.1' FIXME the version 2.1.4 clashes with underscore-rails 1.4.2.1 + # NOTE in order to upgrate to '~> 3.1', first adapt the code removing the .live() functions
gem 'jquery-tmpl-rails', '~> 1.1'
gem 'jruby-openssl', :platform => :jruby
gem 'json', '~> 1.8'
gem 'jsrender-rails', '~> 1.2', :git => 'https://github.com/spape/jsrender-rails.git', :branch => 'own_template_prefix'
gem 'ladle', :group => :test
gem 'launchy', '~> 2.1', :group => [:test, :development]
gem 'meta_request', :group => :development
gem 'mini_magick', '~> 3.4'
gem 'mysql2', '~> 0.3.11', :platform => :mri
gem 'net-ldap', '0.2.2', :require => 'net/ldap' # Never upgrade beyond 0.2.2, ruby-net-ldap has broken in many unpredictable ways. Wait for 1.0.0 before upgrading, at least 0.2.2 works.
#gem 'net-ldap', '0.2.2', :require => 'net/ldap' # Never upgrade beyond 0.2.2, ruby-net-ldap has broken in many unpredictable ways. Wait for 1.0.0 before upgrading, at least 0.2.2 works.
gem 'net-ldap', :require => 'net/ldap'
gem 'newrelic_rpm', '~> 3.5', :group => [:profiling, :development]
gem 'paperclip', '~> 3.5'
gem 'paperclip', '~> 3.5' # NOTE in order to upgrate to '~> 4.0', first adapt the code to avoid the Paperclip::Errors::MissingRequiredValidatorError
gem 'phantomjs', '~> 1.9.7', :group => [:test, :development] # headless webdriver (UI & JS tests)
gem 'poltergeist'
gem 'protected_attributes', '~> 1.0'
gem 'pry', :group => [:test, :development]
gem 'pry-debugger', :group => :development
gem 'pry-rails', :group => [:test, :development]
gem 'protected_attributes', '~> 1.0'
gem "rack_session_access", "~> 0.1.1", group: :test
gem 'rails_autolink', '~> 1.0'
gem 'rake' # So that cronjobs work -- otherwise they can't find rake
gem 'redcarpet', :group => [:test, :development] # This isn't being pulled in by yard, but it's required
Expand All @@ -65,12 +66,10 @@ gem 'selenium-webdriver', :group => [:test, :development]
gem 'simplecov', :require => false, :group => :test
gem 'therubyracer', :platform => :mri
gem 'therubyrhino', :platform => :jruby
gem 'thin', :group => :development, :platform => :mri # web server (Webrick do not support keep-alive connections)
gem 'timecop', '~> 0.7', :group => [:test, :development]
gem 'trinidad', :group => :development, :platform => :jruby # web server (Webrick do not support keep-alive connections)
gem 'uglifier', '~> 2.4'
gem 'underscore-rails', '~> 1.4'
gem 'underscore-rails', '~> 1.6'
gem 'uuidtools', '~> 2.1' # needed for creating unique ids during tests (factories)
gem 'will_paginate', '~> 3.0'
gem 'yard', :group => [:test, :development]

0 comments on commit 688680d

Please sign in to comment.