Fredrik Friis
|
1007a53c54
|
Merge branch 'release20120109'
20120109
|
2012-01-09 10:35:13 +09:00 |
|
Fredrik Friis
|
2b77fc19cc
|
fixed checklist files bug for supervisor
|
2012-01-09 10:18:20 +09:00 |
|
Fredrik Friis
|
8df8876a57
|
fixed max width for file select tag
|
2012-01-09 09:43:59 +09:00 |
|
Fredrik Friis
|
259f6b9221
|
Merge branch 'openprojectideafix' into develop
|
2012-01-05 16:13:48 +09:00 |
|
Fredrik Friis
|
8b3f49fc74
|
added some urls
|
2012-01-05 15:38:14 +09:00 |
|
Fredrik Friis
|
9d22ee9892
|
tests wont work with springbean so i removed it and instantiate the factory as usual instead
|
2012-01-05 12:55:08 +09:00 |
|
Fredrik Friis
|
6cde517033
|
fixed a truncated label component and added it to files panel
|
2012-01-05 12:11:46 +09:00 |
|
Tom Vahlman
|
9c4a16ab74
|
Add a status to the model (and not as a method parameter) when saving/changing a Match .
|
2012-01-04 18:02:42 +01:00 |
|
Tom Vahlman
|
f219e573a1
|
The GUI-text is rendered twice in the dialog "Edit project idea".
|
2012-01-04 14:46:33 +01:00 |
|
Tom Vahlman
|
e25ab39204
|
The model for the autocomplete component must be set to NULL between searches.
|
2012-01-04 14:02:44 +01:00 |
|
Fredrik Friis
|
25251c8a60
|
added try catch for a block of code that generated npes
|
2012-01-04 17:09:58 +09:00 |
|
Fredrik Friis
|
7b6e69d8ce
|
removed stuff that doesnt work
|
2012-01-04 16:14:15 +09:00 |
|
Fredrik Friis
|
b1eddb638b
|
added bold text to info and added target_blank to smartlinklabel, which didnt make any difference
|
2012-01-04 15:41:52 +09:00 |
|
Fredrik Friis
|
6ddb234d04
|
added category explanation
|
2012-01-04 14:38:03 +09:00 |
|
Fredrik Friis
|
ebeda1cfcc
|
already added checklists are no longer shown in the list of available checklists to add to project
|
2012-01-04 13:49:53 +09:00 |
|
Fredrik Friis
|
13edda4b4c
|
cant add duplicate checklists anymore
|
2012-01-04 13:41:49 +09:00 |
|
Fredrik Friis
|
9d1558f052
|
removed owner from table in project checklist page
|
2012-01-04 13:20:07 +09:00 |
|
Fredrik Friis
|
2faf9e2fc2
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-01-04 13:05:18 +09:00 |
|
Fredrik Friis
|
b1d9f366b1
|
same for students
|
2012-01-04 13:04:59 +09:00 |
|
Fredrik Friis
|
1a8e4a3e92
|
added repeaters and mail addresses to projectdetailspanel
|
2012-01-04 12:33:04 +09:00 |
|
Tom Vahlman
|
52da549d6a
|
The ManuaMatchPanel must save the value from the autocomplete component by itself.
|
2012-01-03 16:50:18 +01:00 |
|
Tom Vahlman
|
89213ff55c
|
Removed faulty markup.
|
2012-01-03 13:21:33 +01:00 |
|
Tom Vahlman
|
dc0f4347fc
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
Conflicts:
src/main/java/se/su/dsv/scipro/admin/panels/match/AdminEditProjectIdeaPanel.html
|
2012-01-03 13:19:33 +01:00 |
|
Tom Vahlman
|
0e1b0e707d
|
Removed faulty markup.
|
2012-01-03 12:21:42 +01:00 |
|
Fredrik Friis
|
49bf11e817
|
removed some stuff i commited by accident
|
2012-01-03 18:33:13 +09:00 |
|
Fredrik Friis
|
965230fe38
|
removed unused markup tags
|
2012-01-03 18:24:33 +09:00 |
|
Fredrik Friis
|
70607f947c
|
added mail to projectdetailspanel
|
2012-01-03 17:39:52 +09:00 |
|
Fredrik Friis
|
9892e4e211
|
made aggregate show only if a respondee has responded to all questions
|
2012-01-03 10:26:35 +09:00 |
|
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
20120102
|
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 |
|