DMC/scipro
7
0
Fork 0
Code Issues 20 Pull Requests 8 Actions Projects 1 Wiki Activity
2,327 Commits 11 Branches 410 Tags 74 MiB
2011-12-08
Commit Graph

2327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Eklund
8a96311d44 Merge branch 'develop' into checklistViews 2011-11-07 12:58:56 +01:00
Robin Eklund
bc10ee990f Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-11-07 12:57:44 +01:00
Robin Eklund
08aea72294 Minor cleanup 
Signed-off-by: Robin Eklund <robi-ekl@dsv.su.se>
 2011-11-07 12:57:28 +01:00
Fredrik Friis
18ecddaefb made settingspanel more usable, TODO: fix the mail settings 2011-11-07 20:55:22 +09:00
Fredrik Norberg
8933dd00e3 Merge branch 'fix_for_production' into develop 
* fix_for_production:
  added a feedbackpanel to activityplan
 2011-11-07 12:05:57 +01:00
Fredrik Norberg
957a070841 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  removed old icon
 2011-11-07 12:05:39 +01:00
Fredrik Norberg
d81bfb092a added a feedbackpanel to activityplan 2011-11-07 12:05:23 +01:00
Robin Eklund
fdbd789b60 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-11-07 11:31:04 +01:00
Fredrik Friis
cf824b9aff removed old icon 2011-11-07 19:24:53 +09:00
Fredrik Norberg
493ed86b51 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  code cleanup. removed panels from supervisor start page that shouldn't be there
  notificationssida
 2011-11-07 09:35:11 +01:00
Robin Eklund
0a86cea035 Merge branch 'master' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-11-07 09:09:31 +01:00
Emil Siverhall
9ff412b327 Merge branch 'myProjectsCleanup' into develop 
* myProjectsCleanup:
  code cleanup. removed panels from supervisor start page that shouldn't be there
 2011-11-07 08:57:15 +01:00
Emil Siverhall
3aa9248b82 code cleanup. removed panels from supervisor start page that shouldn't be there 2011-11-07 08:56:10 +01:00
Fredrik Friis
b1c2a498e5 notificationssida 2011-11-06 13:27:38 +09:00
Fredrik Norberg
a9683a0c76 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  fixed bug when table moved out to the right in firefox
  added infobox
  filter function added for supervisor - my projects. it is now possible to view inactive and completed projects as well. paging or sorting is not implemented yet.
 2011-11-04 11:49:20 +01:00
Fredrik Norberg
0447354bdb Merge branch 'fix_checklists' into develop 
* fix_checklists:
  cleaned up the viewchecklist code
  checklistanswers now again save their state
  fixed the add all checklists functionality
 2011-11-04 11:47:40 +01:00
Fredrik Norberg
cc6d02c82e cleaned up the viewchecklist code 2011-11-04 11:45:48 +01:00
Emil Siverhall
f25771e5f8 Merge branch 'supervisorFirefoxFix' into develop 
* supervisorFirefoxFix:
  fixed bug when table moved out to the right in firefox
 2011-11-04 11:45:25 +01:00
Emil Siverhall
c1c8e93b05 fixed bug when table moved out to the right in firefox 2011-11-04 11:44:51 +01:00
Fredrik Friis
1f16976861 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-11-04 19:03:18 +09:00
Fredrik Friis
0137b0d761 added infobox 2011-11-04 19:02:44 +09:00
Fredrik Norberg
635e0913fc checklistanswers now again save their state 2011-11-04 10:52:12 +01:00
Emil Siverhall
e547e0063d Merge branch 'supervisorMyProjects' into develop 
* supervisorMyProjects:
  filter function added for supervisor - my projects. it is now possible to view inactive and completed projects as well. paging or sorting is not implemented yet.
 2011-11-04 10:33:26 +01:00
Emil Siverhall
8290038cc3 filter function added for supervisor - my projects. it is now possible to view inactive and completed projects as well. paging or sorting is not implemented yet. 2011-11-04 10:31:56 +01:00
Fredrik Norberg
73722054a5 fixed the add all checklists functionality 2011-11-04 10:06:04 +01:00
Fredrik Norberg
eb28e2416e Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  new algorithm for displaying checklist summary answers + centered question in summary
  set with all answerees
  moved the content of supervisorPeerStatsPage to a panel instead of being initialized on the page directly
  added some space between components on Supervisor peer portal page
  changes to make all project levels selected by default at supervisor peer stats page. also a label with the project level on each project title in the list.
  added some info to notes
  corrected css and some markup bugs
  renamed author state in supervisor my projects table
  renamed author state to project state and removed old panels
  fixed another css bug
  removed css bug
  changed css on activity plan table, added ImageObject images to it instead of hardcoded html images
  Added menu-highlighting to view-checklist page (student and supervisor views)
  Minor fix for rendering, probably needs some more review on these .css classes.
  changes in supervisor - peer - my projects. filtering on project class now works. some query optimizations is still needed.
  removed icons from supervisor peer menu
 2011-11-04 10:05:37 +01:00
Fredrik Friis
061eb47915 Merge branch 'checklist' into develop 2011-11-04 16:39:22 +09:00
Fredrik Friis
18442cdeb9 new algorithm for displaying checklist summary answers + centered question in summary 2011-11-04 16:36:30 +09:00
Fredrik Friis
c34170578a set with all answerees 2011-11-04 15:49:53 +09:00
Emil Siverhall
b521adfc6b Merge branch 'supervisorPageToPanel' into develop 
* supervisorPageToPanel:
  moved the content of supervisorPeerStatsPage to a panel instead of being initialized on the page directly
 2011-11-03 12:38:06 +01:00
Emil Siverhall
ad665ccf42 moved the content of supervisorPeerStatsPage to a panel instead of being initialized on the page directly 2011-11-03 12:16:59 +01:00
Emil Siverhall
0ddc7c2422 Merge branch 'supervisorMyProjects' into develop 
* supervisorMyProjects:
  added some space between components on Supervisor peer portal page
  changes to make all project levels selected by default at supervisor peer stats page. also a label with the project level on each project title in the list.
  changes in supervisor - peer - my projects. filtering on project class now works. some query optimizations is still needed.
  removed icons from supervisor peer menu
 2011-11-03 08:31:50 +01:00
Emil Siverhall
2eb461ac76 added some space between components on Supervisor peer portal page 2011-11-03 08:26:16 +01:00
Emil Siverhall
e893d8ba38 changes to make all project levels selected by default at supervisor peer stats page. also a label with the project level on each project title in the list. 2011-11-03 08:23:17 +01:00
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