* commit 8372b0e06a741361066f68aefcbd4cfa8dd80b41
| Author: dew <dew@melexis.com>
| Date:   Thu Jul 8 15:07:06 2010 +0100
|
|     resolved conflict
|
* commit 247e05f06fa042504de49f553441707e43732113
| Author: dew <dew@melexis.com>
| Date:   Thu Jul 8 00:58:06 2010 +0100
|
|     integrated update team member PFUS-393 functionality into HEAD
|
*   commit a713246bd87cd567e05f8af59f6a1120a88c172b
|\  Merge: b9789bc c6fffdb
| | Author: dew <dew@melexis.com>
| | Date:   Wed Jul 7 23:02:04 2010 +0100
| |
| |     Merge branch 'master' of ssh://github.com/melexis/pfus into PFUS-393
| |
| |     Conflicts:
| |             core/.project
| |             core/src/main/java/com/melexis/pfus/service/ProjectServiceBean.j
ava
| |             ui/src/main/java/com/melexis/pfus/ui/page/ProjectPage$TeamMember
Panel.html
| |             ui/src/main/java/com/melexis/pfus/ui/page/ProjectPage.java
| |             ui/src/main/java/com/melexis/pfus/ui/panel/ApproveChecklistPanel
.html
| |             ui/src/main/java/com/melexis/pfus/ui/panel/ProductPage$ActionPan
el.html
| |             ui/src/main/java/com/melexis/pfus/ui/panel/QuestionPage$ActionPa
nel.html
| |             ui/src/main/java/com/melexis/pfus/ui/panel/QuestionnairePage$Act
ionPanel.html
| |             ui/src/test/java/com/melexis/pfus/ui/page/ProjectPageITest.java
| |             ui/src/test/resources/test-beans.xml
| |
| * commit c6fffdb61126ea3fe10e95ba8d3cfc29ad1888bd
| | Author: Brecht Hoflack <brh@melexis.com>
| | Date:   Tue Jul 6 12:08:20 2010 +0200
| |
| |     PFUS-312 Fixed the failing unit tests.
| |
| * commit 3070b6682d0f598dfdd8a2e0a9a1199757834e37
| | Author: Brecht Hoflack <brh@melexis.com>
| | Date:   Tue Jul 6 11:58:22 2010 +0200
| |
| |     PFUS-312 Create a cqn if needed.
| |
| * commit a07ca26485e7d8bc7db2619a9648ed3dd4224934
| | Author: Brecht Hoflack <brh@melexis.com>
| | Date:   Mon Jul 5 13:57:20 2010 +0200
| |
| |     PFUS-312 Refactored the location of panels and pages.
| |
| * commit e1906adc6ee18cc4df5998c40c65294bc9558f3f
| | Author: Brecht Hoflack <brh@melexis.com>
| | Date:   Mon Jul 5 13:34:14 2010 +0200
| |
| |     PFUS-396 Seperate unit from integration test for the whole project.
| |
| * commit b4bb4453659b90239e51ffef7ee5f7b770fe4bc9
| | Author: Brecht Hoflack <brh@melexis.com>
| | Date:   Mon Jul 5 13:24:10 2010 +0200
| |
| |     PFUS-396 Separated test from integration-test.
| |
| * commit 9b95cf50aa52ebcd409adc39c4081090f54793d7
| | Author: Brecht Hoflack <brh@melexis.com>
| | Date:   Mon Jul 5 11:15:08 2010 +0200
| |
| |     PFUS-315 Made the windowBehaviour transient.
| |
| * commit a83fbd5e8405f488fd4c279ff9ffe409abe488ea
| | Author: Brecht Hoflack <brh@melexis.com>
| | Date:   Mon Jul 5 10:57:46 2010 +0200
| |
| |     PFUS-315 Removed the margin.
| |
| *   commit 4af3fa7a2eede7563364f2dfac266ecffc51f9a2
| |\  Merge: dcf0ed2 f992a52
| | | Author: Brecht Hoflack <brh@melexis.com>
| | | Date:   Mon Jul 5 10:43:36 2010 +0200
| | |
| | |     Merge branch 'master' of ssh.github.com:melexis/pfus into PFUS-315
| | |
| | *   commit f992a52fb7fe88c82f6b925f57f075739154c38d
| | |\  Merge: 3f4ab42 8f2aa90
| | | | Author: kry <kry@melexis.com>
| | | | Date:   Fri Jul 2 17:17:17 2010 +0200
| | | |
| | | |     Merge branch 'master' of git@ssh.github.com:melexis/pfus into PFUS-3
12
| | | |
| | * | commit 3f4ab428116e3b0ecf9e35cafb587960c7e68924
| | | | Author: kry <kry@melexis.com>
| | | | Date:   Fri Jul 2 17:16:52 2010 +0200
| | | |
| | | |     PFUS-312 removed the update button.
| | | |
| * | | commit dcf0ed2fe2d8bc09869bb3b831c3ecae731a39d5
| | |/  Author: Brecht Hoflack <brh@melexis.com>
| |/|   Date:   Mon Jul 5 10:43:04 2010 +0200
| | |
| | |       PFUS-315 Add create new project by nickname.
| | |
| * | commit 8f2aa901ed7eeea8bbacfdb5abdbe2033eb7a5e9
| | | Author: Brecht Hoflack <brh@melexis.com>
| | | Date:   Fri Jul 2 16:27:25 2010 +0200
| | |
| | |     PFUS-315 Fixed the tests.
| | |
| * |   commit 448eb0761e3cc01daece664b721546f667c0fe4e
| |\ \  Merge: 88a5308 2a16002
| | |/  Author: Brecht Hoflack <brh@melexis.com>
| | |   Date:   Fri Jul 2 15:57:46 2010 +0200
| | |
| | |       Merge branch 'master' of ssh.github.com:melexis/pfus into PFUS-315
| | |
| | *   commit 2a16002d8b50512fa1b77c8e2b345d467be38a32
| | |\  Merge: f3e2719 2672abd
| | | | Author: kry <kry@melexis.com>
| | | | Date:   Fri Jul 2 15:34:08 2010 +0200
| | | |
| | | |     Merge branch 'master' of git@ssh.github.com:melexis/pfus into PFUS-3
12
| | | |
| | | * commit 2672abd62d718b87f6f861e22f6d02e803bb64de
| | | | Author: kry <kry@melexis.com>
| | | | Date:   Fri Jul 2 15:10:04 2010 +0200
| | | |
| | | |     PFUS-378 removed files which do not need to be tracked.
| | | |
| | * | commit f3e2719180dd17c9b38b2f1f28a52c0ede33afd7
| | | | Author: kry <kry@melexis.com>
| | | | Date:   Fri Jul 2 14:54:23 2010 +0200
| | | |
| | | |     PFUS-312 added .project and .settings to gitignore file.
| | | |
| | * | commit e75b959d48c5f527b4b2c8e7dac1dfa2c58a697f
| | | | Author: kry <kry@melexis.com>
| | | | Date:   Fri Jul 2 14:52:17 2010 +0200
| | | |
| | | |     :x
| | | |
| | * | commit ca9b12d3cf2e7715b8b5ae20dcec86630c8a8957
| | | | Author: kry <kry@melexis.com>
| | | | Date:   Fri Jul 2 14:16:30 2010 +0200
| | | |
| | | |     PFUS-312 Added enable and disable checks in the abstract test tools.

| | | |
| * | | commit 88a5308ed36464307a7bb0ca7c8f5719ec0076ea
| | | | Author: Brecht Hoflack <brh@melexis.com>
| | | | Date:   Fri Jul 2 15:57:15 2010 +0200
| | | |
| | | |     PFUS-315 Changed the add product.
| | | |
| * | | commit 8153626aa657022d5e79acf8fd638443974e6ccd
| | | | Author: Brecht Hoflack <brh@melexis.com>
| | | | Date:   Thu Jul 1 15:22:41 2010 +0200
| | | |
| | | |     PFUS-315 Save a new product by specifying a nickname.
| | | |
* | | | commit b9789bcf18737b4402ce65de4d92ff962d35b220
| |_|/  Author: dew <dew@melexis.com>
|/| |   Date:   Wed Jul 7 12:01:25 2010 +0100
| | |
| | |       core/.project
| | |       PFUS-393 HTML files have not changed apart from format. All Java res
ources have been updated though.
| | |
* | |   commit f1664dcc5efd619566031849841158cc6dbd9a19
|\ \ \  Merge: 2feffd7 02aa46e
| | |/  Author: dew <dew@melexis.com>
| |/|   Date:   Fri Jul 2 13:19:15 2010 +0100
| | |
| | |       Merge branch 'master' of ssh://github.com/melexis/pfus into PFUS-378

| | |
| | |       Conflicts:
| | |           core/src/main/java/com/melexis/pfus/service/ChecklistServiceBean
.java