Fredrik Friis
|
25bff96bd7
|
added new db update file
20120320
|
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 |
|
Fredrik Friis
|
8e876b86c5
|
made delete student and follower icons visible only to sysadmins
|
2012-03-20 13:57:09 +09:00 |
|
Fredrik Friis
|
5d23572f87
|
added delete icons
|
2012-03-20 13:53:37 +09:00 |
|
Fredrik Friis
|
6638ee86c6
|
cleaned up ac components
|
2012-03-20 13:42:04 +09:00 |
|
Fredrik Friis
|
bef1b5ee29
|
save button refreshes the page
|
2012-03-20 13:27:44 +09:00 |
|
Fredrik Friis
|
546d5fcc79
|
saving works, even for new projects
|
2012-03-20 12:42:51 +09:00 |
|
Fredrik Friis
|
1ee43eab73
|
added emptylabel to markup
|
2012-03-20 12:20:17 +09:00 |
|
Fredrik Friis
|
bf77d8eff3
|
Merge branch 'develop' into project
|
2012-03-20 11:59:49 +09:00 |
|
Fredrik Friis
|
878c8eafaf
|
fixed add bug
|
2012-03-20 11:59:09 +09:00 |
|
Fredrik Friis
|
95cd0ca189
|
Merge branch 'develop' into project
|
2012-03-20 11:06:51 +09:00 |
|
Tom Vahlman
|
23240210c1
|
Added list view for rendering the selecte key words + added a clear button.
|
2012-03-19 21:50:17 +01:00 |
|
Tom Vahlman
|
05dbe02006
|
Added list view for rendering the selecte key words + added a clear button.
|
2012-03-19 21:48:56 +01:00 |
|
FredrikNorberg
|
9e8c4fb29a
|
Merge branch 'matchAdminMenu' into develop
|
2012-03-19 16:50:42 +01:00 |
|
FredrikNorberg
|
c942f966c1
|
Changed the match admin menu from vertical to horizontal
|
2012-03-19 16:50:00 +01:00 |
|
Emil Siverhall
|
a1d9292994
|
added new tab for match history for each project idea
|
2012-03-19 16:13:49 +01:00 |
|
FredrikNorberg
|
e5c2805125
|
Merge branch 'matchStatus' into develop
|
2012-03-19 16:08:49 +01:00 |
|
FredrikNorberg
|
af56e86c5b
|
changed the printed text of Match.Status enums
|
2012-03-19 16:08:10 +01:00 |
|
Tom Vahlman
|
08e9923071
|
Added "flow" to place out components in the new interface.
|
2012-03-19 15:48:50 +01:00 |
|
Tom Vahlman
|
68942c6af5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2012-03-19 15:45:07 +01:00 |
|
Tom Vahlman
|
98b6b0eae2
|
Added "flow" to place out components in the new interface.
|
2012-03-19 15:44:50 +01:00 |
|