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

1790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fredrik Norberg
1113733fa9 Merge branch 'release-2011-09-08' 
* release-2011-09-08:
  removed unused imports and data
 2011-09-08 19:19:55 +02:00
Fredrik Norberg
5730cde2c0 Merge branch 'develop' 
* develop: (44 commits)
  removed unused imports
  addade peerpanel för supervisor
  tog bort peer review panelen igen
  lade in peer review panel på supervisor project details sidan
  lade in tooltip på trafikljuset på supervisorstateofmindpanel
  snyggade till student author state
  added checklistCategories
  implemented classes for checklistCategories
  fixade till menysystemet mer under supervisor/project details
  updated unit tests for peer listings
  lade till ny design för supervisor>project details
  fixade krash som orsakas av att titta på checklista då inget aktivt projekt är markerat
  commit för push
  rensade bort utkommenterad kod + fixade lite kommentarer
  Bugfixes with the menu-selection
  Refactoring some stuff with the menu panels, removing a certain anti-pattern.
  lade till html ändringar
  bugg
  Fixed rendering bug due to missing css-class usage, also pre-emptive bug fix for user-switching
  Added stars to required fields in peer and changed some display logic regarding comment panel on displayed reviews
  ...
 2011-09-08 19:19:50 +02:00
Fredrik Norberg
d9c9ceb32e removed unused imports and data 2011-09-08 17:12:00 +02:00
Fredrik Norberg
d7f0d6ad90 Merge branch 'develop' 
* develop: (44 commits)
  removed unused imports
  addade peerpanel för supervisor
  tog bort peer review panelen igen
  lade in peer review panel på supervisor project details sidan
  lade in tooltip på trafikljuset på supervisorstateofmindpanel
  snyggade till student author state
  added checklistCategories
  implemented classes for checklistCategories
  fixade till menysystemet mer under supervisor/project details
  updated unit tests for peer listings
  lade till ny design för supervisor>project details
  fixade krash som orsakas av att titta på checklista då inget aktivt projekt är markerat
  commit för push
  rensade bort utkommenterad kod + fixade lite kommentarer
  Bugfixes with the menu-selection
  Refactoring some stuff with the menu panels, removing a certain anti-pattern.
  lade till html ändringar
  bugg
  Fixed rendering bug due to missing css-class usage, also pre-emptive bug fix for user-switching
  Added stars to required fields in peer and changed some display logic regarding comment panel on displayed reviews
  ...
 2011-09-08 16:58:23 +02:00
Fredrik Norberg
4733587146 removed unused imports 2011-09-08 16:56:59 +02:00
Fredrik Norberg
edeb935c8d Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  addade peerpanel för supervisor
  tog bort peer review panelen igen
  lade in peer review panel på supervisor project details sidan
  lade in tooltip på trafikljuset på supervisorstateofmindpanel
  snyggade till student author state
 2011-09-08 16:48:45 +02:00
Fredrik Friis
55c08930ea addade peerpanel för supervisor 2011-09-08 22:49:50 +09:00
Fredrik Friis
6c4572abde tog bort peer review panelen igen 2011-09-08 16:58:01 +09:00
Fredrik Friis
2db9ead332 lade in peer review panel på supervisor project details sidan 2011-09-08 16:50:53 +09:00
Fredrik Friis
fd6e3cfc91 lade in tooltip på trafikljuset på supervisorstateofmindpanel 2011-09-08 16:06:56 +09:00
Fredrik Friis
1fa1fcea60 snyggade till student author state 2011-09-08 16:01:42 +09:00
Fredrik Norberg
a237a3087a Merge branch 'checklists' into develop 
* checklists:
  added checklistCategories
  implemented classes for checklistCategories
 2011-09-06 20:58:18 +02:00
Fredrik Norberg
63aab35a36 added checklistCategories 2011-09-06 20:57:49 +02:00
Fredrik Norberg
f6f2ff5c27 implemented classes for checklistCategories 2011-09-06 20:57:49 +02:00
Fredrik Norberg
02cac7a5fe Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  fixade till menysystemet mer under supervisor/project details
  updated unit tests for peer listings
  lade till ny design för supervisor>project details
 2011-09-06 20:57:27 +02:00
Fredrik Friis
73c6a7af84 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-09-06 23:51:25 +09:00
Fredrik Friis
e2097d2646 fixade till menysystemet mer under supervisor/project details 2011-09-06 23:50:45 +09:00
Emil Siverhall
e79e36fe8c Merge branch 'unitTestsForPeer' into develop 
* unitTestsForPeer:
  updated unit tests for peer listings
 2011-09-06 14:40:11 +02:00
Emil Siverhall
47261791f3 updated unit tests for peer listings 2011-09-06 14:36:55 +02:00
Fredrik Friis
12b8983d8c lade till ny design för supervisor>project details 2011-09-06 18:00:10 +09:00
Fredrik Norberg
38c72d22b0 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  fixade krash som orsakas av att titta på checklista då inget aktivt projekt är markerat
  commit för push
  rensade bort utkommenterad kod + fixade lite kommentarer
  Bugfixes with the menu-selection
  Refactoring some stuff with the menu panels, removing a certain anti-pattern.
  lade till html ändringar
  bugg
  Fixed rendering bug due to missing css-class usage, also pre-emptive bug fix for user-switching
  Added stars to required fields in peer and changed some display logic regarding comment panel on displayed reviews
  fixed failing unit test for peer requests
  unit test modifications
  Added unit tests for admin peer pages and peer review/request dao
  Delete function is added to the Peer request list
  PeerRequestList is now sorted to show the latest created request first
  Added links to peer reviews in the admin list of all reviews. Reviews are displayed in new page AdminPeerReviewPage to keep the Admin tab highlighted.
  only waiting peer requests are now deletable.
  All peer requests and reviews are now listed for admins.
 2011-09-06 10:29:26 +02:00
Fredrik Friis
0f86b831e3 fixade krash som orsakas av att titta på checklista då inget aktivt projekt är markerat 2011-09-06 17:19:33 +09:00
Fredrik Friis
28df460a47 commit för push 2011-09-06 16:53:57 +09:00
Fredrik Friis
b06b48dc7a Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-09-06 16:37:52 +09:00
Fredrik Friis
4a1b09d70c rensade bort utkommenterad kod + fixade lite kommentarer 2011-09-06 16:35:29 +09:00
Robin Eklund
bb65687034 Bugfixes with the menu-selection 2011-09-05 17:29:58 +02:00
Robin Eklund
2dd917c9f7 Refactoring some stuff with the menu panels, removing a certain anti-pattern. 2011-09-05 16:56:58 +02:00
Fredrik Friis
9f81f91837 lade till html ändringar 2011-09-05 22:25:41 +09:00
Fredrik Friis
c63395d6c1 bugg 2011-09-05 22:08:05 +09:00
Robin Eklund
62b07d6e0e Merge branch 'bugFixes' into develop 2011-09-05 10:52:11 +02:00
Robin Eklund
480d564dba Fixed rendering bug due to missing css-class usage, also pre-emptive bug fix for user-switching 2011-09-05 10:49:51 +02:00
Emil Siverhall
2f80e12f72 Merge branch 'requiredFields' into develop 
* requiredFields:
  Added stars to required fields in peer and changed some display logic regarding comment panel on displayed reviews
 2011-09-05 09:58:19 +02:00
Emil Siverhall
81fc12067b Added stars to required fields in peer and changed some display logic regarding comment panel on displayed reviews 2011-09-05 09:54:35 +02:00
Emil Siverhall
d7073d8422 fixed failing unit test for peer requests 2011-09-03 10:43:33 +02:00
Emil Siverhall
454818943e unit test modifications 2011-09-03 10:39:18 +02:00
Emil Siverhall
0d22d5d068 Merge branch 'adminPeerList' into develop 
* adminPeerList:
  Added unit tests for admin peer pages and peer review/request dao
 2011-09-03 10:10:49 +02:00
Emil Siverhall
79938681b8 Added unit tests for admin peer pages and peer review/request dao 2011-09-03 10:10:28 +02:00
Emil Siverhall
3fc0229c0d Merge branch 'adminPeerList' into develop 
* adminPeerList:
  Delete function is added to the Peer request list
  PeerRequestList is now sorted to show the latest created request first
  Added links to peer reviews in the admin list of all reviews. Reviews are displayed in new page AdminPeerReviewPage to keep the Admin tab highlighted.
  only waiting peer requests are now deletable.
  All peer requests and reviews are now listed for admins.
 2011-09-03 08:40:00 +02:00
Emil Siverhall
2df9037cd0 Delete function is added to the Peer request list 2011-09-03 08:30:36 +02:00
Fredrik Norberg
e789fb33f8 Merge branch 'checklists' into develop 
* checklists:
  added functionality to edit checklistTemplates
  started with functionality to add questions to checklist templates
 2011-09-02 11:39:01 +02:00
Fredrik Norberg
cb6a4ebe28 added functionality to edit checklistTemplates 2011-09-02 11:38:27 +02:00
Fredrik Norberg
f34b03c1ab started with functionality to add questions to checklist templates 2011-09-02 11:38:26 +02:00
Fredrik Norberg
d03f720a4d Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  Revert "css klass för underflikarna supervisor"
  css klass för underflikarna supervisor
  fixade till menysystemet supervisor>project details så det liknar mockuperna mer.
  changed color
  changed picture
  added classes for git demo
 2011-09-02 11:30:27 +02:00
Fredrik Friis
cddf80d1d7 Revert "css klass för underflikarna supervisor" 
This reverts commit 0e65a3d592.

commitade av misstag
 2011-09-02 17:48:38 +09:00
Fredrik Friis
0e65a3d592 css klass för underflikarna supervisor 2011-09-02 16:42:53 +09:00
Fredrik Friis
4e963fe365 fixade till menysystemet supervisor>project details så det liknar mockuperna mer. 2011-09-01 20:57:05 +09:00
Fredrik Norberg
1e68cae726 changed color 2011-08-31 16:16:35 +02:00
Fredrik Norberg
414bcd1fa7 changed picture 2011-08-31 13:34:42 +02:00
Fredrik Norberg
623f88252a added classes for git demo 2011-08-31 11:57:58 +02:00
Fredrik Norberg
2777b18e6e 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 error pages, and some minor refactoring.
  Added some minor previewability stuff, not sure if we can do anything with this due to
  fixade snyggare tabell supervisormyprojects
  testar minska storleken på bilder
  testar minska storleken på bilder
  Added ability to create custom error pages, implementation might be a bit
  fixade supervisor my projects tabellen enligt mockups
  Logout link removed when external authentication is configured.
  lade in panel på supervisordelen, fixade så att den går att ladda
  buggfixes where the wrong roles were sent as parameter
 2011-08-31 11:55:18 +02:00