6506 Commits

Author SHA1 Message Date
1522ae9285 Merge remote-tracking branch 'origin/develop' into develop 2014-04-30 13:56:53 +02:00
7e92b27b28 Removed faulty Pageable. 2014-04-30 13:55:44 +02:00
f8a291cb8f Unused code. 2014-04-30 13:54:37 +02:00
63be40966c Unused code. 2014-04-30 13:54:19 +02:00
f98cad3ecc In-lined useless class. 2014-04-30 13:53:43 +02:00
08aa39e73c Unused code. 2014-04-30 13:51:33 +02:00
0b54c62082 Unused code. 2014-04-30 13:50:59 +02:00
a5884f4547 Unused code. 2014-04-30 13:50:05 +02:00
5c336a6b19 Unused code. 2014-04-30 13:46:08 +02:00
417bcb9c22 Unused code. 2014-04-30 13:45:11 +02:00
cb5ec9ed9f Unused code. 2014-04-30 13:40:46 +02:00
Emil Siverhall
74cbc83a04 tab only visible for head supervisor 2014-04-30 09:33:55 +02:00
Emil Siverhall
d97ef416e1 oops 2014-04-30 08:44:24 +02:00
fred-fri
26a0d93cfe removing edit description stuff 2014-04-30 15:42:56 +09:00
Emil Siverhall
9a2b03b081 Merge remote-tracking branch 'origin/develop' into develop 2014-04-30 08:27:12 +02:00
Emil Siverhall
61c7d34251 New message instead of New reply in reviewer interaction 2014-04-30 08:26:57 +02:00
fred-fri
9e84ec9a9d renamed internal user to local user 2014-04-30 15:15:19 +09:00
Emil Siverhall
54de6ab54d renamed migration scripts and some minor changes 2014-04-29 22:46:47 +02:00
Emil Siverhall
f3b48c6bae Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorInteractWithReviewerPage.html
2014-04-29 22:23:10 +02:00
fc2352b2aa Trying to fix test for jenkins. 2014-04-29 18:21:56 +02:00
92ef98fcaa Fixed tests. 2014-04-29 18:11:34 +02:00
d0d7437a31 Seriously tun on optimize imports. 2014-04-29 18:02:25 +02:00
e2b3468bc4 You will not be missed. 2014-04-29 16:56:45 +02:00
61e066ac17 Styling. 2014-04-29 16:50:57 +02:00
Emil Siverhall
1ab425cb59 do not notify if not forum thread being replied to 2014-04-29 16:45:42 +02:00
8d66ae9460 Made decision history start out collapsed. 2014-04-29 16:41:31 +02:00
d1d4825e7e Added FinalSeminarApprovalPanel to the interact with reviewer page. 2014-04-29 16:36:14 +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
Emil Siverhall
6bcb331de2 renamed migration scripts and merged reviewer interaction page content 2014-04-29 12:19:51 +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
fred-fri
90abcf4041 add and remove draft features for supervisor 2014-04-29 15:43:54 +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
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