Fredrik Norberg
8fd43d6212
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
tog bort conferences länk från subervisortabbarna
2011-10-27 18:18:55 +02:00
Fredrik Norberg
f3e923e749
Merge branch 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re into scheduleEvents
...
* 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re:
Added modified update script, needs testing on one more platform.
Modified some unit tests
2011-10-27 18:03:39 +02:00
Fredrik Norberg
478295ec29
changed addChecklistToProject from a page to a panel
2011-10-27 18:03:15 +02:00
Robin Eklund
a235d123e7
Added modified update script, needs testing on one more platform.
2011-10-27 16:45:25 +02:00
Robin Eklund
8c3a41ff5c
Modified some unit tests
2011-10-27 16:25:02 +02:00
Robin Eklund
731aa1ccd7
More menu highlighting issues
2011-10-27 16:04:29 +02:00
Robin Eklund
cfd70794df
Added correct menu highlighting
2011-10-27 16:02:21 +02:00
Robin Eklund
2662cdfb84
Mindre ändringar i authorization
2011-10-27 15:53:50 +02:00
Robin Eklund
c737b94a21
Bugfix for stale hibernate session when switching author-project.
2011-10-27 15:38:38 +02:00
Robin Eklund
6fb8863fee
Added access-controls on linking to checklists, not sure if we should have this tbh.
2011-10-27 15:36:25 +02:00
fred
cd7bf5c02a
added panel to checklistpage
2011-10-27 22:34:39 +09:00
Robin Eklund
6dc9ad4089
Added access-controls on addFromTemplate and saveAsTemplate via override-mechanics.
2011-10-27 15:27:01 +02:00
Robin Eklund
d95ee1c928
Added supervisor view of project-files, and reordered some menu items
2011-10-27 15:17:06 +02:00
Robin Eklund
559d4694c4
Added "save as template" dialog, and some bugfixes.
2011-10-27 15:03:09 +02:00
fred
269055b0f4
added comments
2011-10-27 21:42:04 +09:00
fred
4fa1d5edab
added traffic lights
2011-10-27 21:35:27 +09:00
Robin Eklund
4566658e82
More bugfixes
2011-10-27 14:32:47 +02:00
Robin Eklund
eb621182d8
Small UI-fixes
2011-10-27 14:07:03 +02:00
Robin Eklund
884f9c5b7c
Minor bugfixes for crashes and compile time errors.
2011-10-27 13:59:20 +02:00
fred
c9f6df924e
added respondents and answers
2011-10-27 20:52:51 +09:00
Fredrik Norberg
246488bfe9
Merge branch 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re into scheduleEvents
...
* 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re:
Added correct retrieval of project schedule
2011-10-27 13:45:16 +02:00
Fredrik Norberg
94364309e9
added small fixes in preparations for production deploy
2011-10-27 13:44:44 +02:00
Robin Eklund
5a1e171a3a
Added correct retrieval of project schedule
2011-10-27 13:37:56 +02:00
fred
5072f7a1d9
nicer markup
2011-10-27 20:12:17 +09:00
fred
acfb41b77d
added questions
2011-10-27 20:08:48 +09:00
fred
4e4039b521
first commit for checklistsummary
2011-10-27 19:47:31 +09:00
Fredrik Norberg
10866e2bca
Merge branch 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re into scheduleEvents
...
* 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re: (128 commits)
Fixed tests failing
tog bort adminbehörighet från conference
lade in paginering på conference
lade in conference i supervisor project
lade in conference i supervisor proejcts
lade in konferensen i supervisor project
lade till varningstext om rumsnummer inför seminarier
lade till varningstext om rumsnummer inför seminarier
added delete icon to conference messages
added delete icon to conference comments
tog bort keywords
Release branch modifications
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
...
2011-10-27 10:59:01 +02:00
Fredrik Norberg
51fdd56666
checklists are now added at the edit dialog
2011-10-27 10:57:55 +02:00
Robin Eklund
db8dc56522
Merge branch 'experimental' into scheduleEvents
2011-10-27 10:30:54 +02:00
Robin Eklund
e2277d005b
Major merge, hopefully stuff still works...
2011-10-27 10:30:35 +02:00
Robin Eklund
c4d9f34640
Fixed tests failing
2011-10-27 10:04:12 +02:00
fred
b267e19001
tog bort conferences länk från subervisortabbarna
2011-10-27 16:31:54 +09:00
Fredrik Norberg
b3e2f045bb
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
tog bort adminbehörighet från conference
lade in paginering på conference
lade in conference i supervisor project
lade in conference i supervisor proejcts
lade in konferensen i supervisor project
lade till varningstext om rumsnummer inför seminarier
lade till varningstext om rumsnummer inför seminarier
added delete icon to conference messages
added delete icon to conference comments
tog bort keywords
2011-10-27 09:20:56 +02:00
fred
a4cabc0775
tog bort adminbehörighet från conference
2011-10-27 15:29:14 +09:00
fred
b685148021
lade in paginering på conference
2011-10-27 15:26:51 +09:00
fred
0c80a2a48b
lade in conference i supervisor project
2011-10-27 15:04:46 +09:00
fred
72baa00800
lade in conference i supervisor proejcts
2011-10-27 15:01:08 +09:00
fred
e81ae83183
lade in konferensen i supervisor project
2011-10-27 14:59:53 +09:00
fred
d40204edd5
lade till varningstext om rumsnummer inför seminarier
2011-10-27 13:59:25 +09:00
fred
20c6a7ddd2
lade till varningstext om rumsnummer inför seminarier
2011-10-27 13:54:02 +09:00
Robin Eklund
4346dec27c
Schedule generation/saving now mostly works as intended
2011-10-26 18:22:13 +02:00
Robin Eklund
c8d4b14f3c
Bugfixes, "active"-property of schedule templates has been removed.
2011-10-26 17:18:01 +02:00
Robin Eklund
6a17ef8326
Merge branch 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re into scheduleEvents
2011-10-26 17:02:55 +02:00
Robin Eklund
52f9f8df55
Lots of refactoring code, also: templates can be generated from schedules and vice versa.
2011-10-26 17:02:21 +02:00
Fredrik Norberg
b758d78f22
fixed merge conflicts and the dataview now updates after a checklist is added
2011-10-26 14:16:40 +02:00
Fredrik Norberg
95603c55b7
supervisoractivityplanpanel is now working correctly
2011-10-26 13:54:54 +02:00
Robin Eklund
1ffc94ba62
Started work on creation of events from schedule templates.
2011-10-26 13:16:22 +02:00
fred
ca702034ba
added delete icon to conference messages
2011-10-26 18:57:57 +09:00
fred
ae8e1bc4dc
added delete icon to conference comments
2011-10-26 18:53:15 +09:00
Fredrik Norberg
1113593161
added supervisorActivityplanpanel and restored functionality to add checklists
2011-10-26 11:32:15 +02:00
