Fredrik Norberg
b83660b951
Merging release branch into master
2011-10-25 16:25:38 +02:00
Fredrik Norberg
881accec53
Release branch modifications
2011-10-25 16:22:13 +02:00
Fredrik Norberg
ddfb2d7b8a
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (119 commits)
fixed a peer bug
design changes in conference panel
design changes in conference panel
design changes in conference panel
design changes in conference panel
design changes in conference panel
changes in peer design
ändringar i conference samt en bugggfix för fileviewpanel
fixed bug with fixed link that sent supervisors to student page they cant reach
added a infobox about peer reviewing
removed unused labels to prevent test failures
small design changes to peer request submission page
ändringar i peer design
ändrade peer design
ändrade peer design
ändrat i peer-design
some minor css style changes that got lost during merge conflict
reverted some changes from last commit
peer ändringar
peer ändringar
...
2011-10-25 13:43:09 +02:00
fred
a1d09fae2a
fixed a peer bug
2011-10-25 14:05:23 +09:00
fred
5073f443e1
design changes in conference panel
2011-10-25 13:18:20 +09:00
fred
bfc6821c20
design changes in conference panel
2011-10-25 13:15:30 +09:00
fred
360119685c
design changes in conference panel
2011-10-25 12:49:22 +09:00
fred
09aa7290f9
design changes in conference panel
2011-10-25 12:32:53 +09:00
fred
69f6d8d3c0
design changes in conference panel
2011-10-25 11:31:24 +09:00
fred
33978becd5
changes in peer design
2011-10-25 09:56:54 +09:00
fred
a043e1808d
ändringar i conference samt en bugggfix för fileviewpanel
2011-10-24 19:35:56 +09:00
fred
3a495578e1
fixed bug with fixed link that sent supervisors to student page they cant reach
2011-10-24 18:11:52 +09:00
fred
a124702fe1
added a infobox about peer reviewing
2011-10-24 17:48:59 +09:00
Emil Siverhall
743f9d8d90
removed unused labels to prevent test failures
2011-10-24 10:09:19 +02:00
Emil Siverhall
396339980d
Merge branch 'submissionPageFix' into develop
...
* submissionPageFix:
small design changes to peer request submission page
2011-10-24 09:46:01 +02:00
Emil Siverhall
141af5637e
small design changes to peer request submission page
2011-10-24 09:45:42 +02:00
fred
35561f4176
Merge branch 'peerredux' into develop
2011-10-24 13:43:01 +09:00
fred
3df76da0ea
ändringar i peer design
2011-10-24 13:42:45 +09:00
fred
6a7cc75034
Merge branch 'peerredux' into develop
2011-10-24 12:55:44 +09:00
fred
0bf8d7c7f6
ändrade peer design
2011-10-24 12:52:00 +09:00
fred
ac44e0b8ba
ändrade peer design
2011-10-24 12:29:14 +09:00
fred
2c361b98c7
ändrat i peer-design
2011-10-24 12:02:34 +09:00
Emil Siverhall
1181f32a91
Merge branch 'peerDesignFix' into develop
...
* peerDesignFix:
some minor css style changes that got lost during merge conflict
2011-10-23 16:46:49 +02:00
Emil Siverhall
446578ef11
some minor css style changes that got lost during merge conflict
2011-10-23 16:46:32 +02:00
Emil Siverhall
4aba9f01a9
fixed merging conflicts
2011-10-23 16:31:06 +02:00
Emil Siverhall
4b00315557
reverted some changes from last commit
2011-10-23 16:00:55 +02:00
fred
993e5c332d
peer ändringar
2011-10-21 21:47:10 +09:00
fred
51f54239f1
peer ändringar
2011-10-21 21:21:03 +09:00
fred
000e446bd1
peer ändringar
2011-10-21 21:19:10 +09:00
fred
80105a9184
peer ändringar
2011-10-21 20:58:02 +09:00
fred
5670b1b964
bytt ut komponenter på peer review
2011-10-21 20:31:31 +09:00
fred
6ec6f28987
lade in snyggare address till supervisor>log
2011-10-21 19:39:28 +09:00
fred
e8717ed7f9
removed some more old images
2011-10-21 16:05:49 +09:00
fred
08046695c0
removed a wicket bug that caused css bug
2011-10-21 15:51:56 +09:00
fred
1680be8ce0
tog bort en bugg
2011-10-21 13:51:43 +09:00
fred
df1c9d7899
tog bort massa kommentarer
2011-10-21 12:07:31 +09:00
fred
64d2580422
lade in factorymetod, kommenterade bildklassen
2011-10-21 11:29:56 +09:00
fred
068b2298e3
korrigerade två buggar med ikoner
2011-10-20 15:41:09 +09:00
fred
19ddd0e090
using theirs
2011-10-20 15:37:39 +09:00
fred
5d0c974569
bytte ut gamla ikoner
2011-10-20 15:07:32 +09:00
fred
54c558749c
bytte ut gamla ikoner
2011-10-20 15:00:49 +09:00
fred
44af09e76e
bytte ut gamla ikoner
2011-10-20 13:14:15 +09:00
fred
f93c762293
bytte ut gamla ikoner
2011-10-20 13:00:08 +09:00
fred
75c683c3a8
bytte ut gamla ikoner
2011-10-20 12:45:27 +09:00
fred
8bee56c296
bytte ut gamla ikoner
2011-10-20 11:56:45 +09:00
fred
118af3edba
bytte ut gamla ikoner
2011-10-20 11:43:30 +09:00
fred
99c9f69e25
bytte ut gamla ikoner
2011-10-20 11:41:22 +09:00
fred
5cc582ad8d
bytte ut gamla ikoner
2011-10-20 11:13:30 +09:00
fred
0e1f9c1669
bytte ut gamla ikoner
2011-10-20 11:01:04 +09:00
fred
2922e78c20
bytte ut gamla ikoner
2011-10-20 10:50:30 +09:00
