Fredrik Friis
|
c1c128e544
|
added daisy start date to project details panel
|
2012-03-22 12:45:41 +09:00 |
|
Fredrik Friis
|
815aa5230f
|
moved force accept button more to the right
|
2012-03-22 12:05:55 +09:00 |
|
Fredrik Friis
|
3fe10ef6c0
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-03-22 11:36:48 +09:00 |
|
Fredrik Friis
|
84faa5c8c6
|
minor refactoring of project management, ajax now works better
|
2012-03-22 11:34:42 +09:00 |
|
Fredrik Friis
|
622d4f7a21
|
vet inte vad som ändrats nu heller
|
2012-03-22 09:50:22 +09:00 |
|
Tom Vahlman
|
c9442b98c0
|
It should be possible to specify if you want deleted keywords or not in the panel showing unmatched project ideas..
|
2012-03-21 21:44:53 +01:00 |
|
Tom Vahlman
|
837c64ffba
|
It should be possible to specify if you want deleted keywords or not in the panel showing unmatched project ideas..
|
2012-03-21 19:45:44 +01:00 |
|
Tom Vahlman
|
86acd6d422
|
It should be possible to specify if you want deleted keywords or not in the panel showing unmatched project ideas..
|
2012-03-21 19:39:07 +01:00 |
|
Tom Vahlman
|
eab085f589
|
Objects/employees returned from the AC-comp is not erased when a user cancels the dialog.
|
2012-03-21 18:44:47 +01:00 |
|
Tom Vahlman
|
aa22f41c41
|
Removed code that was commented out.
|
2012-03-21 18:43:17 +01:00 |
|
Tom Vahlman
|
6c8c637dd6
|
The page for searching among unmatched project ideas should only be accessible by supervisors with sysadmin authority.
|
2012-03-21 11:40:55 +01:00 |
|
Fredrik Friis
|
0915b81821
|
vet inte vad som ändrats
|
2012-03-21 17:15:13 +09:00 |
|
Fredrik Friis
|
3d67fc24ea
|
counter for projects added
|
2012-03-21 15:15:04 +09:00 |
|
Fredrik Friis
|
fc627b94f6
|
renamed force accept button
|
2012-03-21 14:13:23 +09:00 |
|
Fredrik Friis
|
31982bc687
|
some tab name changes in supervisor tab menupanel
|
2012-03-21 14:12:25 +09:00 |
|
Tom Vahlman
|
583b0e6b7b
|
Default project classes must be added when we use the clear button to reset the previous search terms.
|
2012-03-20 18:19:49 +01:00 |
|
Tom Vahlman
|
ac51cb76e8
|
Default project classes must be added when we use the clear button to reset the previous search terms.
|
2012-03-20 17:54:25 +01:00 |
|
Tom Vahlman
|
b02e7363ae
|
Added clear button in the search GUI for unmatched p-ideas.
|
2012-03-20 16:43:58 +01:00 |
|
Alexander Kozynchenko
|
aa46f998b2
|
Maintaining a consistent layout using a single page: swapping tables with different content using panels.
|
2012-03-20 15:06:14 +01:00 |
|
Fredrik Friis
|
25bff96bd7
|
added new db update file
|
2012-03-20 20:43:52 +09:00 |
|
Niklas Herder
|
b9a27457b2
|
Merge branch 'develop' of git:/git/scipro/scipro into develop
|
2012-03-20 12:33:01 +01:00 |
|
Niklas Herder
|
f8e5da620d
|
Removed unnecessary file.
|
2012-03-20 12:32:47 +01:00 |
|
Tom Vahlman
|
8b5fd352e3
|
It should be possible to search for keywords even if the keyword does not start with the specific search term.
|
2012-03-20 12:31:30 +01:00 |
|
Niklas Herder
|
c49ff3141a
|
Adding datasource to web.xml
|
2012-03-20 12:09:45 +01:00 |
|
Niklas Herder
|
1187cdcdf9
|
Merge branch 'develop' of git:/git/scipro/scipro into develop
|
2012-03-20 11:58:23 +01:00 |
|
Niklas Herder
|
71aac7ef04
|
Adding datasource to web.xml
|
2012-03-20 11:58:00 +01:00 |
|
Emil Siverhall
|
413239dfa6
|
Merge branch 'dialogFix' into develop
|
2012-03-20 11:13:55 +01:00 |
|
Emil Siverhall
|
b363f812a7
|
dialog close bug fix
|
2012-03-20 11:13:20 +01:00 |
|
Fredrik Friis
|
3a01503527
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-03-20 18:50:37 +09:00 |
|
Fredrik Friis
|
6c8b64effb
|
added stuff i forgot when refactoring project management gui
|
2012-03-20 18:48:52 +09:00 |
|
anto-gom
|
c21048a34e
|
Merge branch 'cssfix' into develop
|
2012-03-20 10:33:30 +01:00 |
|
anto-gom
|
151f3a6b96
|
Fixed dodgy list style where a half-circle would cover part of the text.
|
2012-03-20 10:23:12 +01:00 |
|
Emil Siverhall
|
71435e5b31
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-03-20 10:19:48 +01:00 |
|
Emil Siverhall
|
6748ce5c75
|
Merge branch 'infoFix' into develop
|
2012-03-20 10:18:36 +01:00 |
|
Emil Siverhall
|
f32dbb827a
|
added another text for authors project idea panels if the idea has been refused and needs to be rewritten.
|
2012-03-20 10:17:59 +01:00 |
|
anto-gom
|
47663cb172
|
Merge remote-tracking branch 'origin/develop' into develop
|
2012-03-20 09:56:30 +01:00 |
|
anto-gom
|
4828cce036
|
Changed testDavidH_Has_Less_Total_Available_Slots into testDavidH_Has_Less_Available_Slots to comply with new rules. Old test does not apply and has therefore been altered.
|
2012-03-20 09:43:21 +01:00 |
|
Emil Siverhall
|
5876c0c1a8
|
Merge branch 'contactInfoFix' into develop
|
2012-03-20 09:36:56 +01:00 |
|
Emil Siverhall
|
5fc001af9c
|
changed from status to supervisor on author project ideas list
|
2012-03-20 09:36:14 +01:00 |
|
anto-gom
|
4537895ce3
|
Fixed the matching availability level to project idea level mismatch issue.
|
2012-03-20 09:28:11 +01:00 |
|
anto-gom
|
c509696290
|
Wrote a test (testAvailabilityLevelMatching).
|
2012-03-20 09:26:22 +01:00 |
|
Emil Siverhall
|
15d0dcaa8d
|
Merge branch 'matchHistory' into develop
|
2012-03-20 09:07:42 +01:00 |
|
Emil Siverhall
|
530e300ebc
|
small text change
|
2012-03-20 09:02:29 +01:00 |
|
Fredrik Friis
|
812329d4e2
|
moved checkbox to the left of text on filterpanels
|
2012-03-20 16:52:53 +09:00 |
|
Fredrik Friis
|
fb0184a85b
|
hid edit icon for non sysadmins
|
2012-03-20 16:49:17 +09:00 |
|
Fredrik Friis
|
68a8076c28
|
added panel titles
|
2012-03-20 16:47:39 +09:00 |
|
Fredrik Friis
|
cb025c54ce
|
some markup improvements
|
2012-03-20 16:43:28 +09:00 |
|
Fredrik Friis
|
2731f0081f
|
some markup cleanup
|
2012-03-20 16:40:43 +09:00 |
|
Fredrik Friis
|
9258514317
|
warning about external systems added
|
2012-03-20 16:36:32 +09:00 |
|
Fredrik Friis
|
5b7521db0b
|
made delete project link visible only to sysadmins, added confirmation popup
|
2012-03-20 15:02:30 +09:00 |
|