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

3057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fredrik Norberg
eb806753e6 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: (28 commits)
  Simplified the SortableDataProvider API, but it needs a final review before it can be considered complete.
  Added data provider and facade for schedule events, needs more work (and a revision of the sortable API).
  Added basic crud (domain object, dao, etc) for new event object.
  strukturerade upp koden och lade in lite kommentarer
  Image instead of button to download peerreview-file.
  Download of peer-review-file from peer portal implemented.
  Some changes in Peer portal date formatting to show time of request uploads
  Fix for project showing in Author even if you are not part of it anymore.
  Minor changes to table with review templates in peer request submission. css style + added wicket enclosure
  Changes to Peer Request submission to match mockups. Template choice now uses radio buttons instead of links.
  fixade nullsäker supervisorstateofmindpanel
  kommenterade ut potentiell bugg
  kommenterade ut potentiell bugg
  fixade en bugg
  lade till last updated på state of mind
  snyggade till koden lite
  fixade liten bugg
  panelen upplagd
  ny author state of mind panel klar
  ny student author state panel halvklar
  ...
 2011-10-07 11:13:21 +02:00
Fredrik Norberg
06848ddd16 fixed jpa functionality for adding checklists in the workerthread 2011-10-07 11:07:39 +02:00
Fredrik Friis
5fd9b58833 fixat lite smågrejer på demosidan och file 2011-10-07 16:19:32 +09:00
Fredrik Friis
19ba5e0ecf ny tabell i files som kan användas överallt. alla andra tabeller i systemet bör i princip göras om med thead, foot och body och sen ha denna tabell som css 2011-10-07 12:59:06 +09:00
Fredrik Friis
a9c16be7aa bytt till liknande tabell på filer som vi använder på andra ställen 2011-10-07 09:19:05 +09:00
Robin Eklund
ef927a9137 Simplified the SortableDataProvider API, but it needs a final review before it can be considered complete. 2011-10-06 17:47:43 +02:00
Fredrik Friis
42ff3f8112 ändrade en formulering på state of mind 2011-10-06 13:53:22 +09:00
Fredrik Friis
6f16830d6b fixat markupbuggar 2011-10-06 13:31:11 +09:00
Fredrik Friis
7842a84d0a gjort alla ikoner til 16 och daisy 2011-10-06 10:49:28 +09:00
Fredrik Friis
f12a1ea07e fixat lite ikoner, snyggat till 2011-10-06 10:40:33 +09:00
Fredrik Friis
e239477a77 fixat lite ikoner, snyggat till 2011-10-06 10:00:15 +09:00
Fredrik Friis
c58a1c7e1b tog bort onödig ajax, snyggade till upload o create folder barsen 2011-10-06 09:15:44 +09:00
Robin Eklund
de067afe1e Added data provider and facade for schedule events, needs more work (and a revision of the sortable API). 2011-10-05 16:17:26 +02:00
Robin Eklund
a6faa9b1a1 Added basic crud (domain object, dao, etc) for new event object. 
Removed a lot of needless xml-conf stuff.
Changed to InnoDB engine by default, this will need modifications on all current installations as MyISAM and InnoDB does not mix.
Deprecated some old stuff dealing with the schedule, massive cleanup will follow.
 2011-10-05 13:17:51 +02:00
Fredrik Friis
3ee7e331eb försöker orda markupen 2011-10-05 20:12:21 +09:00
Fredrik Friis
d04f97423c tog bort onödigt filtrams ifrån files 2011-10-05 19:47:51 +09:00
Fredrik Friis
d89a2f570e strukturerade upp koden och lade in lite kommentarer 2011-10-05 12:01:16 +09:00
Joakim Berglund
24ef7bbc6b Merge branch 'downloadPeerReview' into develop 2011-10-04 18:07:07 +02:00
Joakim Berglund
fd88e3c8ac Image instead of button to download peerreview-file. 2011-10-04 18:05:00 +02:00
Joakim Berglund
d9a629250d Download of peer-review-file from peer portal implemented. 2011-10-04 16:37:37 +02:00
Emil Siverhall
43c8823063 more date formatting change in peer portal 2011-10-04 16:33:43 +02:00
Emil Siverhall
214ea44c0a Merge branch 'peerPortal' into develop 
* peerPortal:
  Some changes in Peer portal date formatting to show time of request uploads
 2011-10-04 14:58:29 +02:00
Emil Siverhall
48dcf566a6 Some changes in Peer portal date formatting to show time of request uploads 2011-10-04 14:57:42 +02:00
Joakim Berglund
2c673d01bc Merge branch 'activeProjectFix' into develop 2011-10-04 14:33:32 +02:00
Joakim Berglund
a3adf91279 Fix for project showing in Author even if you are not part of it anymore. 2011-10-04 14:31:53 +02:00
Emil Siverhall
fe95039dcd Merge branch 'peerCleanup' into develop 
* peerCleanup:
  Minor changes to table with review templates in peer request submission. css style + added wicket enclosure
 2011-10-04 11:47:42 +02:00
Fredrik Norberg
f3027c83f7 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  Changes to Peer Request submission to match mockups. Template choice now uses radio buttons instead of links.
  fixade nullsäker supervisorstateofmindpanel
  kommenterade ut potentiell bugg
  kommenterade ut potentiell bugg
  fixade en bugg
  lade till last updated på state of mind
  snyggade till koden lite
  fixade liten bugg
  panelen upplagd
  ny author state of mind panel klar
  ny student author state panel halvklar
  fixade till supervisor author state
  some code cleanup and modifications to unit tests.
  Stats for reviews and requests is now available under the All Peers tab in the Admin menu.
  Minor cleanup
  testat att allt fungerar, verkar OK
  Removed needless import
  Removed resource menu item from servicemenu
  fixat separata komponenter för log
 2011-10-04 11:34:48 +02:00
Emil Siverhall
75ff1b6f52 Minor changes to table with review templates in peer request submission. css style + added wicket enclosure 2011-10-04 11:30:20 +02:00
Emil Siverhall
75a1855741 Merge branch 'peerCleanup' into develop 
* peerCleanup:
  Changes to Peer Request submission to match mockups. Template choice now uses radio buttons instead of links.
 2011-10-04 11:05:04 +02:00
Emil Siverhall
5fdb875f53 Changes to Peer Request submission to match mockups. Template choice now uses radio buttons instead of links. 2011-10-04 11:04:37 +02:00
Fredrik Friis
774d0b0f74 fixade nullsäker supervisorstateofmindpanel 2011-10-04 17:54:56 +09:00
Fredrik Friis
40c81ec47e kommenterade ut potentiell bugg 2011-10-04 17:08:16 +09:00
Fredrik Friis
0595a595fd kommenterade ut potentiell bugg 2011-10-04 17:06:45 +09:00
Fredrik Friis
4e158eddfe fixade en bugg 2011-10-04 16:36:30 +09:00
Fredrik Friis
1853589e16 lade till last updated på state of mind 2011-10-04 15:59:46 +09:00
Fredrik Friis
8906cc0df6 snyggade till koden lite 2011-10-04 12:45:06 +09:00
Fredrik Friis
e56b5d25de fixade liten bugg 2011-10-04 12:41:17 +09:00
Fredrik Friis
c3f2e2352d panelen upplagd 2011-10-04 12:16:19 +09:00
Fredrik Friis
06d3fbbc47 ny author state of mind panel klar 2011-10-04 11:53:32 +09:00
Fredrik Friis
263e0154b6 ny student author state panel halvklar 2011-10-04 11:33:03 +09:00
Fredrik Friis
7b2a11b4c5 fixade till supervisor author state 2011-10-04 10:20:42 +09:00
Emil Siverhall
b70bb28e4f Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-10-03 16:34:06 +02:00
Emil Siverhall
84eba1c4b5 Merge branch 'peerAdminStats' into develop 2011-10-03 16:33:54 +02:00
Emil Siverhall
fd93fc5275 some code cleanup and modifications to unit tests. 2011-10-03 16:27:47 +02:00
U-emil-siv-dator\emil-siv
821fe9dc4d Stats for reviews and requests is now available under the All Peers tab in the Admin menu. 2011-10-03 15:36:43 +02:00
Robin Eklund
0b65b0d790 Minor cleanup 2011-10-03 15:14:55 +02:00
Fredrik Friis
d1de11dd47 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into logsplit 2011-10-03 22:03:30 +09:00
Fredrik Friis
6ad38c9f6e testat att allt fungerar, verkar OK 2011-10-03 22:03:06 +09:00
Robin Eklund
a291b619e4 Removed needless import 2011-10-03 12:48:20 +02:00
Robin Eklund
92b0548979 Merge branch 'removeResources' into develop 2011-10-03 12:45:53 +02:00