Per Lundholm
e205087a87
Fixed test problem due to DetachableServiceModel been introduced. And warnings about not using equals.
2013-10-17 08:26:50 +02:00
fred-fri
1ba715da29
fixed some peer issues relating to multiple reviews on a request
2013-10-17 12:29:29 +09:00
Leo
88329c541c
merge
2013-10-16 16:16:36 +02:00
Leo
82c2ab470b
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/datatables/GenericDataPanel.java
2013-10-16 16:12:12 +02:00
Leo
c8fb117222
re-added the functionality to download excel files
2013-10-16 16:09:55 +02:00
1ce1f7eb81
Merge remote-tracking branch 'origin/develop' into develop
2013-10-16 16:00:32 +02:00
ecea5d6c5a
Made GenericDataPanel use detachable model instead of stale serializable models for its objects to prevent optimistic locking.
...
General clean up of GenericDataPanel.
2013-10-16 16:00:27 +02:00
Leo
397afb1d8a
fixed lazy initialization exception
2013-10-16 15:44:29 +02:00
43d5c15135
Changed log level to reduce noise.
2013-10-16 14:56:10 +02:00
d6182cabf2
Fixed faulty test. Failed if any earlier test had built a project using the builder thing.
2013-10-16 14:54:42 +02:00
9afee9a1ce
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
2013-10-16 14:48:05 +02:00
99b6d56583
Yay for duplicated code ;)
2013-10-16 14:48:01 +02:00
8a836baa66
Removed invalid wiquery references.
2013-10-16 14:43:01 +02:00
Per Lundholm
895662aa05
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
2013-10-16 14:38:57 +02:00
Per Lundholm
7d342282c9
Removed System.out.println except for instansiating
2013-10-16 14:38:46 +02:00
9e9d4c6149
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
2013-10-16 14:27:44 +02:00
254d7d9834
Tested SupervisorFilePage
...
Fixed AbstractFilePanel;
* No longer leak mutable page parameters objects, creates a copy so that a links target is not modified by later code using the same object
* No longer calls abstract methods in the constructor
2013-10-16 14:27:40 +02:00
Per Lundholm
f32afc32bd
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
2013-10-16 14:16:42 +02:00
Per Lundholm
7479b36734
Refaktored and tested PeerReviewPerformReviewPanel in futil attempt to find bug.
2013-10-16 14:16:31 +02:00
deb8e3a7ac
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
2013-10-16 14:15:42 +02:00
Richard
21ebdc955a
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
2013-10-16 14:13:43 +02:00
Richard
863d620e58
Styling av wicket modal.
...
Overview-fix (word-break endast på senast uppladdade fil).
2013-10-16 14:11:57 +02:00
Leo
1115bc892c
Merge branch 'wicketupdate' of ssh://git.dsv.su.se/git/scipro/scipro into wicketupdate
2013-10-16 14:11:03 +02:00
Leo
34c273c4e1
made the "New Activity"-buton work again.
...
found a bug with canceling the adding of a new activity and fixed it
2013-10-16 14:10:47 +02:00
Per Lundholm
34de3c7e59
Changed startPage to return WebPage
2013-10-16 14:10:16 +02:00
Per Lundholm
2e234f58aa
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
2013-10-16 14:00:45 +02:00
c6571f02e7
Created common superclass for all supervisor pages which takes care of injecting an active project.
2013-10-16 13:56:23 +02:00
Dan Lagnöhed
eeae47a176
Checking wicket upgrade
2013-10-16 13:44:56 +02:00
Per Lundholm
2ba2365428
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
2013-10-16 13:36:43 +02:00
Leo
7d337de41a
Merge branch 'wicketupdate' of ssh://git.dsv.su.se/git/scipro/scipro into wicketupdate
2013-10-16 11:58:12 +02:00
Leo
9e1628f6c3
more render tests
2013-10-16 11:58:04 +02:00
Dan Lagnöhed
3a9209ba0f
Checking wicket upgrade
2013-10-16 11:42:13 +02:00
Dan Lagnöhed
1da835cf7c
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
2013-10-16 11:36:15 +02:00
Dan Lagnöhed
28b8e1e7c7
Checking wicket upgrade
2013-10-16 11:36:06 +02:00
Leo
0408718c9e
Merge branch 'wicketupdate' of ssh://git.dsv.su.se/git/scipro/scipro into wicketupdate
2013-10-16 11:35:19 +02:00
Leo
c5b2e53c81
more render tests
...
fixed notifications when creating threads in the non threaded forum
2013-10-16 11:35:08 +02:00
Dan Lagnöhed
31357c24fb
Checking wicket upgrade
2013-10-16 11:22:33 +02:00
0692e85194
Tested SupervisorCreateForumThreadPage
2013-10-16 11:10:52 +02:00
Leo
af602b24eb
Merge branch 'wicketupdate' of ssh://git.dsv.su.se/git/scipro/scipro into wicketupdate
2013-10-16 11:10:31 +02:00
Leo
34fb390b18
more render tests
2013-10-16 11:10:14 +02:00
d3ab2191e8
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
2013-10-16 11:03:22 +02:00
2e885c5241
Tested SupervisorChecklistPage
...
Removed faulty image from table of added checklists.
2013-10-16 11:03:17 +02:00
Per Lundholm
b6a3ff9f05
Added startPage convience method
2013-10-16 10:58:49 +02:00
Dan Lagnöhed
097ab46d37
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
2013-10-16 10:56:23 +02:00
Dan Lagnöhed
a8db68a60d
Checking wicket upgrade
2013-10-16 10:56:15 +02:00
d1f47f526e
Tested SupervisorActivityPlanPage
2013-10-16 10:52:51 +02:00
Leo
adf2e5e4b1
Merge branch 'wicketupdate' of ssh://git.dsv.su.se/git/scipro/scipro into wicketupdate
2013-10-16 10:43:37 +02:00
Leo
da69aa4426
more render tests
2013-10-16 10:43:25 +02:00
9dd7d5ff52
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
2013-10-16 10:39:24 +02:00
27fbef2367
Made EmployeeAutoComplete use a detachable model to prevent Hibernate LIE.
2013-10-16 10:39:19 +02:00
