Fredrik Friis
3be1548ddc
fixed stale hibernate exception by reloading the page on submit
2012-01-03 09:19:12 +09:00
Tom Vahlman
467b00fcc1
Added a check that the parameter was an instance of Employee in order to avoid an NPE.
2012-01-02 16:14:18 +01:00
Tom Vahlman
74dcc19122
Added the Panel to an AjaxRequestTarget.
2012-01-02 15:32:36 +01:00
Fredrik Friis
862ef85191
resolved merge conflict
2012-01-02 13:46:19 +09:00
Tom Vahlman
7509a690e8
Added a null-check on supervisor + editing some code (regarding spaces).
2011-12-30 15:30:13 +01:00
Fredrik Friis
1bfd784b4c
fixed supervisor profile name switch markup bug
2011-12-30 13:43:17 +09:00
Tom Vahlman
8c768336e2
Project status missing in the list view rendering project ideas in "Admin => Match".
2011-12-29 15:04:10 +01:00
Fredrik Friis
339ea7f90b
profile page hidden for non sysadmins
2011-12-29 13:21:55 +09:00
Fredrik Friis
a21b57d5bd
Merge branch 'editproject' into develop
2011-12-29 12:53:44 +09:00
Fredrik Friis
585d0db67c
adding and removing multiple followers now works
2011-12-28 17:54:46 +09:00
Fredrik Friis
c1a79bd7ef
added eager loading to make editprojectpanel work
2011-12-28 15:01:08 +09:00
Fredrik Friis
76e614c72e
link to cms added, logo now goes home as before
2011-12-28 13:21:43 +09:00
Fredrik Friis
64b5fef21f
smartlinklabel in checklists
2011-12-28 12:54:54 +09:00
Fredrik Friis
58577f04f1
added zipping instructions
2011-12-28 12:35:26 +09:00
Fredrik Friis
107db03981
ordered checklists in admin and elsewhere
2011-12-27 15:43:49 +09:00
Fredrik Friis
c1145ac636
extended functionality
2011-12-27 15:22:52 +09:00
Fredrik Friis
c685a1588f
and now has level selector. reusable class
2011-12-27 15:10:02 +09:00
Fredrik Friis
d288c5636d
new project panel, title shown
2011-12-27 12:57:39 +09:00
Fredrik Friis
1eeb83dc66
test of markup commented out. comment in later when issues have been resolved.
2011-12-23 14:01:11 +09:00
Fredrik Friis
54b0616185
Merge branch 'oldanswer' into develop
2011-12-23 13:48:46 +09:00
Fredrik Friis
0fdac79535
finished
2011-12-23 13:48:12 +09:00
Tom Vahlman
936d700087
NPE when accessing status.
2011-12-22 13:33:49 +01:00
Tom Vahlman
b042cb64ff
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-12-22 12:25:50 +01:00
Fredrik Friis
12c01bd176
trying to implement old answer signal
2011-12-22 13:54:23 +09:00
Fredrik Friis
9619daef18
checklists are no longer added to new projects, leaving opportunity to supervisors to add them themselves as they wish
2011-12-22 12:07:44 +09:00
Fredrik Friis
b76ef557de
request
2011-12-22 11:47:45 +09:00
Fredrik Friis
452e969b90
supervisor checklists are now hidden from students in activity plan
2011-12-22 11:41:29 +09:00
Fredrik Friis
be70256285
fixed test issue
2011-12-21 22:41:59 +09:00
Fredrik Friis
a4bcab5e5d
fixed test issue
2011-12-21 22:36:57 +09:00
Tom Vahlman
ff6ee3ce74
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-12-21 14:13:12 +01:00
Fredrik Friis
d397f99b6f
Merge branch 'release-2011-12-21'
2011-12-21 20:28:25 +09:00
Fredrik Friis
bf490bfbf5
release prep, emptying of current.sql and creation of new update_db file
2011-12-21 20:09:31 +09:00
Robin Eklund
0d0e3a0662
More minor SQL changes
2011-12-21 11:11:19 +01:00
Tom Vahlman
5fa7546549
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-12-21 11:05:37 +01:00
Robin Eklund
0051f4eedb
Removed obvious fails
2011-12-21 11:04:15 +01:00
Robin Eklund
963760dae9
More changes to alter-table statements
2011-12-21 10:56:24 +01:00
Robin Eklund
845d4999b6
Merge branch 'develop' into release-2011-12-21
2011-12-21 10:39:38 +01:00
Robin Eklund
84bcacebe0
Attempting altering of backend storage via alternative methods
2011-12-21 10:35:24 +01:00
Marcus Höjvall
49156fc841
Merge branch 'match_entity_fix' into develop
...
Match still needs to be fixed. It is not in a working condition.
* match_entity_fix:
Moved dialog to the parent panel AdminManageProjectIdeaPanel. The dialog content is still not working
Edited match entity to allow supervisor to be null. When a projectidea is created the default match object is Unmatched with null supervisor
2011-12-21 10:18:20 +01:00
Marcus Höjvall
fce93fcb3f
Moved dialog to the parent panel AdminManageProjectIdeaPanel. The dialog content is still not working
2011-12-21 10:17:38 +01:00
Marcus Höjvall
6cec0e6372
Edited match entity to allow supervisor to be null. When a projectidea is created the default match object is Unmatched with null supervisor
2011-12-21 09:58:19 +01:00
Fredrik Friis
db8f1d1c68
request
2011-12-21 11:55:51 +09:00
Fredrik Friis
9dc6f352ee
added project details panel to author project details page
2011-12-21 11:52:56 +09:00
Tom Vahlman
4ceb9f7426
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-12-20 12:38:49 +01:00
Fredrik Norberg
f49f78e57d
Merge branch 'matchSupervisor' into develop
...
* matchSupervisor:
Fixed some bugs in match, temp fixes to avoid nullpointers, supervisors can now see their published ideas and some gui improvements
matchings now gets published to supervisors
2011-12-20 12:24:00 +01:00
Fredrik Norberg
851fe0ec9d
Fixed some bugs in match, temp fixes to avoid nullpointers, supervisors can now see their published ideas and some gui improvements
2011-12-20 12:23:31 +01:00
Tom Vahlman
341896dc84
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-12-20 10:57:03 +01:00
Fredrik Norberg
e94b21d6ff
matchings now gets published to supervisors
2011-12-20 09:52:30 +01:00
Fredrik Norberg
19a57bc47a
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
popup for deleting conference messages fixed
default sort is now on activity dates
comments are now hidden from peer reviews unless the review is finished as not to confuse the users with two submit buttons
we dont want to show match stuff to ordinary users yet
bugfix
some cleanup
added edit panel
added edit panel
filtering functionality implemented
blabla
simple dataview and underlying layers implemented. no params yet
changed some links according to request
implementing...
added params class to projectDao
beginning implementation
beginning implementation
moved panel file
2011-12-20 09:51:48 +01:00
Fredrik Friis
aeab58fb39
popup for deleting conference messages fixed
2011-12-20 14:33:35 +09:00
