Commit Graph

3021 Commits

Author SHA1 Message Date
Fredrik Friis
452e969b90 supervisor checklists are now hidden from students in activity plan 2011-12-22 11:41:29 +09:00
Fredrik Friis
be70256285 fixed test issue 2011-12-21 22:41:59 +09:00
Fredrik Friis
a4bcab5e5d fixed test issue 2011-12-21 22:36:57 +09:00
Tom Vahlman
ff6ee3ce74 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-12-21 14:13:12 +01:00
Fredrik Friis
d397f99b6f Merge branch 'release-2011-12-21' 2011-12-21 20:28:25 +09:00
Fredrik Friis
bf490bfbf5 release prep, emptying of current.sql and creation of new update_db file 2011-12-21 20:09:31 +09:00
Robin Eklund
0d0e3a0662 More minor SQL changes 2011-12-21 11:11:19 +01:00
Tom Vahlman
5fa7546549 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-12-21 11:05:37 +01:00
Robin Eklund
0051f4eedb Removed obvious fails 2011-12-21 11:04:15 +01:00
Robin Eklund
963760dae9 More changes to alter-table statements 2011-12-21 10:56:24 +01:00
Robin Eklund
845d4999b6 Merge branch 'develop' into release-2011-12-21 2011-12-21 10:39:38 +01:00
Robin Eklund
84bcacebe0 Attempting altering of backend storage via alternative methods 2011-12-21 10:35:24 +01:00
Marcus Höjvall
49156fc841 Merge branch 'match_entity_fix' into develop
Match still needs to be fixed. It is not in a working condition.

* match_entity_fix:
  Moved dialog to the parent panel AdminManageProjectIdeaPanel. The dialog content is still not working
  Edited match entity to allow supervisor to be null. When a projectidea is created the default match object is Unmatched with null supervisor
2011-12-21 10:18:20 +01:00
Marcus Höjvall
fce93fcb3f Moved dialog to the parent panel AdminManageProjectIdeaPanel. The dialog content is still not working 2011-12-21 10:17:38 +01:00
Marcus Höjvall
6cec0e6372 Edited match entity to allow supervisor to be null. When a projectidea is created the default match object is Unmatched with null supervisor 2011-12-21 09:58:19 +01:00
Fredrik Friis
db8f1d1c68 request 2011-12-21 11:55:51 +09:00
Fredrik Friis
9dc6f352ee added project details panel to author project details page 2011-12-21 11:52:56 +09:00
Tom Vahlman
4ceb9f7426 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-12-20 12:38:49 +01:00
Fredrik Norberg
f49f78e57d Merge branch 'matchSupervisor' into develop
* matchSupervisor:
  Fixed some bugs in match, temp fixes to avoid nullpointers, supervisors can now see their published ideas and some gui improvements
  matchings now gets published to supervisors
2011-12-20 12:24:00 +01:00
Fredrik Norberg
851fe0ec9d Fixed some bugs in match, temp fixes to avoid nullpointers, supervisors can now see their published ideas and some gui improvements 2011-12-20 12:23:31 +01:00
Tom Vahlman
341896dc84 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-12-20 10:57:03 +01:00
Fredrik Norberg
e94b21d6ff matchings now gets published to supervisors 2011-12-20 09:52:30 +01:00
Fredrik Norberg
19a57bc47a Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  popup for deleting conference messages fixed
  default sort is now on activity dates
  comments are now hidden from peer reviews unless the review is finished as not to confuse the users with two submit buttons
  we dont want to show match stuff to ordinary users yet
  bugfix
  some cleanup
  added edit panel
  added edit panel
  filtering functionality implemented
  blabla
  simple dataview and underlying layers implemented. no params yet
  changed some links according to request
  implementing...
  added params class to projectDao
  beginning implementation
  beginning implementation
  moved panel file
2011-12-20 09:51:48 +01:00
Fredrik Friis
aeab58fb39 popup for deleting conference messages fixed 2011-12-20 14:33:35 +09:00
Fredrik Friis
6ed799ba48 default sort is now on activity dates 2011-12-20 13:29:58 +09:00
Fredrik Friis
d3969f4a24 comments are now hidden from peer reviews unless the review is finished as not to confuse the users with two submit buttons 2011-12-20 11:57:47 +09:00
Tom Vahlman
d072d8e39a Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-12-19 16:50:38 +01:00
Fredrik Friis
0135d7eeba we dont want to show match stuff to ordinary users yet 2011-12-19 17:32:13 +09:00
Fredrik Friis
9578d52b03 bugfix 2011-12-19 16:16:14 +09:00
Fredrik Friis
fcb3600a64 fixed conflicts, cleaned up. 2011-12-19 14:50:57 +09:00
Fredrik Friis
b9e7aada4f some cleanup 2011-12-19 14:33:53 +09:00
Fredrik Friis
b1ebacecf5 added edit panel 2011-12-19 14:13:16 +09:00
Fredrik Friis
cc7c98280c added edit panel 2011-12-19 14:13:07 +09:00
Fredrik Friis
217a096176 filtering functionality implemented 2011-12-16 16:30:01 +09:00
Fredrik Friis
fbaa993a28 blabla 2011-12-16 15:47:55 +09:00
Fredrik Friis
e9424c5c4e simple dataview and underlying layers implemented. no params yet 2011-12-16 15:02:07 +09:00
Fredrik Friis
6315277b4b changed some links according to request 2011-12-16 11:57:29 +09:00
Fredrik Norberg
f6a117da57 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (29 commits)
  More sensible defaults
  Now allowing editing of projects, semantics on when this should be
  Minor refactoring and scheduling of bulk-supervisor imports.
  Added import of projects based on title
  Major refactoring, old importers has been completely removed.
  Added manual import of projects via identifier queries.
  Added support for fetching "all supervisors" from remote.
  Lots of small changes. Some refactoring is needed due to recent api-changes.
  Refactoring, added support for multiple remote project class names mapping to the same local values.
  Added project importing, will need some cleaning and loads of bug-fixes.
  Some stuff, have to look at my stashes now.
  Refactoring work, can't get further on this without more api-support.
  Minor refactoring, the intention is to better support failures coming from the remote host.
  Added dependency on external b64 api
  Minor fixes.
  Added a lot of stuff to support basic-auth and temporary bypassing of certificate handling (this part will need to be removed)
  Minor formatting changes
  Duplication issues resolved, started deprecating old value-objects.
  Numerous bug fixes concerning dates of imported data, also final seminars are automatically created to
  Fixed duplicate reviewers/co-supervisors during import-procedure
  ...
2011-12-15 15:58:09 +01:00
Robin Eklund
d26b8f0461 More sensible defaults 2011-12-15 14:55:43 +01:00
Robin Eklund
bb01c8f2e4 Resolved merge conflicts, also added more clear indication of login failures via external authentication. 2011-12-15 14:55:06 +01:00
Robin Eklund
fb9cc6a486 Now allowing editing of projects, semantics on when this should be
allowed is yet to be defined.
2011-12-15 14:30:43 +01:00
Fredrik Norberg
d72ab2b234 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  some optimizations
  some leftover name changes
  some name changes on request
2011-12-15 13:22:34 +01:00
Tom Vahlman
c1e56bebea Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-12-15 10:38:19 +01:00
Fredrik Friis
1b086833df implementing... 2011-12-15 17:18:56 +09:00
Fredrik Friis
0dfbcb78be added params class to projectDao 2011-12-15 17:10:51 +09:00
Fredrik Friis
02c759ee1a beginning implementation 2011-12-15 17:00:51 +09:00
Fredrik Friis
1157af2696 beginning implementation 2011-12-15 16:02:54 +09:00
Fredrik Friis
0f54983a25 moved panel file 2011-12-15 15:42:19 +09:00
Fredrik Friis
96d98cead4 some optimizations 2011-12-15 14:01:49 +09:00
Fredrik Friis
109cca783f some leftover name changes 2011-12-15 11:52:01 +09:00