DMC/scipro
7
0
Fork 0
Code Issues 30 Pull Requests 1 Actions Projects 1 Wiki Activity
3,343 Commits 5 Branches 412 Tags
Commit Graph

3343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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