15099 Commits

Author SHA1 Message Date
4cc659f711 Minor fixes. 2014-04-29 16:21:58 +02:00
3b67ccc474 Included ReviewingModule in the application. 2014-04-29 16:21:52 +02:00
38acc9e225 Implemented FinalSeminarApprovalService. 2014-04-29 16:17:42 +02:00
Emil Siverhall
c23d3bba88 label change 2014-04-29 15:49:38 +02:00
aa66690fb3 Panel to show the current ongoing process for approving final seminars. 2014-04-29 15:29:52 +02:00
Emil Siverhall
9b3a1d03d7 project header to reviewers interaction page 2014-04-29 15:22:56 +02:00
8b2e84757f Added constructor for use with CompoundPropertyModel. 2014-04-29 14:58:14 +02:00
Emil Siverhall
af13350b8b interaction page for reviewers 2014-04-29 14:56:40 +02:00
38aecc1e4c Overkill for CompoundPropertyModel 2014-04-29 14:56:28 +02:00
4431eef165 Panel for the supervisor to initiate the final seminar approval process. 2014-04-29 14:09:52 +02:00
f7626c7e1a Merge remote-tracking branch 'origin/develop' into develop 2014-04-29 13:08:03 +02:00
Emil Siverhall
6bcb331de2 renamed migration scripts and merged reviewer interaction page content 2014-04-29 12:19:51 +02:00
e4d35e202e Created new model for making decisions if final seminar is allowed. 2014-04-29 11:34:47 +02:00
Emil Siverhall
4cc4bbe4ea Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/main/java/modules/RepositoryModule.java
	view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java
	view/src/test/java/se/su/dsv/scipro/SciProTest.java
2014-04-29 11:31:01 +02:00
Emil Siverhall
8548a39772 back link invisible if thread isn't instance of ForumThread 2014-04-29 11:21:34 +02:00
fred-fri
3bc95f1f39 added reviewer stuff 2014-04-29 17:48:01 +09:00
Emil Siverhall
6ea1a5e6b9 unthreaded forum shouldn't show reviewer interaction threads 2014-04-29 09:29:53 +02:00
fred-fri
90abcf4041 add and remove draft features for supervisor 2014-04-29 15:43:54 +09:00
Emil Siverhall
032bf9a19e test tweaking 2014-04-29 08:33:50 +02:00
fred-fri
85b863e380 adding draft to project (simplest possible solution) 2014-04-29 14:21:44 +09:00
fred-fri
ef75cb0498 adding new interact with reviewer page 2014-04-29 13:47:41 +09:00
fred-fri
e7fb72ab6e added points at reviewing page 2014-04-29 11:58:11 +09:00
fred-fri
bc821660b1 removed beta from latest events 2014-04-29 11:16:27 +09:00
fred-fri
438bbb1387 notification fixes 2014-04-29 11:14:39 +09:00
Emil Siverhall
f56cab5b9c service in the wrong root and redirected foreign key on forum_posts 2014-04-28 22:46:54 +02:00
Emil Siverhall
f6a6601304 wild and crazy with the threads 2014-04-28 21:05:52 +02:00
Emil Siverhall
f7b58c2588 thread refactoring 2014-04-28 15:01:11 +02:00
Emil Siverhall
dc5ac5a6cc abstractthread -> ForumThread / ReviewerThread 2014-04-28 08:43:48 +02:00
fred-fri
b8b5a19438 moving order columns around 2014-04-28 14:55:32 +09:00
fred-fri
7e1a49830d removing resourcemodels that caused issues 2014-04-28 13:33:12 +09:00
fred-fri
dae37771a4 removing resourcemodels that caused issues 2014-04-28 13:32:21 +09:00
fred-fri
f463f70b5b test fix 2014-04-28 13:18:05 +09:00
fred-fri
6d82ea908f filter fix 2014-04-28 13:00:58 +09:00
fred-fri
b17d790034 cleanup 2014-04-28 12:19:15 +09:00
fred-fri
8687943573 Merge remote-tracking branch 'origin/develop' into develop 2014-04-28 12:17:24 +09:00
fred-fri
3785ae1b01 cleanup 2014-04-28 12:17:00 +09:00
7bea134671 Upgraded Wicket to version 6.15.0 2014-04-25 14:51:37 +02:00
fred-fri
22e6254e7c added example filtering 2014-04-25 21:32:27 +09:00
Richard
cc1382366b Removed blue-box from the css. 2014-04-25 13:36:21 +02:00
Richard
9d7a43b158 Replaced blue-box with help-box. 2014-04-25 13:35:57 +02:00
Richard
5ff5a96279 Replaced blue-box with help-box. 2014-04-25 13:35:36 +02:00
Richard
5ca5b27c6b Replaced blue-box with help-box. 2014-04-25 13:35:16 +02:00
Richard
b3ffe336cd Replaced blue-box with help-box. 2014-04-25 13:34:56 +02:00
Richard
cd0441da78 Replaced reason-box with help-box. 2014-04-25 13:21:44 +02:00
Richard
48a65838d2 Removed reason-box from the css.
Changed color on .well .help-box to #000000.
Changed border-color on .well .help-box to #cccccc.
2014-04-25 13:21:18 +02:00
Richard
a58d5403e2 Removed info-box from the css.
Removed olive-box from the css.
2014-04-25 12:03:28 +02:00
Richard
19a231bbd2 Removed info-box and replaced it with info-panel. 2014-04-25 12:00:14 +02:00
Richard
4d54a282da Removed info-box. 2014-04-25 11:55:35 +02:00
Richard
15853cbb56 Removed info-box and replaced it with info-panel. 2014-04-25 11:49:15 +02:00
Richard
68723a1a3a Removed info-box and replaced it with info-panel. 2014-04-25 11:48:40 +02:00