[FIX CI] ausleihe feature
[FIX CI] probleme feature
[FIX CI] timing issues
[FIX CI] timing issues
fix CI
activate capybara screenshot
activate screenshots
Analying an infinite rerun loop.
Trying again to fix infinite loop.
Failing tests if there is an error with the test environment.
[FIX CI] put capybara screenshot at the right position
[FIX CI] modelllist problems
[FIX CI] modelllist
[#51074997] modellliste zurücksetzen

Squashed commit of the following:

commit b4ac704a1256fd6406a6e845371dddbf1366c007
Merge: 5416681 c23c946
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Jun 25 14:43:49 2013 +0200

    Merge branch 'next' into mk_modellist_reset

commit 5416681a35574e7d4c5096d1f2c3d3e43a094c9e
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Jun 25 14:43:19 2013 +0200

    minor changes

commit 708f76f19b5f7c81cfc0436befa433b1cdfd8cbb
Merge: 31a9eec 9a60dc1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Jun 21 09:30:02 2013 +0200

    Merge branch 'next' into mk_modellist_reset

commit 31a9eecd493ada07595d0805ba4b4a9258bad4a9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jun 19 15:49:34 2013 +0200

    Remove console.log

commit 8b20f118c08814f1348ee04d101afdf36230f178
Merge: aed7bc4 9009c70
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jun 19 15:46:53 2013 +0200

    Merge branch 'next' into mk_modellist_reset

commit aed7bc4e91e868ec5cd95ffccf935aaac1bb9edf
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jun 19 15:45:20 2013 +0200

    Test for reset all filters

commit 92b87d761d6a7dece86ecfc9c6d1061cc7cb85ef
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jun 19 15:44:58 2013 +0200

    Remove double fetch

commit bda0bdbd72ac053ce59de0e0e271046d16b095b5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jun 19 14:12:01 2013 +0200

    Feature reset all filters implemented
[#51400905] borrow search

Squashed commit of the following:

commit c590050edf2c305958cb0cfeb05f90ebcbf73c9f
Merge: dc32628 78cf947
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Jun 25 14:47:20 2013 +0200

    Merge branch 'next' into sp_borrow_search

    Conflicts:
    	app/assets/javascripts/_NEW/borrow/controllers/models_index_controller.coffee
    	app/assets/javascripts/_NEW/borrow/controllers/models_index_search_controller.coffee

commit dc32628d45eba2656bedce60149348b3f9a09cf4
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Jun 24 15:24:06 2013 +0200

    finish implemenation of search

commit a851c7522ecb451e00eeaad1a3a139db349d5572
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Jun 24 11:20:54 2013 +0200

    continue

commit 2e9793a0861e87975c2075e54facda4ecc9c5637
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Jun 20 15:55:06 2013 +0200

    continue topbar search

commit 62d11cb7b75fed0a3631b69fc86a0cc1309e87cc
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Jun 20 11:20:59 2013 +0200

    continue search

commit c288fc7be8781cb5abc7d8dcfe31864f2f296b56
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Jun 20 08:11:22 2013 +0200

    continue topbar search

commit 47de41219b3865d2b5b3db17f88fc5b8a18f6898
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Jun 19 15:15:25 2013 +0200

    continue search

commit 058073afada8961ee07b05a14b381b8ae2eefa11
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Jun 19 14:21:54 2013 +0200

    move the set_paginated_header to the borrow controller to acces it from every borrow controller

commit b6e860374c14f24f951646d80f6d0bd7f168f74d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Jun 19 14:17:56 2013 +0200

    starting the borrow search feature
[#51890491] modellist ip selector optimization

Squashed commit of the following:

commit 39b1a9efa62690b9b12d7391c93d45010f6aeee5
Merge: 27d50e1 19977a8
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Jun 25 14:50:09 2013 +0200

    Merge branch 'next' into sp_optimize_modellist

    Conflicts:
    	app/assets/javascripts/_NEW/borrow/controllers/models_index_controller.coffee
    	app/assets/javascripts/_NEW/borrow/controllers/models_index_search_controller.coffee
    	app/views/borrow/models/index/_ip_selector.html.haml
    	features/step_definitions/borrow/modelliste_steps.rb

commit 27d50e1d4e0877ae35a2c20a0176786683bf4c5f
Merge: 3b2da102 dc32628
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Jun 25 13:56:04 2013 +0200

    Merge branch 'sp_optimize_modellist' of github.com:zhdk/leihs into sp_optimize_modellist

    Conflicts:
    	app/views/borrow/models/index/_ip_selector.html.haml

commit 3b2da102600a1c350460aaf92fdb11fd9f5a49c9
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Jun 25 13:55:27 2013 +0200

    finish tests for ip selector optimizations

commit 3ab77a4ad5f381c33e5e57e98f57c905a22da728
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Tue Jun 25 11:37:57 2013 +0200

    start optimizing dropdown tests

commit b6282b2d2bb0924124f535f7e3614b5e0909b6fe
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Jun 24 15:24:06 2013 +0200

    finish implemenation of search

commit 989898e296105c3b90b2aa14caa87cb6baa852c9
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Jun 24 11:20:54 2013 +0200

    continue

commit b57988ace078f0bbd7cc30551b6f54b48a740ee3
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Jun 20 15:55:06 2013 +0200

    continue topbar search

commit 7b92a3ae0050851eed48d57956d5c1a3ff70ce06
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Jun 20 11:20:59 2013 +0200

    continue search

commit 289ad07be6a7d9320f21a8d8e49bea088a28b533
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Jun 20 08:11:22 2013 +0200

    continue topbar search

commit 7b007ca5e6dc21dfabee3260369cc91e138c3227
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Jun 19 15:15:25 2013 +0200

    continue search

commit 0fb3646dafa2edb40506124f8a3f7bc66536de45
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Jun 19 14:21:54 2013 +0200

    move the set_paginated_header to the borrow controller to acces it from every borrow controller

commit 416a63c487666cb937875baebdc8beaa365a1cc5
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Jun 19 14:17:56 2013 +0200

    starting the borrow search feature

commit dc32628d45eba2656bedce60149348b3f9a09cf4
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Jun 24 15:24:06 2013 +0200

    finish implemenation of search

commit a851c7522ecb451e00eeaad1a3a139db349d5572
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Mon Jun 24 11:20:54 2013 +0200

    continue

commit 2e9793a0861e87975c2075e54facda4ecc9c5637
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Jun 20 15:55:06 2013 +0200

    continue topbar search

commit 62d11cb7b75fed0a3631b69fc86a0cc1309e87cc
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Jun 20 11:20:59 2013 +0200

    continue search

commit c288fc7be8781cb5abc7d8dcfe31864f2f296b56
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Jun 20 08:11:22 2013 +0200

    continue topbar search

commit 47de41219b3865d2b5b3db17f88fc5b8a18f6898
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Jun 19 15:15:25 2013 +0200

    continue search

commit 058073afada8961ee07b05a14b381b8ae2eefa11
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Jun 19 14:21:54 2013 +0200

    move the set_paginated_header to the borrow controller to acces it from every borrow controller

commit b6e860374c14f24f951646d80f6d0bd7f168f74d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Jun 19 14:17:56 2013 +0200

    starting the borrow search feature
[FIX] reset when search is set
[FIX CI] modellist
[FIX CI] modelllist ip selector
Fix bug in error handling