[#74113684] refactoring inventory filters

Squashed commit of the following:

commit a2e83ea2e80d982c39ec186fefb3c43c9718fe2f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 12 15:31:59 2014 +0200

    split up tab tests

commit b290b739578e258e6e1e3f63442f68053f798218
Merge: d598aeb ae7d6bc
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 12 15:23:18 2014 +0200

    Merge branch 'master' into mk_74113684_inventory_filters

    Conflicts:
    	Gemfile
    	app/models/item.rb
    	cider-ci/tasks/cucumber_scenarios.yml
    	features/examples/inventar.feature
    	features/personas/dumps/minimal_seed.sql
    	features/step_definitions/examples/gegenstand_editieren_steps.rb
    	features/step_definitions/examples/gegenstand_erstellen_steps.rb
    	features/step_definitions/examples/inventar_steps.rb
    	features/step_definitions/web_extra_steps.rb
    	spec/controllers/ldap_controller_spec.rb

commit d598aebea89a72daa944b83bf330b9e52fd5b218
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 12 15:14:18 2014 +0200

    [FIX CI] inventar.feature

commit d7a4d3942876544b3e98b242e1bf9141731be388
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 12 12:19:19 2014 +0200

    fix merge typo

commit 3bbba5f7414757f771cc8cb452e928e97ac8622d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 12 12:10:27 2014 +0200

    squash merge master

    Conflicts:
    	Gemfile.lock
    	app/models/item.rb
    	app/views/documents/picking_list.html.haml
    	cider-ci/tasks/cucumber_scenarios.yml
    	features/examples/inventar.feature
    	features/examples/ruestliste.feature
    	features/personas/dumps/minimal_seed.sql
    	features/step_definitions/examples/aushaendigung_steps.rb
    	features/step_definitions/examples/gegenstand_editieren_steps.rb
    	features/step_definitions/examples/gegenstand_erstellen_steps.rb
    	features/step_definitions/examples/inventar_steps.rb
    	features/step_definitions/languages/de_steps.rb
    	features/step_definitions/web_extra_steps.rb
    	spec/controllers/ldap_controller_spec.rb

commit 24ee5acdb3c7ea9b67f4612488443bda716c4202
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 12 11:59:11 2014 +0200

    split select tests due to timeout

commit 70f0b6744081cd8dfef34edaf7d13e304786ee23
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 12 11:49:25 2014 +0200

    test for responsible filter

commit 2d75f341437dd99700a2dda5bcc972947f298f20
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 12 11:48:50 2014 +0200

    commit updated Gemfile.lock

commit 777eaecc0037eb876849641da92728891b126cab
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 12 10:06:48 2014 +0200

    add ruby racer back to gemfile due to failing deploy

commit 9e7e4fd3693eb74119ea041d93f2849fc33e6240
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 12 09:57:06 2014 +0200

    fix ci: add @firefox tag

commit 1e87192290544ebaae744ace76635230ccb948f9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 12 09:33:37 2014 +0200

    fix typo

commit a02f5befad145d85ebf63814b2b072118ff255ac
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 12 09:29:44 2014 +0200

    squash merge of master & prepare test

    Conflicts:
    	app/models/item.rb
    	cider-ci/tasks/cucumber_scenarios.yml
    	features/borrow/suche.feature
    	features/examples/gegenstand_editieren.feature
    	features/examples/inventar.feature
    	features/examples/inventar_csv.feature
    	features/examples/probleme.feature
    	features/examples/ruestliste.feature
    	features/personas/dumps/minimal_seed.sql
    	features/step_definitions/examples/ausleihe_steps.rb
    	features/step_definitions/examples/gegenstand_editieren_steps.rb
    	features/step_definitions/examples/gegenstand_erstellen_steps.rb
    	features/step_definitions/examples/inventar_steps.rb
    	features/step_definitions/languages/de_steps.rb
    	features/step_definitions/manage/hand_over/sign_contract_steps.rb
    	features/step_definitions/manage/take_back/edit_take_back_end_date_steps.rb
    	features/step_definitions/web_extra_steps.rb
    	spec/controllers/hslu_ldap_controller_spec.rb
    	spec/controllers/ldap_controller_spec.rb

commit bb25c1d413099d2cfa2358b2273e000c803fa8e5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Aug 11 16:57:15 2014 +0200

    fixing ci

commit 6a2be43153ee94cdeb240cfb585cee11ff99adde
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Aug 11 15:39:40 2014 +0200

    test prepare

commit 2d2fb7cc8075b3e3aa1b18d12a4dae6d9e17eded
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Aug 11 15:38:08 2014 +0200

    new step for scrolling

commit d0f012f01d673895b40bed3687f54eb2df1d344d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Aug 11 15:37:58 2014 +0200

    tests

commit 2837061dc90e04deeac4ffb62cf0c4c06bc6dfab
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Aug 11 15:37:51 2014 +0200

    new scope for model.rb

commit 3ce883e2b2e4ddbd3639bd44d85838d7b968ad14
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Aug 8 17:18:11 2014 +0200

    tests wip

commit 1a64194b4bf383dc8de7c00d21c5ff17d8ddf9dd
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Aug 8 17:01:40 2014 +0200

    inventory tests WIP

commit d74754bd72028de569338b4c61ad500a634955a7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Aug 8 13:46:51 2014 +0200

    FIX CI: various tests

commit 0351703aefb5b29d1f92334b43431681053508f5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Aug 8 13:46:35 2014 +0200

    fix fetch_item in items controller

commit 2eed58ee1fbf336d797d47d4e8f3c7524d3939ce
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Aug 8 11:42:11 2014 +0200

    fix indentation

commit 57b7d215d0c86236fc53b1560a163481e92011ff
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Aug 8 11:41:57 2014 +0200

    fix retired param in hand over ajax call

commit bbb515b758d496d4f0535717e192d282cb65f689
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Aug 8 11:24:56 2014 +0200

    [FIX CI] software_loeschen.feature

commit ee92ecf96e593d2441d1181f858849e5ca710238
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Aug 8 11:06:53 2014 +0200

    squash merge of upcoming branch

    Conflicts:
    	features/examples/inventar.feature
    	features/examples/inventar_csv.feature
    	features/step_definitions/examples/gegenstand_editieren_steps.rb
    	features/step_definitions/examples/gegenstand_erstellen_steps.rb

commit cbc32df614349a67c425aeb455ad58f258f390bc
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Aug 8 10:56:10 2014 +0200

    fix syntax error

commit 9b5d9643a0fdd74c5331008dabe9dc0e2626bdb1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Aug 8 10:25:42 2014 +0200

    Revert "[FIX CI] attachment/image factory"

    This reverts commit 551e56cab885d9f8ae3b6b756b6b6ba49b4e42fc.

commit de33b7d4d475907edb4db421b19755a6c470cef4
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Aug 8 09:58:19 2014 +0200

    fix ci: retired: true/false

commit a53fe9464b0882615a2c5804d7c751ed974ba911
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 7 17:20:11 2014 +0200

    default not retired

commit 5802f3a7899f8b2600d5216f92071a111d22f521
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 7 17:12:17 2014 +0200

    retired as select box & reordering of filters

commit 551e56cab885d9f8ae3b6b756b6b6ba49b4e42fc
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 7 16:21:30 2014 +0200

    [FIX CI] attachment/image factory

commit a474603f23f531bfcd84afb96d2600ae9da14bd9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 7 13:00:53 2014 +0200

    [FIX CI] retired filter in feature

commit 6f7ded0ed14b61b20a88c3f4b48814b94e853642
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 7 11:53:04 2014 +0200

    [FIX CI] yet another @firefox

commit 0a5a041a3750f8a1bdd04712cfd7693e1bd609df
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 7 11:50:16 2014 +0200

    [FIX CI] gegenstand_editieren.feature @firefox

commit 29c227b880298a2e00ba36c80965f9a71174ccd7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 7 11:37:33 2014 +0200

    [FIX CI] gegenstand_editieren.feature

commit 8f7257e91ab3aea17f79c1c798c7cd7d7cf6c5a8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 7 11:14:07 2014 +0200

    [FIX CI] one @firefox tag more

commit e3b6521386d2ebd98ace7c4d017d4211707a7bc0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 7 10:55:26 2014 +0200

    [FIX CI] adding @firefox to scenarios

commit 7f50b12a6689bc885613a5932613fb492016026e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 7 10:27:23 2014 +0200

    [FIX CI] unused models filter

commit bc67ecea13c444ec89b02026e8b42d83805a9aa9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 6 16:57:23 2014 +0200

    fix borrowable models in explorative add in hand over

commit 452e51f30a65fc3131931fa7e1fc34c7f78bafc4
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 6 16:29:08 2014 +0200

    Squashed commit of master:

    commit 7a1a60ee26b9b5cca24b8eb01bfca64e3cfc665c
    Merge: 0c3d769 885f170
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Aug 6 09:49:26 2014 +0200

        Merge branch 'upcoming' of github.com:zhdk/leihs

    commit 885f1708a878c1ca1919cc4ebd5caf701c3d98b7
    Author: Nadja Weisskopf <nadja.weisskopf@zhdk.ch>
    Date:   Tue Aug 5 17:13:50 2014 +0200

        no message

    commit ea3b9f0ff07afe5610aac869ea40981548479e5e
    Author: Nadja Weisskopf <nadja.weisskopf@zhdk.ch>
    Date:   Tue Aug 5 17:12:16 2014 +0200

        [#74932978] Felder für den CSV-Export

    commit 95eada100134804adc5ac9b76e2ef9868ddc27f7
    Author: Nadja Weisskopf <nadja.weisskopf@zhdk.ch>
    Date:   Tue Aug 5 17:11:10 2014 +0200

        [#74113684] Neue Inventarliste

    commit 47c28e2101df87dede26f3410b18d1f2eb15a07e
    Author: Nadja Weisskopf <nadja.weisskopf@zhdk.ch>
    Date:   Tue Aug 5 17:00:37 2014 +0200

        [#61566024] Suche in Borrowbereich mit Leerzeichen in Modellnamen

    commit 0c3d769a01eb8fc6eaa0489b15353fc46758ba0a
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Aug 5 16:52:31 2014 +0200

        [#75875856] [#75805622] optimizing picking list

        Squashed commit of the following:

        commit f73ce262ac035a27195272b8c5ea0cf40edd9a85
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Tue Aug 5 16:51:41 2014 +0200

            [FIX CI]

        commit 2ce071989b187cb3e51ada4299b1d2dd151510a0
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Tue Aug 5 16:12:57 2014 +0200

            [FIX CI]

        commit ced68fa4c852d17f774d7add7c4cb3e33a4e2ae6
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Tue Aug 5 11:54:20 2014 +0200

            [FIX CI]

        commit 1e842f9323a322c1105369e7bf235b81c9517d07
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Tue Aug 5 10:43:20 2014 +0200

            ItemLine validation, Model#find_by_name, fixing contract_line factory

        commit 199277e3293ce4d0e310de4019f02f1abf2ba5c8
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Mon Aug 4 18:30:40 2014 +0200

            tagging failing scenarios on CI, not reproducible locally

        commit 6e9d422a845b3bb8477858a455f828beb1868820
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Mon Aug 4 17:10:01 2014 +0200

            [FIX CI]

        commit 3a2e777af302a131d0e1c988d6a95e02a90caa75
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Mon Aug 4 16:59:24 2014 +0200

            [FIX CI]

        commit e0e9a3569e86ac53f85234903ff4682a9e942fcd
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Mon Aug 4 14:56:46 2014 +0200

            @current_inventory_pool instead of @ip

        commit e7ea0acfc20860d8037d50a58b245dc81cbf5901
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Mon Aug 4 12:49:18 2014 +0200

            removing @firefox tag where not needed

        commit 66933e5db394b8a4cfd799dc2c91cc80e89677ff
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Mon Aug 4 12:16:03 2014 +0200

            assertion syntax (expect instead of should)

        commit e63396ca4534eebf422948857afa2636bd827117
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Mon Aug 4 12:04:25 2014 +0200

            (wip) @current_inventory_pool instead of @ip

        commit e9ac26af7283803785ca4d8241574e647460c24f
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Mon Aug 4 11:36:24 2014 +0200

            describe spec with type request and use plain string path

        commit 1204b7c1434a2e18daf1e6753907c19864cab6d7
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Mon Aug 4 11:10:02 2014 +0200

            picking list optimization

        commit 4fe7d850059a3d0fd0e12b84ada55286fc8dfa18
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Thu Jul 31 16:40:03 2014 +0200

            removing unused gems (just a try)

        commit 0e78cb7e3420744966f4d1f93065c7e9b1fc2081
        Author: Franco Sellitto <franco.sellitto@zhdk.ch>
        Date:   Thu Jul 31 16:04:25 2014 +0200

            (wip) picking list optimization

    commit e438b6cddab6f28b40ee0795a83ebe60bd158f2b
    Author: Nadja Weisskopf <nadja.weisskopf@zhdk.ch>
    Date:   Mon Aug 4 11:26:14 2014 +0200

        [#74932978] Alle Gegenstandsfelder innerhalb Gerätepark exportieren

    commit 24da84ae1aab97b8a18aec4f923b4f4ea50a77bb
    Author: Nadja Weisskopf <nadja.weisskopf@zhdk.ch>
    Date:   Mon Aug 4 09:29:07 2014 +0200

        [#74113684] Redesign Inventarliste

commit 7958c3e6a1ccdcec85a5ab05c0c77ca4043aefba
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 6 16:28:05 2014 +0200

    [FIX CI] still software features...

commit 8bd39c9ecee59fa00dfc5a29789ee66c1b9cec3d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 6 16:08:43 2014 +0200

    [FIX CI] software features

commit 34796816b9580684e9518402123b50cdff4e449e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 6 15:24:26 2014 +0200

    fix model filter attachments

commit a256c1e3bdec24832febcc85c085ede1311af7af
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 6 10:35:12 2014 +0200

    fix model filter

commit 9dce8a77a760734ca4e95d9fa99498254a8e1172
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Aug 5 15:48:05 2014 +0200

    MERGE BRANCH: split models & filters

commit c2bb42024173a81c2b51dd7fc3e3a69c800fc2b8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Aug 4 10:57:44 2014 +0200

    is borrowable param session value

commit 76fb5a0fcefe7a21b64186043a00a41d9e1b22d4
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Aug 4 10:54:01 2014 +0200

    used param session value

commit 25987ff9c4344036805504a7773f4da480614c94
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Aug 4 10:42:07 2014 +0200

    upper row filters are broader now

commit c6225a5f02fa288d6daf059f6c2adde467f56fb2
Merge: 1dd1ed0 f6bc392
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 16:13:15 2014 +0200

    Merge branch 'master' into mk_74113684_inventory_filters

commit 1dd1ed0886794a6d212e2a69955deb9c17e1d425
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 15:22:59 2014 +0200

    fix software filter not to include options

commit 7f8e1b8b89cf983cddd2500894dbab326cd10dcd
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 15:18:21 2014 +0200

    change index tabs filters

commit c5e0e3d6812d05de463d219c720f4d954b0d34ef
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 15:12:34 2014 +0200

    borrowable -> is_borrowable in haml

commit fc05eb49d820a1435098dfdf139c9d341e6ff477
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 15:12:17 2014 +0200

    refactor / simplify / comment filters & inventory action

commit eff674d642abe964cdc7d4f85fd15fa66371c994
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 15:10:41 2014 +0200

    remove forgotten unretired from coffee controller

commit 5fc88684585db566f144e6da018249f60d9f8f8b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 12:17:56 2014 +0200

    refactor Model.all and software filter in model filter

commit 5205225c2de7355432d5194ce56fe2a54dae7563
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 12:07:01 2014 +0200

    refactor borrowable param in model filter

commit f00b7f771cf2e30eea3d5639555594df42cbe1de
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 11:53:01 2014 +0200

    refactore unused / used param in model filter

commit a1ca09780e38e8626e2a3a1bae550c0623f62fa8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 11:52:38 2014 +0200

    remove default unretired = true from coffee controller

commit 99c7ee462bd9f11444310d08c4c3d93d883cd417
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 11:52:04 2014 +0200

    change active to used in haml

commit 7098a5a1102feaf5da3342e983283c43619fd7fc
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 11:51:49 2014 +0200

    borrowable / unborrowable translations

commit a896478768e3f5418c371d2889b14f0e9def5290
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 11:32:09 2014 +0200

    fix retired checkbox

commit a65117cbf465fb869945a0dfe690e459c51118ff
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 11:29:36 2014 +0200

    remove unretired from item filter

commit 1c9239bbdf2f4eb76f532e46063c135c4ec1ac37
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 11:26:23 2014 +0200

    fix Item.all

commit 814238677351ed7f60476ceeb17f1f489a7f7135
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 11:22:51 2014 +0200

    remove unscoped from item.rb

commit 00f9dc57de1b62b855177919ee254ccb9c3b8329
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jul 31 10:11:59 2014 +0200

    fix value = empty string

commit 1dcf1e5f2fcf57f69c0c685610010b5b07bfc4ff
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jul 30 17:46:58 2014 +0200

    reorganized filters in html
[#75871106] prevent duplicated or blank suppliers
ganerate cucumber json reports on Cider-CI
Merge branch 'upcoming' of github.com:zhdk/leihs

Conflicts:
	features/examples/inventar.feature
[#75898268] clickable dropdown for inventory pool selection

Squashed commit of the following:

commit 3c9b00230a9d2d5427b400e58b899dc0fda8440d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 14 13:25:10 2014 +0200

    styleguide adaptation

commit 1158db08cd4f583302283ef15733e5592ee22cdf
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 14 13:25:01 2014 +0200

    add icon color black style

commit a4de449520345320d8a94dad9be521dfcf906b76
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 14 13:24:47 2014 +0200

    more reusable class name .bs-dropdown-holder

commit 445c0aae3f3d3843db62138080c9007c9ecd1ec0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 14 12:57:21 2014 +0200

    icon

commit 570128d5451cce621c3686eba1ad0d0cf59c01e1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 14 11:11:35 2014 +0200

    test prepare

commit 481bac64a408b21f3d125945b827ac481db28b21
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Aug 14 10:50:10 2014 +0200

    [FIX CI] inventar.feature & speed up toggler

commit cb94bf105b7ad60f15c9ca909b0f1b87af47db96
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 13 16:34:24 2014 +0200

    test prepare

commit a713e5058dfa3a0e31db0094a622d6a83e83dcc5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 13 16:27:26 2014 +0200

    fix ci

commit e80aeecaf05bae5eb969bbaf5d35a44e9a45c668
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 13 15:57:07 2014 +0200

    second test

commit 193725d75b3fcb600d8f702fd1867307c445dd9c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 13 15:41:01 2014 +0200

    first test

commit 71e3e190878b6b378e5ad46e456cdbae7a1e55df
Merge: 38130e3 14bffb4
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 13 15:14:28 2014 +0200

    Merge branch 'master' into mk_clickable_dropdown

commit 38130e37a1aa1ce91f78a78b53868d135969ccde
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 13 13:51:15 2014 +0200

    bs dropdown for ip selection

commit 3d867aad725538c2392b44ef67a4995da8412cda
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Aug 13 13:51:03 2014 +0200

    bootstrap dropdown integrated to leihs
[#75871106] testing suppliers

Squashed commit of the following:

commit 64ae4ebb8f51d86897ef66790860563c7dc93de3
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Aug 14 19:31:24 2014 +0200

    testing suppliers
[#74932978] testing csv export

Squashed commit of the following:

commit bc1680c92d242e522bd9c00adefc3a122b2afedb
Merge: 5c0b05b 0596b1a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Aug 15 12:37:53 2014 +0200

    Merge branch 'master' into fs_csv

    Conflicts:
    	cider-ci/tasks/cucumber_scenarios.yml
    	features/personas/dumps/minimal_seed.sql

commit 5c0b05b87f579a0b1483503d386eb33ecf9c9b53
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Aug 14 18:45:19 2014 +0200

    testing csv export
personas dumps
[FIX CI]
Removing rspec, porting LDAP tests to Cucumber.

Squashed commit of the following:

commit f8b467ce92268c3be0e107e36d1be0da1d83f085
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Aug 15 16:44:14 2014 +0200

    Updating CI.

commit 66fbad553e51b90f024a91410e0349e2643e812b
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Aug 15 16:11:41 2014 +0200

    Trying to clean up Cider CI configs.

commit aca4242212be4f800601a57bb407287daaebfa96
Merge: ee542b0 aded666
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Aug 15 15:53:24 2014 +0200

    Merge remote-tracking branch 'origin/master' into rca_rspec_to_cucumber

commit ee542b043d1e268cab3c3577c10d5b170b30e67c
Merge: 4d321fa e1cbae3
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Aug 15 15:13:21 2014 +0200

    Merge remote-tracking branch 'origin/master' into rca_rspec_to_cucumber

commit 4d321fa096ae3575be518160b0429e6e71419f77
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Aug 15 15:00:40 2014 +0200

    Exclude rspec (it doesn't exist anymore)

commit cc31e6fe911dc3e6f838ac3f57f5b7a1e9874603
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Aug 15 15:00:25 2014 +0200

    HSLU LDAP tests ported to Cucumber.

commit b875fab1e11abd532a7d5fb78bf324f983a1caac
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Aug 14 17:01:13 2014 +0200

    Removing rspec from Cider execution.

commit 32003c1cf0f6c10a6e0522b26aad3e021e1540bf
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Aug 14 16:59:01 2014 +0200

    New location for LDAP config files during testing.

commit 18cee39392ee511f6b721a33839aede75e8d08f1
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Aug 14 16:55:15 2014 +0200

    Ported LDAP tests from Rspec to Cucumber.
[#75876928] in inventory list, display packaged items on root

Squashed commit of the following:

commit 5caa0abeda985bab4cb44d39eeb6ff6c76b8af2b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Aug 18 12:00:04 2014 +0200

    displays packaged items
ensure factory uniqueness
[#74948186] editing category