REFACTORING DONE ;)

Squashed commit of the following:

commit fa8ca161dc1dfd68cf199fe4e3e2ca017d4b0a0f
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 25 17:29:25 2013 +0100

    [FIX] color for selected date

commit e672c85334f23f05e5b2c24da0d299c64911923e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 25 17:25:43 2013 +0100

    [FIX] new group translation

commit 5b235fd24cbe97f6467baaa3678def45fa63718d
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 25 16:21:23 2013 +0100

    [FIX] fetch visits unpaginated on daily view

commit 5717bfcac8be8a935f82f1fd2d47e66dde7e750b
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 25 16:14:28 2013 +0100

    [ZHDK] store unqiue id correctly and point the image url correctly

commit 17f8b6d9f60ca1c281640328d17a86a2725efced
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Mon Nov 25 14:23:34 2013 +0100

    Removing legacy deployment recipe.

commit f9cc32f5373cc45274975b5017c76df73bf52867
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 25 14:16:40 2013 +0100

    [FIX] fetch availability only for models

commit af89ea95aac05de0882cc106f8798426d220b502
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 25 13:46:06 2013 +0100

    [FIX] endless loop when hand over is getting empty

commit 06d0a471f56ac3cd49d7be96ff70c369575045f9
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 25 13:45:52 2013 +0100

    [FIX] correct forwarding of user groupIds for availability calculations

commit fc68936e067ad8f2d860e7bc15abb20bab9d1bfd
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 25 11:49:45 2013 +0100

    [FIX] append autocomplete to proper dom element

commit 9908ff97abf291a0944a7e88bf12357c71cb442b
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 25 11:21:42 2013 +0100

    [FIX] availability_changes.feature

commit d87efabd58bd3c49d534682abdbf09f42a263fc8
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 25 11:11:24 2013 +0100

    [FIX] incorrect field attribute

commit 3f758eb841d2f9f59fc9f995737fbca69f856ae1
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Mon Nov 25 11:16:40 2013 +0100

    Adding more settings to structure.sql

commit 5687ba67f02700ab753037b507c1160b88bdfa4a
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 25 10:23:05 2013 +0100

    [FIX] use new callback names of jquery ajax

commit 886e7bc5d209b4d33e63d77ba9dda3e7068cfbfe
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 25 09:20:07 2013 +0100

    [FIX] gegenstand_editieren

commit 0ad5daef31034b03ff3f6b9b80874f40283fc4db
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 25 08:50:22 2013 +0100

    [FIX] probleme4.feature

commit 4791927db13819412b8c7fc1cf070429303f5c89
Author: Sebastian Pape <github@pape.io>
Date:   Sun Nov 24 12:26:49 2013 +0100

    update task lists

commit b5e6dc8a37d2881371e76ae75121c5270bedd2fb
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 18:04:28 2013 +0100

    trigger ci

commit 3e00229c4017004fd50cd3f30624d5e0d5bc7d10
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 18:02:44 2013 +0100

    [FIX] edit_contract_line.feature

commit 2ac797dc7767f0809ec7e0f4426c2663224346af
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 17:53:00 2013 +0100

    [FIX] gegenstand_editieren4.feature

commit f109b08a517f115aeb5cebc462a98afd4c56c576
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 17:52:02 2013 +0100

    [FIX] pakete3.feature

commit 930153f025049e91bf381c454a98af92269a2016
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 17:29:04 2013 +0100

    update diverse feature list

commit 7853503cd3c75800b60d4af1a7156949dc8cd862
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 17:04:53 2013 +0100

    load some js libraries also on splash screen

commit 964369508ea2fdbbb135b4dcea9ed5f36178e2e2
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 17:00:52 2013 +0100

    [ENHANCEMENT] add line autocomplete interaction

commit e4d9cff1b5184efa85df56fbaefeefecd7502429
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 15:53:11 2013 +0100

    remove unused js libraries

commit 7c344b2d2d0e400ea0b77537cb70a670bf1de321
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Nov 22 17:03:52 2013 +0100

    FIX: remove annoying flash hover effect

commit eeacea863f0fd0297fcc150e964cc62c44cd7a11
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Nov 22 16:04:37 2013 +0100

    Adding a test for our mailer settings.

commit 8071f9fcfc00cd8ba9610fbc7e8d82c9d54d8d6c
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 15:52:35 2013 +0100

    Nadja rejected grey topbar

commit 62a58fff79b62ca0037d0c5af324ca425d877aa8
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 14:20:43 2013 +0100

    [DOMINA] update task list

commit a49eedfeab6671b6e2278319fc9661155884b5c8
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 14:16:53 2013 +0100

    update diverse feature task list

commit d785d737fea4ae2251ab0195c91fc086264c1a78
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 14:10:49 2013 +0100

    split and fix more tests

commit 39d467a7b9e2d447426337eabc891457d5ff138d
Merge: eca0e4e 002efe8
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 14:08:50 2013 +0100

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

    Conflicts:
    	domina/execution/features/diverse_features.yml

commit eca0e4e1618552150855a7f468f2cb37cfe4cf99
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 14:07:57 2013 +0100

    [FIX] inventarhelfer4.feature and add it to diverse feature tasks

commit 002efe8c3597de2aef1708c0a3e7656325a5d74b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Nov 22 14:03:13 2013 +0100

    [FIX CI] fix gegenstand_erstellen_steps.rb

commit 244e244f6668f53a4c4e948fc83c0c6efc32b5b3
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Nov 22 13:51:20 2013 +0100

    [FIX CI] split up gegenstand_erstellen*.feature

commit 9fe490a9d0d97baa180d29f0b4d031ec24efb344
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 22 12:50:21 2013 +0100

    [FIX CI] features/examples/inventar4.feature:21

commit 131042df7bb1abccacd294a02e347ac1047fb0ee
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 12:14:31 2013 +0100

    [FIX] edit_order_line.feature

commit 570e91085259cfe72062cb9cb5a1d1081efac0e4
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Nov 22 12:12:10 2013 +0100

    [FIX CI] split up gegenstand_editieren2.feature

commit d80a2b19f374f4f48bed29b4d3518859e1778587
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 12:02:39 2013 +0100

    fix edit order line and update diverse task list

commit 55da8dc790575c9cb830c92f844af4bfe217c906
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 11:47:00 2013 +0100

    update diverse task list

commit 20c87b3c5caf4745a1f389c4e7138fe0534f99d4
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 11:44:58 2013 +0100

    [FIX] inventar3.feature

commit e7ca33cbeae7c8cdf5057f7ad3d717f50c7a2339
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 11:38:49 2013 +0100

    update diverse feature task list

commit ce10b93437250b780604d2e30c8a0b64ba41a619
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 11:36:43 2013 +0100

    [FIX] split modell3.feature

commit 61565ec8970c01e09a7ba0da88af1ca3e4e377ae
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Nov 22 11:34:58 2013 +0100

    [FIX CI] gegenstand_editieren*.feature

commit b354f89d4a280484a780e17db57682a54a948c1d
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 11:33:06 2013 +0100

    [FIX] edit_order_line.feature

commit 33386dc26127003f415ebc93e3c5e5b1b963cd04
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 11:20:33 2013 +0100

    [FIX] quick_approve.feature

commit ab01419b630849e9b4a9a3a93b8324cf3a71acc9
Merge: 6ef3b5f 12a8873
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 10:56:26 2013 +0100

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

commit 6ef3b5f13e15158ce14d5d9ba68ca454e33d258e
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 22 10:56:20 2013 +0100

    [FIX] pakete2.feature

commit 12a8873941a0696498c282ab913cfa4466a97620
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Nov 22 10:51:45 2013 +0100

    [FIX CI] gegenstand_editieren*.feature

commit 1691ab5e379d9383b1c3489ce9151698b4abe6e6
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Nov 21 18:23:04 2013 +0100

    Support setting SMTP usernames and passwords through settings screen.

commit dca840aec50890ef77b3b7f6d7fe77fc04406a3a
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 18:01:28 2013 +0100

    [FIX] pakete3.feature

commit ead2c6291af30549d4d4faa8f238bdb1b77e7d5e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 21 17:19:48 2013 +0100

    [FIX CI] inventar3.feature WIP

commit afd03bd94a603d246b264dc0ad0bdd14109ff4ae
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 21 17:07:09 2013 +0100

    [FIX CI] fix examples/kategorien5.feature

commit 4e6664fb90285e9dab27aab4e866e15368137e6f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 21 17:03:55 2013 +0100

    [FIX CI] examples/kalender.feature

commit 148a599ca062971ae1a4222d9aef79ef24a2d686
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 21 16:54:54 2013 +0100

    [FIX CI] fix inventarhelfer4.feature

commit a28a490a0cd9be5c1bdde0e161c42fc56c2f15c5
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 16:38:41 2013 +0100

    [FIX] zweck.feature

commit 3cda1d3aa9d612db16de0ccd526823ed3be721ac
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 16:25:31 2013 +0100

    [FIX] tooltip

commit b487b30d4a645cded4c0b6748acc849206981405
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 16:08:40 2013 +0100

    update diverse features

commit db50fdef941eed07cdc0b279645f03ccd50e606e
Merge: 34d2017 cf44f91
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 16:06:59 2013 +0100

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

    Conflicts:
    	domina/execution/feature_tasks.yml

commit 34d2017330274d3677915af64f173e4afc13875b
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 16:06:08 2013 +0100

    split more files

commit cf44f91a36b287ed95f5542550c8fb375aa5cce9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 21 16:06:03 2013 +0100

    [DOMINA] update diverse_features.yml

commit 3a241c9cbf77b03e60cbb6a8cd43aeac884c4940
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 21 16:03:39 2013 +0100

    [FIX CI] fix inventar*.features

commit 9d9640d4064f5af927dd946b0ac2b3a61df263bf
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 15:46:32 2013 +0100

    [FIX] tooltip problem

commit 8aa5bcec090d2d450601d4515d6319442ea70f1e
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 15:26:32 2013 +0100

    [FIX] tooltip problem

commit 26cddbc79d8bdb0dd42a43bebf7f4da2d53f5094
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 14:55:10 2013 +0100

    run specific features for tooltip failures

commit f8c0706b02730c3fc985438d4bd4434417bccb5a
Merge: 65bcc9f 2949c55
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 14:45:18 2013 +0100

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

commit 65bcc9fe9f4c749a20e5dc4819f505a1b4e4eb09
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 14:45:12 2013 +0100

    [FIX] display edited package item completly

commit 2949c55358acc894ef3ebe92527d449790e79058
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 21 14:35:18 2013 +0100

    [FIX CI] split up several features

commit 57fa7cd0ad118b940cbd9042c66e2d65d0aba605
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 21 13:59:57 2013 +0100

    [FIX CI] split gegenstand_erstellen*.feature

commit 95e8a46c53eb427b181d3052de1b9ff704265658
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 21 13:49:49 2013 +0100

    [DOMINA] update feature_tasks.yml

commit 797dabebf5847f9dc050b66b2cdb47ca96ca8695
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 21 13:49:23 2013 +0100

    [FIX CI] split up gegenstand_editieren*.features

commit 20d4b080b81119f295a1134b2121a10034fe127d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 21 13:26:23 2013 +0100

    [FIX CI] pakete*.features fixing tests WIP

commit 7e8f23d65b3271a794463285dcce50361aa37297
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 12:51:47 2013 +0100

    [FIX] package dialog

commit 9b2268e411bb60221bc8da1412169d4deb943c15
Merge: 221a0f2 1c35059
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 11:45:44 2013 +0100

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

commit 221a0f258a3dd72b82cf217ce5e607a1ab312bc2
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 21 11:45:38 2013 +0100

    [WIP] fix models package dialog (edit)

commit 1c35059e2e63c50d539bd7097f386588cce529c6
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 21 09:33:50 2013 +0100

    [FIX CI] split up passwort*.features

commit 42663f71a07f30dc19c7bfb47f9a50e12a423774
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Nov 20 15:58:53 2013 +0100

    [FIX CI] features/examples/zweck.feature:19 ; features/examples/probleme2.feature:17:31 ; features/examples/ausleihe2.feature:49

commit f97902e8d066534e2134593f9287e317b6254bcb
Author: Sebastian Pape <github@pape.io>
Date:   Wed Nov 20 10:28:33 2013 +0100

    fix background color for staging

commit 041b161f02fdb21a980a624a01aef57f95da56bb
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Nov 20 10:21:30 2013 +0100

    [FIX CI] change order of scenarios to fix modell6.feature

commit 0ee4a815967b3807ec9fc88e0f2a8722b80532c6
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 17:50:29 2013 +0100

    sort subcategories when opening parent

commit 429d4ff40707db8556b28c15774b072b66097435
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 17:47:17 2013 +0100

    put "Options" to the correct position in search results

commit b213af74d636193fb4dd8d44544ea408e2f8dd96
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 17:45:23 2013 +0100

    show "no take back found" when there is no take back

commit 491d555c9ff13696990d705b00537ff50699bd09
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 17:39:44 2013 +0100

    [FIX] disable quantity in booking calender for take back

commit 310e9ab00eb48bfa7a00a0e41180d707cc908e9e
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 17:31:47 2013 +0100

    [FIX] send notifications

commit 5b4280a11540a5f932906220178408c27414a61b
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 17:26:48 2013 +0100

    [FIX] approve with comment

commit 94a54524583a4cebfeb1eb7d9fd65252c5f86b0f
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 17:07:07 2013 +0100

    [FIX] approve order on contract#edit

commit cdb7950eb7023285e3ccd1f8bec4438e61078e9a
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 17:04:04 2013 +0100

    [FIX] contracts index for hughe amount of contract lines slice requests

commit 56aa0238e095159573987d0189660f219e2176a9
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 16:59:41 2013 +0100

    Fix autocomplete inside of modal

commit e3494959057ce7728c4e129686e90d585b1f0f02
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 16:52:39 2013 +0100

    [FIX] booking calendar colors

commit f4f9baa98fe37dcfacc4287671f6d55cda377e43
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 16:50:07 2013 +0100

    fix workload translations

commit 6ee158de1f6dc00bd97f0171dfa5a898a6ac4494
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 16:49:59 2013 +0100

    fix quantity in summary dialogs

commit 71263fd93fd33c315450a84e027b2243a2d8ebf7
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 16:49:41 2013 +0100

    fetch records each slices for ip like ffi with huge amount of reservations

commit 88db0953878ac5cc5fdce6b3206c03cd1063d5a9
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 16:49:17 2013 +0100

    sort categories downcased

commit 5306660035e4dff8d8280a38ddb898c72844bb3a
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 16:49:07 2013 +0100

    fix typo

commit 7412806837456e3221eb2ea47b9ccfbfee89097d
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 16:48:56 2013 +0100

    fix translations

commit 3a16d68f1cd2c490aff6fdb3dd86ff8e7ccb4ecb
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 16:48:47 2013 +0100

    fix tranlations

commit 95822b6f82ee75cadc2c67ce4215e9416a93af03
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 16:48:34 2013 +0100

    underscore each_slice

commit d0e5850b3a2dfb92c833a3a42eeb9589e14b118a
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 16:48:24 2013 +0100

    prevent prevent button disabling

commit 8ce857492684c2f890e7ecac876cc11ec73b1635
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 14:29:04 2013 +0100

    [FIX] link to take back on signed contract line

commit 7015d7db0d28f7c443d97771222bb63aea3c5d28
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 14:28:49 2013 +0100

    [FIX] correct quantity in dialog

commit 4ccce0ecc12e5f6a40243ca286c11aee3307b498
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 16:59:20 2013 +0100

    [FIX CI] and another fix try for modell6.feature

commit 07cba706be0dc19e26fa0f67151b5fb48c2e664c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 16:39:18 2013 +0100

    [FIX CI] split up geraetepark_grundinformationen*.features

commit 6e70b1d57502ccf636a4847b774e720f087b9234
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 16:28:33 2013 +0100

    [FIX CI] fix web steps <<I should see>> step for modell7.feature

commit 2c7bbe8b4bbff88a673bd5b833ce8136293cc1fd
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 15:58:38 2013 +0100

    [DOMINA] change diverse_features.yml

commit 1a7b3ceae2cdc8b742e9c78c2312702d5e3da114
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Nov 19 15:36:19 2013 +0100

    [FIX CI] features/examples/ausleihe2.feature:49

commit af5e7550e3feb354fa3ba82705435aff18451d4a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Nov 19 14:36:46 2013 +0100

    [FIX CI] features/examples/passwort*

commit c8b0d218f8eeea419c94e706e907bcd7a7429af1
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Nov 19 14:16:37 2013 +0100

    [FIX CI] features/manage/acknowledge/add_item.feature:18

commit 049617b40c8f942d5c47d8ce623c5657990dc067
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 14:12:08 2013 +0100

    add upload.js to application.rb assets

commit cd53dfca9e656d7ed2e4f27d0143fad59c700139
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 14:05:13 2013 +0100

    [FIX] modal closing

commit a0ebfae036cb952e5dceecf9d33498155eea6717
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 13:56:39 2013 +0100

    [FIX CI] and more split of benutzerverwaltung*.feature

commit 84b5429ffeadbde8e80bb0f91fbbfc5c00cd62db
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Nov 19 13:54:23 2013 +0100

    [FIX CI] features/manage/acknowledge/quick_approve.feature:19

commit 078b35a9d34e8b9fe6b4030ee374019003cc7949
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 13:54:08 2013 +0100

    [FIX] booking calendar dialog heights

commit 307b84f5ab4dcb700900ee562ed23eca080a9596
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 13:45:37 2013 +0100

    [FIX] some layouting for the deploy information

commit 0f66abb0b0b665375c481882e48bb8958d97ffa4
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 11:58:58 2013 +0100

    fix deploy informations

commit 84dd70ecd21e26025d59b1cfdb3e24db2264aa19
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 11:50:38 2013 +0100

    deploy staging from next

commit 8c5e7d34945109ec091d16fc406ee3c0d1ca9516
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 13:40:30 2013 +0100

    [DOMINA] change diverse_features.yml

commit 18eadab8fd5c13946722f93f2531495e34804267
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 13:04:21 2013 +0100

    [DOMINA] change diverse_features.yml

commit e0ac059e3c0f82f24d5ffcbc0ded120066eabc69
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 12:59:27 2013 +0100

    FIX CI: increase sleep time as a try to fix ci

commit b9bd68bae78bcf8677fca4532f3fb61f4824c783
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 12:58:24 2013 +0100

    [DOMINA] narrow down benutzerverwaltung_features.yml

commit 2cd167902f8558a8169d45022e75d5419ad71e62
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 12:48:29 2013 +0100

    FIX CI: split up more benutzerverwaltung*.features

commit e2601ab6a8d3700b7c23a99a66ba1cb01b4953a1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 12:39:48 2013 +0100

    FIX CI: modell6.feature try another fix

commit 922439500ca7278d33ec621216e5fecb67c54b83
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Nov 19 12:23:17 2013 +0100

    [FIX CI] approve_order_model.feature

commit 958d3b1b024f8a99f5885bdc4ba844212d4ba664
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 12:00:19 2013 +0100

    FIX CI: modell6.feature try fix

commit 3eb686d0fdd8357b15b4b0e90f79f79ba3b104a0
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Nov 19 11:40:09 2013 +0100

    Fixing the settings migrations, they need to work on the singleton, not
    create a new one.

commit d5c9bbc115418635caf29a0830c986595a18f0da
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 11:39:33 2013 +0100

    FIX CI: modell*.feature

commit 235c6c03f4c0bb9a557d1fb94708e74a1ba6bec0
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 11:38:46 2013 +0100

    [FIX] too much recursions problem when working with modal dialogs

commit 86afb6ba1975f8e2f69939ed571dd38180080744
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 10:52:29 2013 +0100

    [FIX] booking calendar days only red on closed day when start or end date

commit 0f4f18ab0861a1d3dbb11fb031b9f03265c422f7
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 10:50:18 2013 +0100

    [FIX] assign autocomplete should also show items without buildings

commit 69a99cb3cee430a754482f689463f27d9a981709
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 10:47:52 2013 +0100

    [FIX] some css fixes

commit 05c3fae18e3593d2d61b6b341c17306cde1f5b88
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 10:47:43 2013 +0100

    [FIX] allow not numeric unique_ids for users

commit 59c6d192fe55a84e083d1440c7fb7167c6970bad
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 10:44:20 2013 +0100

    some deploy information visual fix

commit e2ee7c95a32cacdaf732a9f233755df9ba18b1ec
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 10:50:04 2013 +0100

    [DOMINA] test only modell features in specific_features.yml

commit 10178cee0f04d1035eecc09dcf04ff7361561a6c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 10:46:24 2013 +0100

    FIX CI: modell2.feature

commit 3550e0de5c1963754a0300b4a18edf70e61fa7ef
Merge: 27e1fcf 6fc80c7
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Nov 19 09:34:24 2013 +0100

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

commit 27e1fcfafc9249b816577b13fd1aefa8a22afa45
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Nov 19 09:34:10 2013 +0100

    [FIX] Load the mailer settings properly in reject.feature

commit 6fc80c7641ab0c522a45baf3c4035dfbe5b1d1a0
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 09:00:17 2013 +0100

    [FIX] split gegenstand_kopieren.feature

commit 709865362226a25bdedcdacb8049e3bb020bf51c
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:58:45 2013 +0100

    [FIX] split gegenstand_erstellen.feature

commit 6c195868ed008d7571490b074f785d0a408440fb
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:57:03 2013 +0100

    [FIX] split gegenstand_editieren.feature

commit fcb14bcea64fc011fc2e5ed90c6518341cf80596
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:56:10 2013 +0100

    [FIX] gegenstand_ausmuster2.feature

commit a72b8c067e19d7de8b3a703700b43ca2ded49281
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:55:10 2013 +0100

    [FIX] split more benutzerverwaltung features

commit a6b0955d2739e63c5f8ebc7aed1c3953bd624092
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:54:19 2013 +0100

    [FIX] split more benutzerverwalten.features

commit e7efdab32c8907d6bee68e31169c621a05d14628
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:52:35 2013 +0100

    [FIX] split suche.feature

commit d15becad93030056e61ee4e0217e5b33713c8a5a
Merge: b8b0fd3 136b5ec
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Nov 19 08:38:38 2013 +0100

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

commit b8b0fd30ccf7f7e7ddb272b9e3686c64b2276cf0
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Nov 19 08:38:33 2013 +0100

    Checking in correct structure SQL

commit 136b5ec48fd49b336873b3e679cdec39233fbdbc
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:37:29 2013 +0100

    [FIX] modell2.feature

commit 35e6de2d5d6450d5b59698b41355a2f33c3dbe71
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Nov 19 01:00:31 2013 +0100

    [FIX CI] features/examples/geraetepark_administrieren.feature:55 ; features/examples/gruppen.feature:27 ; features/examples/gruppen2.feature:14 ; features/examples/inventarhelfer.feature:53 ; features/examples/zweck.feature:19

commit 1e7876113ff4c5f10b30d1715fb94fd64c75a47f
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:22:18 2013 +0100

    adapt diverse_feature tasks

commit 90d0b217bb36f41a7ad0729991cae5954284c778
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:20:43 2013 +0100

    [FIX] split pakete.feature

commit 44ef001cc9c87e4c601e022363d172d769091918
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:18:51 2013 +0100

    [FIX] split passwort.feature

commit 5cc5d7501de67c973da71c3a5123306e164ef44d
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:16:45 2013 +0100

    [FIX] split probleme.feature

commit 1b179e2754767de1ad5c33e11de15f2b97254880
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:15:23 2013 +0100

    [FIX] split vertrag3.feature

commit 2623f28ac5a7364a65618f509ef58ea3daac60bb
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:13:47 2013 +0100

    [FIX] zweck.feature

commit 576e41ea7e2b40d3daaef69f0476970103190343
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:10:42 2013 +0100

    [FIX] split inventar feature

commit f49965b369e558edf7bf1fa8b5fe7839de71a9ef
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:07:35 2013 +0100

    [FIX] explorative_suche2.feature

commit c230a561cb05642d5ca146c9f31155638a297d3c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 17:01:08 2013 +0100

    FIX CI: split up more modell*.feature

commit 33367155d8ed7c85d87e52d4229495c6f4a396da
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 16:43:32 2013 +0100

    FIX CI: split up more modell*.feature

commit 0e5336a1e9b810d3d1ecf27d190abbc5f4816e7c
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Mon Nov 18 16:37:48 2013 +0100

    Initialize SMTP/mail delivery settings from database instead of configuration file.

commit ad34dfc16d9e19853abade66d92c2d4c7bb14c0f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 16:12:46 2013 +0100

    [DOMINA] remove green features out of diverse_features.yml

commit 670f1b651daa049c041d58f3c44af972dc666ad2
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Nov 18 16:07:46 2013 +0100

    [FIX CI] splitting features/examples/passwort.feature (yml definition)

commit c8c16d746cc29ed6ac8ed66ccdebea2e8e7f1b3e
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 16:04:22 2013 +0100

    [FIX] ausleihe.feature

commit 42e908d01d5f2b738312db1bcba16ad427cd8490
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 16:03:39 2013 +0100

    FIX CI: split up modell.feature

commit 869bec0626b94d26dbf8d4145c86f60c83826f58
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 16:02:30 2013 +0100

    [FIX] sprachauswahl.feature

commit 9ca6be9638d6ca37256fc90ec85088e6c3022d93
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Nov 18 16:01:45 2013 +0100

    [FIX CI] features/examples/gegenstand_kopieren2.feature

commit 75d2a88d74eab77e30f1f8e74b7eaba89e1bb24d
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:56:14 2013 +0100

    [FIX] timeline.feature

commit 071679cc9792105e5d3bff50f934e9ef9937e324
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 15:55:34 2013 +0100

    FIX CI: gruppen*.feature

commit d7efe7793587b6e5aa2bf05f255feb62fed9445b
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:54:07 2013 +0100

    update task list

commit 5f794b084b061247a23e04e360c5c2578b2140c9
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:52:49 2013 +0100

    [FIX] split vertrag.feature

commit e8ec3002e6272d65fd10ebd6f6d726c292b01201
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:52:07 2013 +0100

    [FIX] split werteliste.feature

commit 2bc2af1372f64df2cac72bcd73f604abc9397dc0
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:49:12 2013 +0100

    [FIX] zweck.feature

commit 16fa3d31bba3c47286e5d0da6724bdf78857e6e5
Merge: eeed4f7 ff0a8b2
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:43:52 2013 +0100

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

commit eeed4f7d951f4e61e902dda43311102c2928f0e9
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:43:33 2013 +0100

    prevent showing default title when tooltip is showing up

commit ff0a8b20c6a14fa2f4e597d92ef24dee607a088c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Nov 18 15:33:01 2013 +0100

    [FIX CI] splitting features/examples/passwort.feature

commit 396270424eb9706333d356ca9301383b1649a7c0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Nov 18 15:28:11 2013 +0100

    [FIX CI] features/examples/modell.feature

commit f98b653914b8e5b6e8aa63d24b61187d40c1d51b
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 14:51:58 2013 +0100

    [FIX] consistent flash messages (green for created/saved)

commit 3d22fbbb7d9c5a4a4917dc1e4c3207deab5d7e3e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 14:40:32 2013 +0100

    [DOMINA] fix definition of specific features

commit d51c9346d96f806eb23be744d5efe0328d8f2368
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 14:36:27 2013 +0100

    [DOMINA] add diverse feature tasks definition

commit 8337fe9cd0e9592332f226fa9f75b227ea01535d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Nov 18 14:27:52 2013 +0100

    [FIX CI] features/examples/probleme.feature

commit 5fb5050ee31acdc8016e8eef9ee94e3177338d5a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 14:22:13 2013 +0100

    [FIX] and more split of benutzerverwaltung features

commit 8dec00c00d0fb84cf2133911b81f858667c30527
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 14:14:29 2013 +0100

    [DOMINA] remove meta cucumber feature completeness from specific
    features task

commit 2f2b7c1ae4e382db2d175a5be2be4ad6109247ae
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 13:59:34 2013 +0100

    [DOMINA] add yml task definitions for specific feature files

commit 3219ec8f79c6490496c323521e7d2e948577f459
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 13:49:52 2013 +0100

    try further to fix benutzerverwaltung6.feature

commit 0e58aef534a11126a2c96de6298aeef91c00a3a0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 13:47:23 2013 +0100

    try to fix benutzerverwaltung6.feature

commit 60a1d5eca8afc04087b47c023362e50a1db295bd
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 13:29:41 2013 +0100

    [FIX] split vertrag2.feature

commit f391c95e24a2397073e651c089ff96dd84b8212d
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 13:28:15 2013 +0100

    [FIX] split example vorlagen.feature

commit b049078bf88f8b2cf70789a7b47849cb496fe4da
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 13:26:27 2013 +0100

    [FIX] split werteliste.feature

commit 69a51f2dfeca55be65d1cb84927d8804195c11f3
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 13:25:14 2013 +0100

    [FIX] split zweck.feature

commit 9f42e13fb40612898c0d2deb7dd69808d8b1a90c
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 13:21:30 2013 +0100

    [FIX] add_item.feature

commit 23011e52943fadd6401112cfd7ef5152d413f66c
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 13:16:05 2013 +0100

    [FIX] delete_lines.feature

commit e4c6d068f67acd076bbc5ff4b63d8316037a6d65
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 13:08:23 2013 +0100

    [FIX] ausleihe2.feature

commit 847da2817dd75184cff69efa83a4f11af15be6ec
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 12:24:06 2013 +0100

    split up more gruppen*.feature

commit 5987849553919e1dab2e6669a320bbb9d726fafe
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 11:01:32 2013 +0100

    split up more kategorien*.features

commit fabad8cae5b3e53270c0a890622c2913a88d19e5
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 10:55:16 2013 +0100

    [FIX] delete.feature

commit 345775eca437fb4d62840c80c3ed9648ef0be079
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 10:58:46 2013 +0100

    updated domina/execution/feature_tasks.yml

commit d189ebf7696b93e84078912ba8b556b5f6492293
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 10:50:12 2013 +0100

    split up even more benutzerverwaltung features

commit a787810550f8229a16395669bac391ebbfb9f901
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 10:42:11 2013 +0100

    minor autocomplete enhancement on user#new in ip

commit 1c03a3609dd687bcfb7f3544b2de4382d655e012
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 10:39:17 2013 +0100

    [FIX] edit_contract_line.feature

commit c146b1172d3bcf2b15da991287c5bb5fdcf71228
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 10:37:10 2013 +0100

    [FIX] autocomplete on user new in ip

commit 2833420a1c597e64055d537f3d92089e909cf950
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 10:31:38 2013 +0100

    [FIX] split gegenstand_erstellen.feature

commit 02e735c0a972c7992720e824cefca69dccdd5630
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 10:29:46 2013 +0100

    [FIX] split gegenstand_kopieren2.feature

commit 5f7f6608ab0a646f09d63f74065b7eed405d2f6f
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 10:27:24 2013 +0100

    [FIX] split geratepark_grundinformationen feature

commit 20c3ab51f5f8f60b58fc9cc7e82d6e0cb0cfebed
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 09:53:27 2013 +0100

    [FIX] gegenstand_editieren.feature

commit 7aba727c0aa46ea65aefe2e87671376687446290
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 09:47:51 2013 +0100

    [FIX] gegenstand_ausmuster2.feature

commit b0e26c13a2a85d6f60ff0bfa6b3695ffeab669d4
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 09:29:19 2013 +0100

    [FIX] ausleihe3.feature

commit b68df0dca0433fefaffc646cba5df89f1dd95f68
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 09:27:24 2013 +0100

    [FIX] ausleihe2.feature

commit 1723a7173a71422fd8fee946105aa6f23aa46214
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 09:24:02 2013 +0100

    [FIX] ausleihe.feature

commit f79e6b75fa6aa09342be1f640ffec15350222bc7
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 09:18:46 2013 +0100

    [FIX] timeoutpage2.feature

commit a8a9f245ec1d044ce078156f2c5db75b022a1a72
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 09:16:13 2013 +0100

    [FIX] manage explorative_suche.feature

commit f7b46c0a39c7eb2b6bac36ba3ac065beb5c2d9da
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sun Nov 17 22:45:57 2013 +0100

    [FIX CI] features/examples/inventarhelfer.feature:11:61

commit 687dddf5a30a46accbe5d0f688db8519ca856ee3
Author: Sebastian Pape <github@pape.io>
Date:   Sun Nov 17 02:25:31 2013 +0100

    [FIX] zweck.feature

commit b3937a75ae599531336598eefdc69d04479d4455
Author: Sebastian Pape <github@pape.io>
Date:   Sun Nov 17 01:57:52 2013 +0100

    [FIX] add_item.feature

commit e5147945580763f6fe69266b291e37fcf2d46ac1
Author: Sebastian Pape <github@pape.io>
Date:   Sun Nov 17 01:55:10 2013 +0100

    [FIX] delete_lines.feature

commit a5be41db7c7c105551d72429dc1af13357141347
Author: Sebastian Pape <github@pape.io>
Date:   Sun Nov 17 01:53:15 2013 +0100

    [FIX] split edit_order_line.feature

commit 6c81eec777057cf129a193b6538c96ab3784e446
Author: Sebastian Pape <github@pape.io>
Date:   Sun Nov 17 01:49:27 2013 +0100

    [FIX] edit_purpose.feature

commit 8ca58909f0b3f9e24ce4650241a4833c04690a97
Author: Sebastian Pape <github@pape.io>
Date:   Sun Nov 17 01:47:38 2013 +0100

    [FIX] split add.feature

commit be5a9a7ced82811ea655a55418cd31f4186aeb22
Author: Sebastian Pape <github@pape.io>
Date:   Sun Nov 17 01:45:38 2013 +0100

    [FIX] assign.feature

commit d0dc0ba9d0d67cf4e5e5ddf57df67de64edb9bc5
Author: Sebastian Pape <github@pape.io>
Date:   Sun Nov 17 01:42:32 2013 +0100

    [FIX] delete.feature

commit 9ced478c11c71dcd64d96d61ddb8a3ec0e40f7c9
Author: Sebastian Pape <github@pape.io>
Date:   Sun Nov 17 01:31:54 2013 +0100

    [FIX] edit_contract_line.feature

commit 605e29fe4e3a9a211485d31783f072559c952e05
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Sat Nov 16 23:58:42 2013 +0100

    Update feature_tasks.yml

commit 151399ee468f11cc45783edba42556bd2365c3c2
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 21:57:17 2013 +0100

    drop test

commit c5ff0e908d101397540e4295cbb450698c34d026
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 21:54:11 2013 +0100

    [FIX] tec visit hand_over_controller.feature

commit e5206536aa68672c3c9164a597967f30d34b19ba
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 21:45:10 2013 +0100

    [FIX] ausleihe.feature

commit 163d0a9c97c1179c0bbe7060f56d27a9d361fbd2
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 21:15:08 2013 +0100

    [FIX] timeoutpage3.feature

commit 7bc97a7802ec4b1d126456f1b9a0e34ccf788bd3
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 20:56:14 2013 +0100

    [FIX] timeoutpage2.feature

commit 087cdc3f714f98c2a0e86e0fa05ff2dcdbcb1eb4
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 15:45:16 2013 +0100

    [FIX] autocomplete add contract line

commit f4241ea9639e07f1a53e2d38a92bf2179e64d458
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 15:41:41 2013 +0100

    [FIX] delete_lines.feature

commit 12e8bfa7e17e0a319f77a6ba73bc348edcda46b2
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 15:32:21 2013 +0100

    drop: 'ensure there are no active requests' (timing issues/deprecated usage), use capybara synchronized querys instead

commit 21a517b6f5596cf38eb27e520cb4bad3fc261efd
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 14:30:37 2013 +0100

    [FIX] timeoutpage2.feature

commit 8ba3af885e8403042c94c94a070beb53301a132b
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 12:08:21 2013 +0100

    [WIP] drop: "ensure there are no active requests" (timing issues/deprecated usage), use capybara synchronized querys instead!

commit da8bde5e90392d96350bb157d47522b591cd52d2
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 12:07:31 2013 +0100

    recover .closed for booking calendar

commit e76c443171fd2f17579b8050791cdab4407f987f
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 12:07:17 2013 +0100

    [fix] ensure that there is a tooltip

commit 43ff09d364daf76b95523172f570602b074da04a
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 12:06:58 2013 +0100

    no interactive tooltips in the borrow section

commit 68fa9743c7e8a79cc4ce3d62f0de6ab9f611d544
Author: Sebastian Pape <github@pape.io>
Date:   Sat Nov 16 12:06:01 2013 +0100

    [FIX] pre_change should not trigger on first interaction

commit 07310eddbbaeb055dc555bf41477bc3a68c9af27
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 23:51:42 2013 +0100

    [FIX CI] (wip) features/examples/inventar.feature

commit 516a28426e610a426738fcc6ac102fbd3f963fff
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 23:24:40 2013 +0100

    [FIX CI] features/examples/ausleihe.feature:29 ; features/examples/gegenstand_erstellen.feature:64

commit 1d5968ac230c7f5d0ee57d5189aa437209628588
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 19:40:38 2013 +0100

    [FIX] ausleihe.feature

commit 235eb5e2f11b2549ea3aa99c00bf96c9fb0cbb31
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 19:33:15 2013 +0100

    [FIX] timing issues with timeoutpage3

commit 3054c98ff07e825fc5ac308e9a4fa623dc875a4f
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 19:04:52 2013 +0100

    [FIX] modellliste3.feature

commit 4f31e68ea125c2d3c7095df042f33aaf3bb89795
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 19:04:03 2013 +0100

    [FIX] dokumente.feature

commit d9173203d8c5a7c37852f7f49ed93bdaee41f96e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Nov 15 16:51:43 2013 +0100

    fix benutzerverwaltung.feature and split up more

commit 3d56e2567f6d2f4a2899ea3db2b97758e5659586
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 15:53:25 2013 +0100

    [DOMINA] split timeoutpage.feature

commit 352b925a2a1b7fd282a4142cd2734478574dfdc0
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 15:50:50 2013 +0100

    [FIX] borrow/kalendar.feature

commit 838a49d532b331e6493192658dc2a4b98177d6d8
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 15:33:28 2013 +0100

    [FIX] features/examples/gegenstand_ausmustern.feature

commit 04114a4bb309ed2f3f43cefed37bf588d3fbd027
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 15:22:31 2013 +0100

    [FIX CI] features/examples/werteliste.feature

commit 8bbce242660db9931d278854af59f5bfee3fe2c4
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Nov 15 15:18:41 2013 +0100

    split up kategorien.feature

commit 6e4d69d5db7e862952917c187d30d6877e7faa26
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Nov 15 15:07:41 2013 +0100

    update feature_tasks.yml

commit b4678ad45efda9fdac00958a3cf69fe68989031a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Nov 15 15:05:22 2013 +0100

    split up gruppen.feature

commit 896f2e20f5d90325e4e6286d332d4f199b4672fa
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Nov 15 14:46:39 2013 +0100

    inventar_steps.rb WIP

commit 385a6405fbac01ebf3044d380f81b1774e6c4aca
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 14:59:09 2013 +0100

    [FIX] gegenstaende editieren

commit 2a6a9d8a8250369e41572b6223c49477fb034d51
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 14:46:48 2013 +0100

    enhance visual of inventory item line

commit 8f899802690e7c31008439d62b6bb06d1ce24ad6
Merge: e7fe329 2d457cb
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 14:31:08 2013 +0100

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

commit e7fe32969ce2e874c28f5734c21aa3bec6ed4e80
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 14:30:17 2013 +0100

    [FIX] autocomplete (item -> model)

commit 2d457cbd5775c54ef1c126ac2bf3705031d83607
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 14:28:02 2013 +0100

    [FIX CI] features/examples/model_eigenschaften.feature:18

commit 00940edf9bb6cf3af329c5711569559200462235
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 14:16:52 2013 +0100

    [FIX CI] features/examples/werteliste.feature:15

commit 2a1c1c23a05a7937a90cfaa16026d0ca5b9f3cf6
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Nov 15 13:59:39 2013 +0100

    FIX CI: examples/inventar.feature WIP

commit ae9d81ec0a1718cd311732073e5b38cd3a1dad3d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 13:57:12 2013 +0100

    [FIX CI] features/examples/reservierenden_wechseln.feature

commit e59e3fcda0b7acfd0657fec43335f22359c50715
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 13:46:43 2013 +0100

    [DOMINA] more feature file splitting

commit de2d7097ae56fa9211456b698f5041a41fac2ed8
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 13:36:27 2013 +0100

    [DOMINA] split more borrow feature files

commit 75f868b1fafc9a8cdd099bbc700f0b48c76833fd
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 13:31:54 2013 +0100

    [FIX CI] more raise sleep preventing lazy errors

commit 81c2a2bae75096f82cbb998f92957c3c4ffd42f9
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 13:22:38 2013 +0100

    [FIX CI] features/groups.feature

commit fae0b5b5ac8d864a22be95ae670ad47cc9d9c090
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 12:30:43 2013 +0100

    [DOMINA] update tasks

commit 8d07bb4bc00eadc54f97f23213e3684ee6fc0395
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 12:25:48 2013 +0100

    split availability_story.feature

commit 3b4f3897c29e885893415ea377aac639cd6cdff3
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 12:22:50 2013 +0100

    [FIX] some more borrow feature file splitting

commit 41dec08d9ed37239527a6b02f97b00d535e07c9a
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 12:19:51 2013 +0100

    [FIX] features/borrow/verfuegbarkeit.feature:30

commit dc3bb08cb384c9d131c350b5fa4d90d6b92c9510
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 11:53:38 2013 +0100

    [FIX CI] features/manage/acknowledge/delete_lines.feature:18

commit 295731f6d08f41b05d2d3fdabe10a1e0613bf78f
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 11:49:13 2013 +0100

    [FIX] some borrow regressions + borrow feature file splitting

commit 92ec3d443cfe34684bff1ffd5b976ad1fddd040e
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 11:37:48 2013 +0100

    [FIX] some padding

commit 58f4ee1c09c44fb205818997a6ba25c869ffd2dd
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 11:15:01 2013 +0100

    small typos

commit 818ce64b4f2abffdaf6c23cdd3db85593f543724
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 11:08:48 2013 +0100

    fix small typo

commit 760375742c1c480585152d107b82e66161aa1a68
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 11:04:47 2013 +0100

    [FIX CI] features/manage/hand_over/assign.feature:28

commit 9ba91660793c80515db980c2df0941d6d24a8a15
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 11:04:05 2013 +0100

    autocomplete => off  for some buttons

commit 2ebfcb8093885539de08c323a35b0b786628645a
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 10:57:14 2013 +0100

    contract.rb timeout minutes 30 again

commit f0b8f376e6f56b39524271fd8318e5054de571e5
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 10:56:17 2013 +0100

    [FIX] bestellfensterchen.feature

commit d0f31872f41426f06d682273edd588672fb38672
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 10:45:17 2013 +0100

    [FIX CI] features/manage/hand_over/edit_contract_line.feature

commit 4bc337165ab5b51131326d5a6a7de520c8414836
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 10:37:28 2013 +0100

    [FIX CI] features/technical/visit/hand_over_controller.feature

commit 5cb8274221d03d2b9966d75b2f28347b40e06e5f
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 10:18:43 2013 +0100

    [FIX] remove binding.pry

commit f7a3238dc5777161b796210307ce06287341e0a0
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 10:09:44 2013 +0100

    [FIX] features/examples/probleme.feature:47

commit 12b7729ad94a66359102b1a2dda9ed031d3f07b9
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 09:56:24 2013 +0100

    [FIX] autocomplete-search model for item

commit 276fd446b9e3e7346e2739815632c60491df7a42
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 09:39:19 2013 +0100

    [DOMINA ]put domina as definer for views

commit 401dfede44a1547e25a6ad5ab497382125616619
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 09:34:48 2013 +0100

    [DOMINA] load structure_with_views.sql

commit 8f1d0e0bfe9c9a3d891b7a0a1be74d2fc9c66791
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 09:19:27 2013 +0100

    [FIX] features/examples/probleme.feature:20

commit 39b8b5ec1d8d56a4d61452d79cf6091138a72c25
Merge: 6da9dab ba9fcfe
Author: Sebastian Pape <github@pape.io>
Date:   Fri Nov 15 09:03:53 2013 +0100

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

    Conflicts:
    	features/step_definitions/examples/probleme_steps.rb

commit ba9fcfea9863961c95fb5bd9bd007b673bd7e270
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 15 00:13:58 2013 +0100

    [FIX CI] features/examples/timeline.feature

commit d2c9b4b31736e8cb9755aceb41dbbb88ba15e427
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 14 23:50:50 2013 +0100

    [FIX CI] features/examples/inventar.feature:27

commit 5d2a0d699975a36e4f84bbf3c2cd5323e5f17b25
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 14 23:40:21 2013 +0100

    [FIX CI] features/examples/probleme.feature:30

commit f45f46a325cd090e9ee1be6e6aa472271382c3a1
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 14 22:57:21 2013 +0100

    fixing path for manage_inventory_path

commit 2554665163f18a971290ef891258836da8c8a653
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 14 22:55:06 2013 +0100

    fixing path for manage_edit_model_path

commit d733d5ee8cde1a2c77cc891d2c0dfe5de46c7c45
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 14 22:50:32 2013 +0100

    fixing path for manage_edit_item_path

commit 8e91137e493cac29d4bf1cfee2330ca029f36291
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 14 22:39:36 2013 +0100

    [FIX CI] raise sleep preventing lazy errors

commit 6da9dab492ce59ce32135d1e7a404774e51ecd0a
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 18:52:31 2013 +0100

    [WIP] probleme.feature

commit 2a177654063e2ed8fe0440ae84f66e83170a6c32
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 18:52:20 2013 +0100

    some minor spaces and typo

commit cc23010f8482c06cf1792d66e748d72b54a75cdb
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 18:25:55 2013 +0100

    [FIX] withoutLines selb blocking problem

commit 438436f987a511c45b49dc536e69997731abed27
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 18:08:17 2013 +0100

    [FIX] features/examples/probleme.feature:10

commit dd774fbccbf93350a4e98cbd405971244ff32708
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 17:47:25 2013 +0100

    [FIX] fullcalendar

commit 6e29557bf45fba8e7af07553e778969d74d25cd5
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 17:38:21 2013 +0100

    [FIX] preChange event

commit ceaf18aaa8405408f37e5c41560acb41a824bc13
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 14 17:34:21 2013 +0100

    FIX CI: examples/inventar.feature WIP

commit 8e0626923463b82d1370ac0acaecea17b31388fd
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 16:13:52 2013 +0100

    [FIX] features/examples/modell.feature:146

commit b4af526218ed9ba8374a36dd76342aa86df206c4
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 16:04:06 2013 +0100

    [FIX] features/examples/modell.feature:136

commit 79e5859158f18681e96884691abd7e653877a8ed
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 15:38:46 2013 +0100

    [FIX] features/examples/modell.feature:128

commit bf6c61b11af056499f49373051e33caf30afdfb1
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 15:33:23 2013 +0100

    [FIX] features/examples/modell.feature:120

commit dc8d07ea730b521ff69d2b883706d8d43a563e8f
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 15:18:11 2013 +0100

    [FIX] features/examples/modell.feature:111

commit 3771369c3137530be3798c70fc3e0d2b28b47da6
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 15:10:31 2013 +0100

    [FIX] features/examples/modell.feature:103

commit 9e1aab4ad2b4dd9dbb33a60c1747ee4110a1c500
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 15:01:33 2013 +0100

    [FIX] conflict with different jqueryUI versions, upgrade to latest and adapting interface changes e.g. _renderItem

commit c6670de37c2408a351840d666235ca238498cda7
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 14 14:42:51 2013 +0100

    [FIX CI] features/examples/kategorien.feature (still missing :64)

commit 8633407570c140ba01abcb7f32c04e2d3ec6cbf5
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 14 13:44:42 2013 +0100

    [FIX CI] features/examples/inventar.feature:17

commit 8cea5020f044b21cf41c0d3cd5a33e0eb2211061
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 14 13:31:25 2013 +0100

    FIX CI: examples/gegenstand_kopieren.feature

commit 6b85406f57a7f9781075ad50e72fb0412968f208
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 12:09:03 2013 +0100

    [FIX] features/examples/modell.feature:93

commit 5bc3c81155f13cbefff1897338c35aaf00c1d243
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 14 12:05:20 2013 +0100

    FIX CI: gegenstand_kopieren.feature WIP

commit 90bff12347f4351317c4a7207300763fbf68ca59
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 14 12:00:28 2013 +0100

    [FIX CI] features/examples/geraetepark_administrieren ; features/examples/hinzufuegen

commit 42f1d4edc1caae26b1a4ad824b72813bac9b50d9
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 11:51:43 2013 +0100

    [fix] some model features

commit c3bc12b6ddaf60a2f521205b22e54e040ccaeb35
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 11:50:19 2013 +0100

    [FIX] features/examples/modell.feature:50

commit f2e0601c9e4422ff3ad092af400310835126a335
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 11:38:08 2013 +0100

    [FIX] features/examples/modell.feature:34

commit e8a1f9040971e832aec4fa1b9aabbe9935bbda83
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 11:36:15 2013 +0100

    [FIX] features/examples/modell.feature:20

commit 21b72177311f5d8b95180124135ba056a5424a16
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 11:26:05 2013 +0100

    [FIX] features/borrow/modellliste.feature:102

commit 517c38a29cf2145adfd35f2f708baaea651de667
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 11:17:47 2013 +0100

    minor interface fix

commit b04d3a46baf784e3f441aea84925a6f927857f9d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 14 10:56:07 2013 +0100

    [FIX CI] features/borrow/modellliste.feature:79

commit 0fa991e7d2be51546ee32333c8483602b9ebf13a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Nov 14 10:44:36 2013 +0100

    FIX CI: examples/gegenstand_erstellen.feature

commit b319daafcef6c3c1563a467b44a8303a70170310
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 14 10:28:24 2013 +0100

    [FIX CI] features/examples/option

commit 51ccdb026d5e840be78b4d7b6556b607a81ad4c0
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 10:12:24 2013 +0100

    REFACTORING

    Conflicts:
    	app/assets/javascripts/_NEW/borrow/lib/booking_calendar_dialog.coffee
    	app/assets/javascripts/angularjs/templates/options/edit.html.haml
    	db/structure.sql
    	features/step_definitions/borrow/kalendar_steps.rb

commit e469aa4e344947a4d929169ad3e00e53633f1ba1
Merge: fcc96b8 36cc807
Author: Sebastian Pape <github@pape.io>
Date:   Thu Nov 14 10:06:15 2013 +0100

    Merge branch 'master' into next

    Conflicts:
    	features/step_definitions/borrow/kalendar_steps.rb
    	spec/controllers/hslu_ldap_controller_spec.rb

commit fcc96b8c737fef89de5ea8c60e5d62d1e97e81fd
Author: Sebastian Pape <github@pape.io>
Date:   Tue Oct 29 16:09:08 2013 +0100

    [HOTFIX] Models that are only rentable for specific groups can now be rented

commit f1a6f39bbe0f85f377220cd0903125bba237c79a
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Oct 29 10:39:36 2013 +0100

    More meaningful README

commit 095456769383e369bf1287adca6558f34e8af69e
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Oct 25 11:27:50 2013 +0200

    Disable reruns.

commit 49a0dea015a603edea7cf7d73230b2ee08a55d4d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Oct 23 10:37:04 2013 +0200

    [#59317890] Value list before hand over

commit 2e5c15ae251d088eb267d9a9d087fc8c385ae35d
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Oct 22 15:20:59 2013 +0200

    No need to run migrations there.

commit 2dd206724f7b675434b4cb9edcc499217e492362
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Oct 22 10:22:30 2013 +0200

    We don't need those old recipes anymore.

commit 0b712474f32017856bba2170f023d9cfcb33b803
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 17 20:07:57 2013 +0200

    Use 1.8.7 to deploy the old demo.

commit fb9844ef15ec5c6354521af1d8ea458a5552111a
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 17 20:01:45 2013 +0200

    That was the wrong branch.

commit b9ec5541b09ff15cd991f644c859102d35df51c3
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Oct 11 15:46:29 2013 +0200

    Adding missing file from LDAP fix.

commit 75e689f3080adbc3cfa2cec0ba043c85f5126060
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 10 16:39:16 2013 +0200

    constants checks during settings migration

commit 5c84bab8e95173089bcdfda7ea0e936e12ba1b1b
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 10 15:58:14 2013 +0200

    Fixing the HSLU LDAP auth specs.

commit d666599d967cb6fb65dea1eb2750e7d528414713
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 10 11:43:45 2013 +0200

    Add ldap_config setting to old migration so deploys work.

commit a3dbcc4189cdb884bd32b5f8fbde46ea0b51e489
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 10 11:02:56 2013 +0200

    Changing access restrictions for LDAP fix.

commit 507ca2122af904b0d24fd26fc0a8530a33045e66
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 10 10:51:02 2013 +0200

    Fixing a stupid search/replace mistake.

commit 9844f4d54b32bb3c0fb20aa532d3bbff8d6f0b05
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 10 10:44:06 2013 +0200

    Hotfixing LDAP some more.

commit edc42c6e7ceb785491a669441aa1cdd4fc58e070
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 10 10:36:54 2013 +0200

    Hotfix to the LDAP fix.

commit 8d9f4f2795328e9c495bd8f1049eedc7eed03c43
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 10 10:27:00 2013 +0200

    Read LDAP_CONFIG from the correct object.

commit 84727db066e611b0f9124423c1735831c45ce0a5
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 10 10:05:43 2013 +0200

    Support LDAP config setting.

commit c5871455231dd6d2084bff5ea9d23269a562eaa1
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 10 01:21:28 2013 +0200

    [#58424260] more data cleanup

commit 381d6dd45206fd5d58696780d45100fca1f64733
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 9 17:24:26 2013 +0200

    [#56767438] display list of orders and contracts, including the *new approved* state instead of the *old approved* state

commit 5905680234b501d49701d9b9202076de941ce7be
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 9 15:42:29 2013 +0200

    [#58424260] inconsistent data cleanup

commit 7047462ed56844c3d377f9055720ed21fe54ac93
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 8 18:29:29 2013 +0200

    [FIX CI] features/examples/probleme.feature

commit 9e41673313afe809d1fb56df77b58281d2e019c7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Oct 8 10:32:00 2013 +0200

    Revert "surpress fuzzy warnings from fast_gettext"

    This reverts commit 373b7f98686e9274abb56417167d59cc640d0fc7.

commit accf190cc58d92374ec20b423854a5bc2a723e7a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 7 13:27:12 2013 +0200

    [#56767438] Merge Order and OrderLine into Contract and ContractLine

    Squashed commit of the following:

    commit 503d6f5a423e6aba8856a18b5b8e9698b7c519d6
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Sun Oct 6 17:35:13 2013 +0200

        [FIX CI] use next_open_date instead of Date.today on contract_line factory, preventing CI failing on weekends

    commit 339552cf32b4ab266e3e5acff8d5b3974db1cca1
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Sat Oct 5 23:12:31 2013 +0200

        [FIX CI] features/examples/probleme.feature

    commit 19ff0c11db35efda263d6cc2677507df36e0b85a
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Fri Oct 4 09:46:32 2013 +0200

        [FIX CI] features/backend/acknowledge/approve_anyway.feature

    commit d0262d4b1336323bd91b935f4f67151a4f123591
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Thu Oct 3 16:04:54 2013 +0200

        Bugfix: added line to an approved contract should not inherit any purpose from other lines

    commit 5482c80a2f185b773628bc06371c92dfbb493d85
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Thu Oct 3 13:19:33 2013 +0200

        Fix CI: features/examples/zweck.feature

    commit d799dad0702fbc152e354438008acae465b82f91
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Thu Oct 3 15:41:09 2013 +0200

        [FIX CI] features/examples/probleme.feature (wip)

    commit 3de4e5aa2174a73724537d90a20202c06103c389
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Thu Oct 3 15:05:51 2013 +0200

        [FIX CI] features/examples/passwort.feature

    commit 8458491e83e5abd8a83cdc184064edba591b70ce
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Thu Oct 3 14:50:44 2013 +0200

        [FIX CI] features/examples/modell.feature

    commit 2b8a59f819d757062bc02db232e2386aa68df04b
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Thu Oct 3 14:31:05 2013 +0200

        [FIX CI] features/examples/kalender.feature

    commit c7330d5c4abbe6f64e1dd98dfbe05c3805c5290a
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Thu Oct 3 14:22:47 2013 +0200

        [FIX CI] features/examples/hinzufuegen.feature

    commit f8974c3f905c333daa9c32d0d61d6586e99573ee
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Thu Oct 3 14:03:48 2013 +0200

        [FIX CI] features/examples/benutzerverwaltung.feature

    commit 521a81dc4188080c47227e8c6517224f225bd7b4
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Thu Oct 3 13:19:33 2013 +0200

        Fix CI: features/examples/zweck.feature WIP

    commit f0497d173361eedb553541a2bc6761c85006fc03
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Thu Oct 3 12:20:36 2013 +0200

        Fix CI: login.feature

    commit c2ae3864570e832002926acb23bca9b134bb642d
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Thu Oct 3 12:20:06 2013 +0200

        Fix CI: features/work_days

    commit 3dc9de0be4593c33e3a1ec84f92a3374a2616d2a
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Thu Oct 3 12:19:34 2013 +0200

        Fix CI: features/acknowledge

    commit b021eb21ab3af8cd160c22a7b1a156f7b731018b
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Thu Oct 3 12:36:58 2013 +0200

        [FIX CI] features/examples/ausleihe.feature

    commit ab4aba1b59a993bd017e377a9fe41000bcd321ef
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Thu Oct 3 11:31:45 2013 +0200

        [FIX CI] features/backend/hand_over/edit_contract_line.feature

    commit 28b61b87251c75658af8f0760f7d4c06c2ae358e
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Thu Oct 3 10:59:07 2013 +0200

        Fix CI: backend/approve_anyway.feature

    commit c6b08896c1f12f21eb1ed5cebd8b78593b55692d
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Thu Oct 3 10:48:11 2013 +0200

        [FIX CI] features/backend (wip)

    commit 9168f974400b70cdee34fecae35b99426de86743
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Oct 2 17:53:18 2013 +0200

        [FIX CI] borrow/timeoutpage.feature

    commit c2bb2d9ea57f7f07561d78f0177b6211e9cadf96
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Oct 2 17:21:01 2013 +0200

        [FIX CI] borrow/timeoutpage.feature

    commit 102fc7ba4719a70958000091bc2456904a0f2a7d
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Oct 2 16:58:01 2013 +0200

        [FIX CI] borrow

    commit d19458d79c77c72f968206b8c45ad157ff1f39da
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Wed Oct 2 16:14:56 2013 +0200

        fixing borrow/timeoutpage.feature WIP

    commit 2ca0ee0b07fa1ffaae7076507d6642b0c5ec23e3
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Oct 2 15:55:01 2013 +0200

        [FIX CI] borrow/bestellungen.feature

    commit fcf6812290489769a1bbe66072d7aee0a64dde29
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Oct 2 15:40:03 2013 +0200

        [FIX CI] borrow/bestelluebersicht.feature

    commit f6f1c4063ac10f09cb0efb8fccc322d76037e0e2
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Wed Oct 2 14:15:36 2013 +0200

        Fix order timeout out path in test

    commit 0976b86d346635e5d53126623313e01010487bbd
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Oct 2 14:15:16 2013 +0200

        [FIX CI] borrow/timeoutpage.feature (wip)

    commit 121f9657841f225368c04a0936170ac56eb84df3
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Oct 2 14:07:51 2013 +0200

        [FIX CI] borrow/bestelluebersicht.feature (wip)

    commit c329cef964833d89b5f94f97b6af90abe02aee46
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Oct 2 13:51:25 2013 +0200

        [FIX CI] borrow/bestelluebersicht.feature (wip)

    commit 793d360bbe93e55665718425e411b552d32c0a03
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Wed Oct 2 13:30:51 2013 +0200

        fix visit & visit lines sql views

    commit b8247c00c877a93a9bc43c20fec1ab383490c85e
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Oct 1 17:15:52 2013 +0200

        fixing typo

    commit b2449ce33e863b74f4d54c37ea636b095bc765e6
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Oct 1 16:58:28 2013 +0200

        [FIX CI] borrow

    commit 05ac7b7432f66ccb9e8da8c7a8af79269b7633e0
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Oct 1 16:33:25 2013 +0200

        current_order completely dropped

    commit 923bf39c5229270350a6b21bc76b27f930be7cb1
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Oct 1 14:51:17 2013 +0200

        new Contract flow, after dropping Order

    commit d73ed408692515a1432458a5797649e06a986a92
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Oct 1 14:32:45 2013 +0200

        (wip) dropping current_order

    commit cdcabe252ce803e0f93b35b5f58a64d18dc1872e
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Oct 1 13:50:48 2013 +0200

        (wip) borrow section

    commit c4dcf25f6c2afb11e1cf9a69b60b5e411f5dea02
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Oct 1 13:40:26 2013 +0200

        (wip) borrow section

    commit 9785fd4b14c910126c7e7c31dd83f857441c7d18
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Tue Oct 1 11:50:08 2013 +0200

        rename forgotten class names in borrow section

    commit 6d974294d2242a2b43083e54a1442bb31cef305c
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Tue Oct 1 09:56:43 2013 +0200

        refactor routes.rb

    commit 893e4daecb322eff5a4fa668893d7696f0069aa5
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Tue Oct 1 09:56:35 2013 +0200

        refactor borrow views

    commit 837ba47b4fbd4ab190c3489fa0c0a899044fe98e
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Mon Sep 30 16:43:49 2013 +0200

        refactor orders_controller and order_lines_controller in borrow section

    commit 65f465fd4a70a5c521d98d7c023e3f0079484da0
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Mon Sep 30 16:43:49 2013 +0200

        refactor orders_controller and order_lines_controller in borrow section

    commit 805e57d80e8f06f4780751e25adffeb87d7db026
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Sep 30 17:50:25 2013 +0200

        merging Backend::OrdersController into Backend::ContractsController

    commit 8e6c3d1de1147083feea7cb39fdbef622c7217d8
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Mon Sep 30 16:43:49 2013 +0200

        renaming orders to contracts in borrow section WIP

    commit 4c5ebf3d95dafc07148a00c5d585adf221f82852
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Mon Sep 30 15:31:16 2013 +0200

        rename @orders to @contracts in orders/index view

    commit 9cb5d22ea2124500afbad9ea6fde7e8cae1c7e8e
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Sep 30 15:27:38 2013 +0200

        contract and contract_line json helpers

    commit 139b0c0cd12dd17b23f7163f241dc1782a013c6c
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Sep 30 15:07:12 2013 +0200

        merging order and order_line json helpers to contract and contract_line

    commit 3741664a89f4c60aa7f2aa1edc94cbf30a1fb9c5
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Mon Sep 30 14:00:08 2013 +0200

        minor optimization in one step

    commit 1bffeda8286e50da8b7bd64c030b99662900745b
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Sep 30 14:00:08 2013 +0200

        [FIX CI] personas create contract_lines

    commit 724f3b2038038f2860b1f99c0015850c7437eb06
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Sep 30 13:46:35 2013 +0200

        [FIX CI] add lines to contract

    commit 8b6259a4640721055a423dd01bba340c74bad1ae
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Sep 30 12:46:18 2013 +0200

        [FIX CI]

    commit e5244fcac73c46fb85f0b291f377be7599815d71
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Mon Sep 30 12:19:02 2013 +0200

        fix leihs factory to create settings

    commit 3b58903c1032c48d8dba52bfe47ccedb69bc1294
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Mon Sep 30 12:18:34 2013 +0200

        use the correct method unsubmitted_contracts

    commit fafb0d7b25fd92178e89fba7d5a46a7565650f5b
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Sep 30 12:02:43 2013 +0200

        [FIX CI] features/technical/

    commit 3799509bb7518522dc6bfc87231ee074680e15e9
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Fri Sep 27 18:06:56 2013 +0200

        minor fix

    commit df40c31c3428bd927bb161d04b8187bfbae2261e
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Fri Sep 27 18:00:56 2013 +0200

        - refactoring user#current_order to user#contracts.unsubmitted and user#unsubmitted_contract(ip)
        - refactoring contract#timeout? to user#timeout?
        - adapted contract_line#purpose
        - adapted mailer templates
        - adapted contract and contract_line factories

    commit b4b8fd1a4f2ac1fec2d5cdade752ee0097f3624c
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Fri Sep 27 14:16:24 2013 +0200

        flatting Document and DocumentLine into Contract and ContractLine

    commit 87922c64758f5e8a1fd2ec7c609dff42c192fc73
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Fri Sep 27 14:04:41 2013 +0200

        move order rspec tests to contract folder

    commit 506f403898c949f97d6ab9ae7116a5c5428a3051
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Fri Sep 27 12:05:08 2013 +0200

        missing renamings order -> contract in tests & using FactoryGirl instead of LeihsFactory for orders

    commit f7f3a97ebddd4ad3c40efba498465dcd2ea7f616
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Thu Sep 26 19:12:10 2013 +0200

        (wip) translating order to contract

    commit b2b5f155e926bd750be66cda183069fb976ba92d
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Thu Sep 26 16:59:32 2013 +0200

        (wip) second migration draft, merging Order and OrderLine into Contract/Document and ContractLine

    commit e14523b691dae88d07e9cf763dfc35dc2d244740
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Thu Sep 26 16:00:19 2013 +0200

        rename order to contract in backend features and steps

    commit d8eb13484d5bdf40ebcb85a2c0753157564eef96
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Thu Sep 26 15:24:28 2013 +0200

        factories and personas

    commit ed10a5d38a80f59748a8a6fda6e7b254faf285dc
    Author: Matus Kmit <matus.kmit@zhdk.ch>
    Date:   Thu Sep 26 14:53:51 2013 +0200

        validates presence of status in contract

    commit fd0a8f0ca4eed74c925faa498db8835986a6dd05
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Thu Sep 26 10:44:22 2013 +0200

        (wip) first migration draft, removing Order and OrderLine, new diagram

    commit bb9e65eacf5df0c0ef3ff14ddc09e9feeda11683
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Sep 25 19:36:43 2013 +0200

        renaming method

    commit 996caf330f5f74f83c33cee7561290be93c78e44
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Sep 25 19:35:28 2013 +0200

        translating constants

    commit 1322d4bb1c270f0135302c4b5144729782d04df4
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Sep 25 19:25:37 2013 +0200

        adapting sql views

    commit 80a2d7a91e88107811dddc4c1d7187a123e7cc53
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Sep 24 18:06:01 2013 +0200

        activating pending migrations => from now on the database doesn't support leihs2 and leihs3 parallel running anymore!

commit cccf8fc46ffe1097bb05856216be43e215241100
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 30 10:08:32 2013 +0200

    Fix CI: features/borrow/kalender.feature:36

commit 373b7f98686e9274abb56417167d59cc640d0fc7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 25 11:34:00 2013 +0200

    surpress fuzzy warnings from fast_gettext

commit c9c329079195aee21baa3020682f9d8498283500
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 25 10:27:36 2013 +0200

    Fix CI: features/step_definitions/examples/inventar_steps.rb

commit 2befb9ae761de06e972de5f4b3d26fed40baa945
Author: nadjaweisskopf <nadja.weisskopf@zhdk.ch>
Date:   Tue Sep 24 14:35:11 2013 +0200

    [#56780714] Admin verliert Pool-Berechtigungen

commit e912d1fb98ec6cde3d99a3400172e81f0e2a0ffa
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 24 10:18:40 2013 +0200

    Fix CI: features/examples/kategorien.feature:26

commit d5112a9be39b5186f3755bbb743804d0aba150fc
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 24 10:06:39 2013 +0200

    Fix CI: ausleihe.feature

commit 2cf0026a3ea38a2e45f3dfc1a10836c75ee0a194
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 24 10:03:21 2013 +0200

    Fix CI: kategorien.feature

commit 148beeb37ab4237fbb80a84eddfff5dd5176f458
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 24 09:59:26 2013 +0200

    Fix CI: geraetepark_administrieren.feature

commit 030a04e9c5dd001231db40c38b816074777527da
Author: Sebastian Pape <github@pape.io>
Date:   Tue Sep 24 10:06:50 2013 +0200

    [FIX CI] modellliste.feature:28

commit 374e89f51bbbdf6aaa17d338b4f4710e03cb5e9f
Author: Sebastian Pape <github@pape.io>
Date:   Mon Sep 23 15:50:45 2013 +0200

    [FIX CI] inventar_steps.rb:203

commit 0a35c7f1cc01d94662d0f09288de02a4c261a535
Author: Sebastian Pape <github@pape.io>
Date:   Mon Sep 23 15:09:51 2013 +0200

    [FIX CI] revert the shutdown, was not helping

commit 123975dc11faf8f40607928a8bfa4f238abec86d
Author: Sebastian Pape <github@pape.io>
Date:   Mon Sep 23 14:50:12 2013 +0200

    [FIX CI] inventar.feature:52
increase version to 3.0.0, yeah
Merge remote branch 'upstream/master'

Conflicts:
	app/models/user.rb