Fredrik Norberg
41eef54787
fixed merge conflicts
2011-09-21 10:01:00 +02:00
Fredrik Norberg
4caa4a3242
Merge branch 'checklists' into develop
...
* checklists:
fixed checklist url, changed imagetype in trafficlightspanel and did adressed some minor bugs in answering checklists
2011-09-20 15:31:18 +02:00
Fredrik Norberg
6e885b3d38
fixed checklist url, changed imagetype in trafficlightspanel and did adressed some minor bugs in answering checklists
2011-09-20 15:28:07 +02:00
Fredrik Norberg
17a3dc356f
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Changed title of link to Turnitin report
tog bort logfliken eftersom den ännu inte är klar
some more fixes to make the sending of documents to Turnitin work properly.
Fixed bug that gave page error when clicking on Turnitin link in supervisor view
kommenterade ut buggraden
sciprologgan skall leda till https://thesis.dsv.su.se
log halvfärdigt, problem med model och daosarna
skapat panel för inläggning av logginlägg samt instantierng av loggar och logginlägg
fixar sidor för införing av logginlägg
2011-09-20 13:16:31 +02:00
Emil Siverhall
8573045eec
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 logfliken eftersom den ännu inte är klar
2011-09-20 10:36:49 +02:00
Emil Siverhall
7c011b8519
Merge branch 'turnitinTest' into develop
...
* turnitinTest:
Changed title of link to Turnitin report
2011-09-20 10:36:30 +02:00
Emil Siverhall
9aa3ced058
Changed title of link to Turnitin report
2011-09-20 10:36:08 +02:00
Fredrik Friis
7fd8f0f28c
tog bort logfliken eftersom den ännu inte är klar
2011-09-20 16:35:50 +09:00
Emil Siverhall
6c9021ce08
Merge branch 'turnitinTest' into develop
...
* turnitinTest:
some more fixes to make the sending of documents to Turnitin work properly.
2011-09-19 15:22:58 +02:00
Emil Siverhall
4d8628d206
some more fixes to make the sending of documents to Turnitin work properly.
2011-09-19 15:22:38 +02:00
Emil Siverhall
1d58dbaa40
Merge branch 'turnitinTest' into develop
...
* turnitinTest:
Fixed bug that gave page error when clicking on Turnitin link in supervisor view
2011-09-19 13:13:50 +02:00
Emil Siverhall
ffe081269b
Fixed bug that gave page error when clicking on Turnitin link in supervisor view
2011-09-19 13:05:27 +02:00
Fredrik Friis
38de64e383
Merge branch 'logimpl' into develop
2011-09-19 17:06:12 +09:00
Fredrik Friis
14b0280c3c
kommenterade ut buggraden
2011-09-19 16:59:44 +09:00
Fredrik Friis
0bdf7d27c4
sciprologgan skall leda till https://thesis.dsv.su.se
2011-09-19 16:37:09 +09:00
Fredrik Friis
e8158d6cf7
log halvfärdigt, problem med model och daosarna
2011-09-19 16:13:02 +09:00
Fredrik Norberg
3447769470
Merge branch 'checklists' into develop
...
* checklists:
fixed a bugg where checklist answers were replicated
2011-09-16 17:40:57 +02:00
Fredrik Norberg
1880d10f4c
fixed a bugg where checklist answers were replicated
2011-09-16 17:39:54 +02:00
Fredrik Norberg
38a6a7254a
Merge branch 'checklists' into develop
...
* checklists:
improved the checklist admin functionality
2011-09-16 14:34:21 +02:00
Fredrik Norberg
140f817b22
improved the checklist admin functionality
2011-09-16 14:33:11 +02:00
Fredrik Friis
d941729fd7
skapat panel för inläggning av logginlägg samt instantierng av loggar och logginlägg
2011-09-16 18:26:29 +09:00
Fredrik Norberg
3fc6465532
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (21 commits)
Added unit tests for some of the latest utility facilities,
Bug-fixes mostly, some refactoring to make the component easier to use and more flexible.
logklasserna fixade
Upload component now fairly done, could use some more test-implementations to see how the API handles different situations.
Refactored the seminarupload controller and it's callers.
log entityn klar
log entityn klar
log entityn klar
har addat logentry entities, ska nu skriva log
Added filtering utility for collections and lists, needs some more work to be usable everywhere.
Added selection of already existing resource to final seminar.
Moved upload-panel to it's own section.
Refactoring, mostly renaming and moving package-hierarchy
Slight date-format change
Changed some date formats where appropriate
All dates now use standard format, deviations will be added where deemed necessary.
Changed some documentation
Implemented a more centralized method for dateformatting, if new formats are needed they are to
Latest project upload refactored into discrete reusable components, includes a "view older" feature.
Added "latest project upload" component, needs additional work.
...
2011-09-16 10:03:22 +02:00
Robin Eklund
5e34844fbe
Merge branch 'utilTests' into develop
2011-09-15 15:00:15 +02:00
Robin Eklund
d75180c43e
Added unit tests for some of the latest utility facilities,
...
I should really do some tests for the stuff in /xml as well some day.
2011-09-15 14:59:54 +02:00
Fredrik Friis
377d2720f2
fixar sidor för införing av logginlägg
2011-09-15 21:28:48 +09:00
Robin Eklund
909626dd2b
Bug-fixes mostly, some refactoring to make the component easier to use and more flexible.
2011-09-15 14:10:28 +02:00
Fredrik Friis
efe8af13c9
Merge branch 'log' into develop
2011-09-15 17:14:38 +09:00
Fredrik Friis
4720c1e06d
logklasserna fixade
2011-09-15 14:57:26 +09:00
Robin Eklund
77cb1b312f
Merging local feature branch into develop, see previous commits for more info
2011-09-14 16:56:30 +02:00
Robin Eklund
4feb943c11
Upload component now fairly done, could use some more test-implementations to see how the API handles different situations.
2011-09-14 16:04:44 +02:00
Robin Eklund
30392c044e
Refactored the seminarupload controller and it's callers.
...
Less weird exception throwing going on now, still not fully content with the overarching
structure of this section but it will have to do for now.
Also some minor refactoring with the CollectionFilterUtil+DateFormatter utilities.
2011-09-14 13:14:29 +02:00
Fredrik Friis
e354f2c96c
log entityn klar
2011-09-14 18:14:52 +09:00
Fredrik Friis
826f6a30be
log entityn klar
2011-09-14 17:53:31 +09:00
Fredrik Friis
382f53b4f3
log entityn klar
2011-09-14 17:46:36 +09:00
Fredrik Friis
3d15e7f29a
har addat logentry entities, ska nu skriva log
2011-09-14 16:02:02 +09:00
Fredrik Norberg
9e7f98ad44
Merge branch 'checklists' into develop
...
* checklists:
Added functonality to edit checklistcategories
2011-09-13 19:28:33 +02:00
Fredrik Norberg
cb35de834e
Added functonality to edit checklistcategories
2011-09-13 19:27:18 +02:00
Robin Eklund
969b8de450
Added filtering utility for collections and lists, needs some more work to be usable everywhere.
...
Also, non-pdf files are now excluded from selecting already existing resources when PDF's are required.
2011-09-13 14:11:11 +02:00
Robin Eklund
06300e1fe3
Added selection of already existing resource to final seminar.
...
It works ok (auto-hides when there are no already existing resources), but should be reworked a bit for
reusability-purposes.
2011-09-13 13:10:08 +02:00
Robin Eklund
47aff1da19
Moved upload-panel to it's own section.
2011-09-13 11:45:10 +02:00
Robin Eklund
366d4a5d99
Refactoring, mostly renaming and moving package-hierarchy
2011-09-13 11:37:58 +02:00
Robin Eklund
9ec96e7ed6
Slight date-format change
2011-09-13 11:33:39 +02:00
Robin Eklund
b02119baec
Changed some date formats where appropriate
2011-09-13 11:31:42 +02:00
Robin Eklund
e1104b2172
All dates now use standard format, deviations will be added where deemed necessary.
2011-09-13 10:46:45 +02:00
Robin Eklund
793cbe89d8
Changed some documentation
2011-09-12 17:36:29 +02:00
Robin Eklund
4175a2a6c7
Implemented a more centralized method for dateformatting, if new formats are needed they are to
...
be added to the "DateFormatter" class and not spread through local implementations.
2011-09-12 17:34:52 +02:00
Robin Eklund
f5137eb12f
Latest project upload refactored into discrete reusable components, includes a "view older" feature.
2011-09-12 15:52:10 +02:00
Robin Eklund
e5a61255d3
Added "latest project upload" component, needs additional work.
2011-09-12 11:26:46 +02:00
Robin Eklund
4c383b0bf5
Added recursive searching to file repository, needs some testing and cleanup.
...
Added component for iterating current projects files inside a select-box, needs testing and refactoring.
2011-09-09 16:51:00 +02:00
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
