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
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
fred
076d84608b tog bort keywords 2011-10-26 15:13:37 +09:00
Robin Eklund
be73e7875a Added basic unit tests of the facade+dao-patterns 2011-10-25 17:13:57 +02:00
Fredrik Norberg
066da582f2 Merge branch 'master' into develop 
* master:
  Release branch modifications
  removed unused imports and data
  Removed auto-ddl update command not intended for production use
  rename commentread
 2011-10-25 16:42:58 +02:00
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
Robin Eklund
7c425dbe95 Minor cleanup 2011-10-25 11:26:41 +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
Robin Eklund
e92da3e1e8 Doc-comment updates 2011-10-24 15:44:29 +02:00
Robin Eklund
35b16c1637 Added human-readable headers. 2011-10-24 15:39:25 +02:00
Robin Eklund
1083f0a034 Refactored the whole ActivityPlan creation/editing mess, it now supports 
editing existing events and should be slightly easier to modify/extend.
The Supervisor's view has been replaced with the new panel-style display and we may need
to do some refactoring to support different levels of access.
 2011-10-24 15:21:41 +02: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