Fredrik Friis
3898a5a8e5
added some info to notes
2011-11-03 15:36:42 +09:00
Fredrik Friis
9acc7bb9d5
corrected css and some markup bugs
2011-11-03 14:30:16 +09:00
Fredrik Friis
12d241efc4
renamed author state in supervisor my projects table
2011-11-03 14:17:47 +09:00
Fredrik Friis
22c576aae9
renamed author state to project state and removed old panels
2011-11-03 14:09:05 +09:00
Fredrik Friis
11cc58ae71
fixed another css bug
2011-11-03 13:41:15 +09:00
Fredrik Friis
6141f47fa7
removed css bug
2011-11-03 13:36:48 +09:00
fred
f41ee62933
changed css on activity plan table, added ImageObject images to it instead of hardcoded html images
2011-11-03 12:55:26 +09:00
Robin Eklund
f560ee2d4a
Added menu-highlighting to view-checklist page (student and supervisor views)
...
Moved highlighting interfaces into dedicated package
2011-11-02 16:14:36 +01:00
Robin Eklund
d17475ec54
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-11-02 15:43:49 +01:00
Robin Eklund
a554ccd796
Minor fix for rendering, probably needs some more review on these .css classes.
2011-11-02 15:43:36 +01:00
Fredrik Norberg
049ffe3269
Merge branch 'fix_checklists' into develop
...
* fix_checklists:
Added functionality for editing checklist templates and the questions can now be reordered
temp commit
2011-11-02 15:06:36 +01:00
Fredrik Norberg
edc21713ba
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Added "upcoming events" panel, rearranged the project-status pages (both student and supervisor)
Started work on "show upcoming events" panel, looks like crap at the moment.
2011-11-02 15:06:16 +01:00
Fredrik Norberg
e1f86f053c
Added functionality for editing checklist templates and the questions can now be reordered
2011-11-02 15:05:57 +01:00
Robin Eklund
e4e59c1dd7
Merge branch 'upcomingScheduleEvents' into develop
2011-11-02 13:41:35 +01:00
Robin Eklund
5223a1f370
Added "upcoming events" panel, rearranged the project-status pages (both student and supervisor)
2011-11-02 13:41:09 +01:00
Fredrik Norberg
a88bbb0fc2
temp commit
2011-11-02 10:59:25 +01:00
Fredrik Norberg
24adbc4541
Merge branch 'fix_checklists' into develop
...
* fix_checklists:
added functionality for editiing questions and title for checklistTemplates and auto numbers for the questions
2011-10-31 17:36:01 +01:00
Fredrik Norberg
10e9246450
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Added unit tests of new pages, I have a feeling we are not doing this type of testing correctly in
Fixed crashing bug when adding events from template on an empty schedule.
Fixed crash bug on empty event title/description
switch authorization role on my requests and reviews-panels
cleaned up markup
cleaned up and put summary inside viewchecklistpanel
added panel to checklistpage
added comments
added traffic lights
added respondents and answers
nicer markup
added questions
first commit for checklistsummary
2011-10-31 17:35:44 +01:00
Fredrik Norberg
0c48810289
added functionality for editiing questions and title for checklistTemplates and auto numbers for the questions
2011-10-31 17:34:49 +01:00
Emil Siverhall
3056421fe7
changes in supervisor - peer - my projects. filtering on project class now works. some query optimizations is still needed.
2011-10-31 16:27:11 +01:00
Robin Eklund
c57f707b69
Started work on "show upcoming events" panel, looks like crap at the moment.
...
Also, changed accessibility of some "project start page" components.
2011-10-31 16:23:57 +01:00
Robin Eklund
440cbb7c2e
Added unit tests of new pages, I have a feeling we are not doing this type of testing correctly in
...
regards to security and rendered output.
2011-10-31 14:02:08 +01:00
Robin Eklund
8b14c8eb74
Fixed crashing bug when adding events from template on an empty schedule.
2011-10-31 10:21:20 +01:00
Robin Eklund
0391f2781d
Fixed crash bug on empty event title/description
2011-10-31 10:06:19 +01:00
Emil Siverhall
87e0a1a234
removed icons from supervisor peer menu
2011-10-31 08:42:57 +01:00
Emil Siverhall
fe47a1bd2f
Merge branch 'peerFix' into develop
...
* peerFix:
switch authorization role on my requests and reviews-panels
2011-10-28 06:24:51 +02:00
Emil Siverhall
6aea43da05
switch authorization role on my requests and reviews-panels
2011-10-28 06:24:09 +02:00
fred
b34effffbd
fixed merge conflict
2011-10-28 10:45:32 +09:00
fred
7ca2a593d9
cleaned up markup
2011-10-28 10:36:30 +09:00
fred
9826ee72b0
cleaned up and put summary inside viewchecklistpanel
2011-10-28 10:24:57 +09:00
Fredrik Norberg
d842cce39d
changed the db script the lazy way since its late
2011-10-27 18:59:53 +02:00
Fredrik Norberg
c58ee08b6f
Merge branch 'release-2011-10-27'
...
* release-2011-10-27:
fixed persistence xml
2011-10-27 18:53:14 +02:00
Fredrik Norberg
bd8055c2f3
fixed persistence xml
2011-10-27 18:50:44 +02:00
Fredrik Norberg
c9bc5d31d8
Merge branch 'scheduleEvents' into develop
...
* scheduleEvents: (57 commits)
changed addChecklistToProject from a page to a panel
Added modified update script, needs testing on one more platform.
Modified some unit tests
More menu highlighting issues
Added correct menu highlighting
Mindre ändringar i authorization
Bugfix for stale hibernate session when switching author-project.
Added access-controls on linking to checklists, not sure if we should have this tbh.
Added access-controls on addFromTemplate and saveAsTemplate via override-mechanics.
Added supervisor view of project-files, and reordered some menu items
Added "save as template" dialog, and some bugfixes.
More bugfixes
Small UI-fixes
Minor bugfixes for crashes and compile time errors.
added small fixes in preparations for production deploy
Added correct retrieval of project schedule
checklists are now added at the edit dialog
Fixed tests failing
Schedule generation/saving now mostly works as intended
Bugfixes, "active"-property of schedule templates has been removed.
...
2011-10-27 18:19:49 +02:00
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
