[FIX CI] modell5.feature lazy load request problem
Merge branch 'master' into next
[#68517412] FIX: dont allow to change start date for option lines in case of take back

Squashed commit of the following:

commit 6b84a092aa3f32d6f88f34e0445a2666bc4fed01
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Apr 25 16:26:50 2014 +0200

    test for not allowing to change start date for option lines in case of take back

commit 666d27d843ef4ad24dc5d79ea2b7c2ae289d28b7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 23 13:24:44 2014 +0200

    FIX: dont allow to change start date for option lines in case of take back
[#68517412] migration fixing signed contracts
[FEATURE #69176406 #69177404] create software & software inventory list

Squashed commit of the following:

commit 3a6a5f7365e94346159b53abc1c5fc4055729317
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 29 10:49:37 2014 +0200

    [FIX CI] performance_stability.feature

commit 53e3d914955c0470548771db8b3b7e176d7a7920
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 29 10:49:11 2014 +0200

    fix for models package dialog and fetching flexible fields for item

commit ef4f88c48fc21b983649f39dbbecb0e459e229d6
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 29 10:03:55 2014 +0200

    [FIX CI] inventarhelfer3.feature

commit d98d3c9c8ad9eb506cb1c3faf74f882015382ff3
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Apr 28 13:14:35 2014 +0200

    tests for sofware inventory list

commit db5b466510c1504940f59cc407b9b3584a0d91bb
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Apr 28 11:34:58 2014 +0200

    software tab in inventory page

commit 7f5e4ebaddad774d628ea3c637fa5978d130bd54
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Apr 24 15:48:24 2014 +0200

    [cider] updated feature_tasks.yml

commit 606e19911528d604976b49bd6c6b402b8d13e217
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Apr 24 14:19:33 2014 +0200

    software & license line finished

commit af171986839b5a295cb42fdc4c5b3ee2066b7837
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Apr 24 12:19:01 2014 +0200

    finish proper display of software and license line in inventory list

commit 6c93a67fb0ff1e9cfb4e71753eb350179f32e213
Author: nadjaweisskopf <nadja.weisskopf@zhdk.ch>
Date:   Wed Apr 23 15:47:56 2014 +0200

    Update software_editieren.feature

commit 671b1ac89a6b1673a800a6446f408d4bbc60d788
Author: nadjaweisskopf <nadja.weisskopf@zhdk.ch>
Date:   Wed Apr 23 15:44:01 2014 +0200

    [#70003774] SW editieren

commit 323b030c5a77e57cbe762c40d14159ad69a56d9f
Author: nadjaweisskopf <nadja.weisskopf@zhdk.ch>
Date:   Wed Apr 23 15:15:01 2014 +0200

    [#70003470] Ausleihbar/Nicht ausleihbar

commit 83e50c45c7e6786ef86d3c585e236036035787f5
Author: nadjaweisskopf <nadja.weisskopf@zhdk.ch>
Date:   Wed Apr 23 14:58:09 2014 +0200

    [#69176406] Additional Fields

commit 161ab22593b75fe4251d2960b103a0b7d763d8b2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 23 12:09:55 2014 +0200

    proper dealing with software in inventory index WIP

commit ce6c99a583eddd245cf5e1fad61e28b87f5adca2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 23 12:09:35 2014 +0200

    fix copy items

commit 5575bd10c5866fd2a1399de54b238bc3e61565eb
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Apr 17 17:33:54 2014 +0200

    software.coffee and all related fixes for inventory view

commit 5a2c3892e72d741e71d17483d9203e4c7efb086e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Apr 17 17:02:34 2014 +0200

    creating and testing new software

commit 580827a95670070c02b04152bea2fb2140c7e00a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Apr 17 16:15:06 2014 +0200

    small fix

commit d3cd05f61a36aee584b6404f19fb052fc7b748e7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Apr 17 15:39:22 2014 +0200

    Item#type

commit 704a6b3a6834c9e93ebe42677b8c71c05bb7b5e0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Apr 17 14:22:39 2014 +0200

    introducing Software model as subclass of Model model

commit c2b10013a21263ea5be89bffa419e920356e9255
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Apr 17 13:50:15 2014 +0200

    activation type & license type as properties

commit c5bf3189449de95cc5f3312f34a3568d80bb38b7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Apr 17 13:49:59 2014 +0200

    translations

commit 441b08b7b9893ad4fd176da0ce060d09aa2f5c4f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Apr 17 13:07:24 2014 +0200

    create new software model

commit 42f2700fae458e0c08ba48eb88191ab364cbd926
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 16 18:08:40 2014 +0200

    create new software license - first working frontend draft

commit ab12f6bdea0b11c06354358e51d24c8d48818bab
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 16 17:08:59 2014 +0200

    updated feature tasks yml

commit b1fe183b18023011335fa068c3dc0024e781a0c2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 16 17:06:51 2014 +0200

    fix tests

commit 843348ae6656a0efaa1b5e33e3d79b4e92e5ff23
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 16 17:06:44 2014 +0200

    fix inventory field helper

commit 4502cbc03017f115a2cb6177acebcbdaaabdb7de
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 16 14:53:15 2014 +0200

    reuse content_for :title in view

commit 8fd685cb6c2a9deccfcbff1f82982db5a0f64bca
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 16 14:53:01 2014 +0200

    rename feature

commit 48b8294829beb9d33aefb6cb3f63ef457b72db21
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 16 14:52:48 2014 +0200

    target_type preparation for fields
[#70350718] merging feature files, optimizing tests and introducing benchmark

Squashed commit of the following:

commit 2d9ffef44fe488391935b7c2094bb632f39314c2
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 18:23:36 2014 +0200

    increase CI timeout to 10 minutes

commit 1f48d5437d370a0f4e7df4d79697d691a1e88fcb
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 18:12:24 2014 +0200

    separate test benchmark from routes_report

commit f7a1c6ffa6f3fedcd289d40b63ddc77a5a685857
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 18:11:14 2014 +0200

    reactivating @javascript tag just where needed

commit 0d24d4e5c72c0b026f7da04a8f8ab9a8be5ee595
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 18:11:02 2014 +0200

    removing deprecation warnings for Rails 4.1

commit 2493f9e81df90d59d0db6f615fe9e962f94a673f
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 18:10:16 2014 +0200

    decreasing test sleeps

commit 8f4f6469134792426f9e598e786e14f3e3d34ebd
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 16:56:30 2014 +0200

    decreasing test sleeps

commit ef072111ad58c32e485747683dbb65a536f3fecc
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 16:55:53 2014 +0200

    fixing tests

commit b29c4758bedfa6ac33edacadcdc6813fc5078ef0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 16:54:32 2014 +0200

    reactivating @javascript tag just where needed

commit ed13038f32e29caaca447983c570e35aacb40e34
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 13:47:35 2014 +0200

    introducing RoutesReport as class and defining thresholds for time delay

commit 92e76f9653ca4cced67440951a475c6ece8f0703
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 13:46:37 2014 +0200

    prevent clashing on factory

commit ba26f15111df29b2c3ed28b38f8db0b47294917a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 13:46:01 2014 +0200

    removing deprecation warnings for Rails 4.1

commit 931ef5fbd5bf149bf45ba588a78339f4cc6819fd
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 12:38:36 2014 +0200

    fixing typo and reactivating @javascript tag just where needed

commit 8b552a6f34e5fb901f2d73b1fbef77f7c142763b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 12:28:23 2014 +0200

    removing deprecation warnings for Rails 4.1

commit 3ac5b6e00a33f2608caf52bf3edc4753c521a787
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 12:26:52 2014 +0200

    reactivating @javascript tag just where needed

commit 55f99351c1e0f7f33ed91fe0ead07b767c09a8d1
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 12:26:37 2014 +0200

    removing unused code

commit d0d6fa08a5c6e736fbca73bac2bad645a04b7942
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 12:14:32 2014 +0200

    populating german steps dictionary

commit a19071eaf2cf5cdda67236530f8dfc620b5d9833
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 10:36:34 2014 +0200

    reactivating @javascript tag just where needed

commit d4416d720c1ee11739b90ff0e7b0bba77ce21aeb
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 16:53:46 2014 +0200

    reactivating routes_report and include test benchmark

commit 94890969e9afafe0b7f30e197642ab23bb5accaa
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 16:53:00 2014 +0200

    optimizing benutzerverwaltung steps

commit 8befc3d920e7e3121c54a1d9be8513af32ad3ab9
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 16:52:01 2014 +0200

    try test execution without @javascript tag

commit a712e3b85850c6fb671c0a79b7e3a23323a1e9f6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 15:03:13 2014 +0200

    trying raising timeout

commit 41e7e7da9f1d86a11a2c1d401d72e22b838da435
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 14:54:55 2014 +0200

    introducing german cucumber steps dictionary and mor simplifying persona steps

commit 66fd8922cc06b8960c0648e774d2e127f387b0e1
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 14:30:32 2014 +0200

    simplifying persona steps

commit d22128ce508c2390094815a0b26c564d324cb069
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 13:35:05 2014 +0200

    updating feature_tasks.yml

commit 114b13a85d714beb0ed86dca268418884d5f2355
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 13:31:29 2014 +0200

    merging back previously splitted feature files
Partial squash merge of mk_software_additional_fields

Squashed commit of the following:

commit 13d492637a2fd76b3d46cb4d51ec15bb61552fe0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri May 2 12:46:32 2014 +0200

    tests WIP

commit aa5607a0ffb23c225fa4dae5ef998931da69ec1d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 18:36:20 2014 +0200

    remove duplicate old feature file

commit d54ac3a819f61126699e3bd41a2320dee69ec906
Merge: 2cec35f 0350a1e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 18:30:02 2014 +0200

    Merge branch 'next' into mk_software_additional_fields

commit 2cec35f24f7fd9e6e8713b5cbc35146651de5711
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 17:55:11 2014 +0200

    translate keywoards on item edit page

commit 36839e34d4bc0d1cb7271067aeacae600ed9a719
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 17:54:52 2014 +0200

    dry up

commit d35c981df3086e84c2be8eb5a748063963a0a080
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 17:54:41 2014 +0200

    fix crazy current location loading for software

commit 238b56716395680a63e3bea505cf8dff96e4aa0a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 16:59:54 2014 +0200

    edit software view text changes

commit 68669458407325f6a3fe7e0e9319448fee9c4c06
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 16:50:09 2014 +0200

    group license fields

commit 6aec8dc0be6385f21a67eab1896bce48ccf4ca12
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 16:44:33 2014 +0200

    adjust values for license fields

commit 3475816df9ed2429b7dae2621098438c1b92a315
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 16:28:45 2014 +0200

    enable is_borrowable field for license

commit 33b71ed6279bb8d512b433c351042f795d6565c1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 13:52:00 2014 +0200

    adding hints to software form

commit 447f33f981d4e1392e5527a1b6fa216073050ac1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 13:51:17 2014 +0200

    get rid of @type and initialize appropriate class dynamically

commit 4dd6f2ce677ff9f724e087b8d58162221e434fd5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 29 17:06:21 2014 +0200

    refactor inventory method

commit 48dc85ecf04c1012932f503457c76c1ff29c1c83
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 29 17:06:01 2014 +0200

    some new software fields

commit 496b71639ef1a7d4e506c98f817e4d92e2ff6b61
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 29 17:05:38 2014 +0200

    organize model / software field partials
[FIX CI]
[FEATURE #70003470 #70003774] edit software & additional software and
license fields

Squashed commit of the following:

commit accc9c593b273539d80ddea99240ab29f149da90
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri May 2 16:33:36 2014 +0200

    tests for editing software

commit b61170c4e4db5d1646560453acb0189a558b1feb
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri May 2 16:33:17 2014 +0200

    clearly split models from software in inventory list

commit e0707f69643b2462ac16c493b4a8d8bcff80e943
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri May 2 15:12:22 2014 +0200

    reuse technical details instead of hints

commit b621fcabac3c394002928e0f9ccb250a721c6c6b
Merge: d1db22b c87ceaf
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri May 2 14:28:22 2014 +0200

    Merge branch 'next' into mk_software_additional_fields

commit d1db22bd2ca90e734db4c6d8040e61cc928db85e
Merge: 4f5a721 907a006
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri May 2 14:27:52 2014 +0200

    Merge branch 'next' into mk_software_additional_fields

    Conflicts:
    	features/examples/software_erfassen.feature
    	features/step_definitions/examples/software_steps.rb

commit 4f5a7219b7d710422307e04cf630e1cc77c87df1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri May 2 14:18:22 2014 +0200

    FIX: show only software in license autocomplete

commit 6d7e51ae01410d45efd5450e51a124ac96a93a0c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri May 2 13:36:11 2014 +0200

    rename buttons for new software and new license

commit 79fe0dfb9ec66e1c7ee1ddac2d9d50b6269d140b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri May 2 13:31:30 2014 +0200

    tests finished

commit 13d492637a2fd76b3d46cb4d51ec15bb61552fe0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri May 2 12:46:32 2014 +0200

    tests WIP

commit aa5607a0ffb23c225fa4dae5ef998931da69ec1d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 18:36:20 2014 +0200

    remove duplicate old feature file

commit d54ac3a819f61126699e3bd41a2320dee69ec906
Merge: 2cec35f 0350a1e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 18:30:02 2014 +0200

    Merge branch 'next' into mk_software_additional_fields

commit 2cec35f24f7fd9e6e8713b5cbc35146651de5711
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 17:55:11 2014 +0200

    translate keywoards on item edit page

commit 36839e34d4bc0d1cb7271067aeacae600ed9a719
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 17:54:52 2014 +0200

    dry up

commit d35c981df3086e84c2be8eb5a748063963a0a080
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 17:54:41 2014 +0200

    fix crazy current location loading for software

commit 238b56716395680a63e3bea505cf8dff96e4aa0a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 16:59:54 2014 +0200

    edit software view text changes

commit 68669458407325f6a3fe7e0e9319448fee9c4c06
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 16:50:09 2014 +0200

    group license fields

commit 6aec8dc0be6385f21a67eab1896bce48ccf4ca12
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 16:44:33 2014 +0200

    adjust values for license fields

commit 3475816df9ed2429b7dae2621098438c1b92a315
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 16:28:45 2014 +0200

    enable is_borrowable field for license

commit 33b71ed6279bb8d512b433c351042f795d6565c1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 13:52:00 2014 +0200

    adding hints to software form

commit 447f33f981d4e1392e5527a1b6fa216073050ac1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 13:51:17 2014 +0200

    get rid of @type and initialize appropriate class dynamically

commit 4dd6f2ce677ff9f724e087b8d58162221e434fd5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 29 17:06:21 2014 +0200

    refactor inventory method

commit 48dc85ecf04c1012932f503457c76c1ff29c1c83
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 29 17:06:01 2014 +0200

    some new software fields

commit 496b71639ef1a7d4e506c98f817e4d92e2ff6b61
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 29 17:05:38 2014 +0200

    organize model / software field partials
fixing partial path
[FIX CI]
[FIX CI] more random factory
Much simplified the test tasks.
Trying to add Travis CI support again, for the faster tests.
Trying to poke Travis.
Travis can't find 2.1.0.
Forgot command.
target _blank for software hints
make technical details textarea bigger
Lizenzstyp -> Lizenztyp