6556 Commits

Author SHA1 Message Date
niklas3
5aa8993d1c Final seminar details now displays the project title. 2013-11-27 12:16:41 +01:00
Richard
be10c87526 Merge remote-tracking branch 'origin/develop' into develop 2013-11-27 10:56:48 +01:00
Richard
cf37c43c10 Added "Application period" above droplist.
Re-structured the filters on match>ideas.
2013-11-27 10:56:28 +01:00
fred-fri
e45519f8cb Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-11-27 18:30:07 +09:00
fred-fri
281b60a8f8 adding links 2013-11-27 18:28:44 +09:00
Emil Siverhall
0c228277e5 page mounting for admin/users pages 2013-11-27 10:12:42 +01:00
Emil Siverhall
dc848b4c24 Internal users tab with list of all internal users in the system (identifier = null) 2013-11-27 09:21:52 +01:00
fred-fri
249c440000 added opposelink 2013-11-27 16:51:10 +09:00
fred-fri
caadae5c92 redirecting to page instead of opening dialog 2013-11-27 15:54:13 +09:00
fred-fri
a3907bff67 redirecting to page instead of opening dialog 2013-11-27 15:42:22 +09:00
fred-fri
3c67e285b6 fixed filtering on application period edit targets page 2013-11-27 12:05:13 +09:00
fred-fri
3deb7ebde7 fixed filtering on application period edit targets page 2013-11-27 12:03:17 +09:00
ac30116611 Changed stale model to detachable that caused LazyInitializationException when trying to edit an existing idea. 2013-11-26 19:49:58 +01:00
Emil Siverhall
2d08f1f91e Avoid UnsupportedOperationException when trying to add element to Arrays.asList created list. 2013-11-26 16:55:54 +01:00
Emil Siverhall
d7b06bb2a3 Merge remote-tracking branch 'origin/develop' into develop 2013-11-26 16:32:59 +01:00
Emil Siverhall
fb252ace3c Moved Extended ideas administration to it's own tab (Admin->Match->Extended ideas..) 2013-11-26 16:32:46 +01:00
Leo
07c9a7a4d6 removed some fileRepos 2013-11-26 16:27:55 +01:00
Leo
22310499d3 Merge remote-tracking branch 'origin/develop' into develop 2013-11-26 16:02:31 +01:00
Leo
2c4bc44c3a removed some fileRepos 2013-11-26 16:01:50 +01:00
d4ab64cb3d Merge remote-tracking branch 'origin/develop' into develop 2013-11-26 15:44:38 +01:00
7394af8048 Shows more feedback when the meeting was scheduled and that the authors have been notified. 2013-11-26 15:44:34 +01:00
Leo
649f2e3fb5 removed some fileRepos 2013-11-26 15:42:36 +01:00
Emil Siverhall
5685dc2b56 Merge remote-tracking branch 'origin/develop' into develop 2013-11-26 15:27:08 +01:00
69dd5a3776 Clean up SubmitFirstMeetingPanel. 2013-11-26 15:25:39 +01:00
Emil Siverhall
518a3222ab Projects tab added 2013-11-26 15:23:36 +01:00
Leo
68be6e8c6e removed fileRepo from ChecklistQuestionPanel 2013-11-26 15:21:36 +01:00
Emil Siverhall
60ade430d6 Added Users tab to Admin view 2013-11-26 15:01:34 +01:00
3c0c5d740d Refactored import worker to try each project/supervisor in isolation so that a failure does not prevent the rest of the worker to run. 2013-11-26 14:58:55 +01:00
Emil Siverhall
982c605735 Maintenance under System tab together with all settings 2013-11-26 14:28:10 +01:00
Leo
a9767904ac Merge remote-tracking branch 'origin/develop' into develop 2013-11-26 13:49:50 +01:00
Leo
f9d7cf740d refactored getAbsolutePath and renamed misspelled method 2013-11-26 11:26:41 +01:00
f85475fb91 Removed inactive idea status.
Fixed filtering when no status is selected.
2013-11-26 11:25:12 +01:00
304eea175f Moved status from Match to Idea. 2013-11-26 11:25:12 +01:00
0bff283e24 Idea service can now filter/count correctly based on the calculated status. 2013-11-26 11:25:12 +01:00
eb6cddf5b4 Idea status is now calculated based on properties of the idea. 2013-11-26 11:25:12 +01:00
Richard
f34d05892f Merge remote-tracking branch 'origin/develop' into develop 2013-11-26 11:08:34 +01:00
Richard
6ccb94af20 Fixed issue with information about cancelled seminars not displaying correctly. 2013-11-26 11:08:25 +01:00
Leo
1c8da0e0fb renamed misspelled method 2013-11-26 10:56:07 +01:00
fred-fri
167c7ed8a8 removing replytoaddresses altogether as theyre never used 2013-11-26 13:48:46 +09:00
fred-fri
e95c22a42e making sure a replytoaddress should always be there 2013-11-26 13:02:18 +09:00
fred-fri
b401232d65 added some strings and message empty check 2013-11-26 12:46:49 +09:00
56d772f032 Fixed synchronization issues. 2013-11-25 14:37:54 +01:00
dcf0f6df16 Removed SUGGESTED status from idea matching. 2013-11-25 14:37:54 +01:00
3126ea41a1 Removed unused private field. 2013-11-25 14:37:54 +01:00
Richard
e25f5f8271 Styling of switch user page. 2013-11-25 13:36:29 +01:00
Richard
e0dd451cbb Merge remote-tracking branch 'origin/develop' into develop 2013-11-25 13:19:48 +01:00
Richard
12e68ecc34 Improved styling of final seminar page. 2013-11-25 13:19:40 +01:00
4157608f11 Turned off debug from the login modules. 2013-11-25 11:09:14 +01:00
fred-fri
c2675420b9 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-11-25 18:31:19 +09:00
fred-fri
b228a03232 added logging 2013-11-25 17:53:23 +09:00