Commit Graph

2327 Commits

Author SHA1 Message Date
Emil Siverhall
78a73b9d5f css fix 2011-08-12 08:58:58 +02:00
Fredrik Norberg
cf5fd7878a 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)
  code cleanup after failed wicket test
  design changes when performing reviews and feedback panel error fix.
  Design changes when a reviewer is performing a review.
  Added cancel button to aborted peer panel
  fixade så att flikarnas storlek  nu kan modifieras ifrån en enda klass
  gjorde toppdelen lite mindre
  Aborting accepted peer reviews with notification to requester and reviewers supervisor.
  fixade positionering av toppflikarna igen
  flyttade resources och communications mer till höger
  fixade bakgrund på flikarna och rundade kanter
  tog bort border från multitabmenu
  fixade så alla flikar använder multitabmenucssklass
  fixade bort bakgrunder och lite borders på multitab
  fixade tillbaka, gjorde fel
  fixade så att både toppflikarna och underflikarna är samma css klasser
  flyttade in resource o messagesfliken lite till höger
  removed icons from buttons in peer portal.
  tog bort hänvisning till css klass som inte finns (abstract-menu)
  flyttade ner toppflikarna
  Aborting peer review features. Dialog in My requests and reviews added.
  ...
2011-08-12 08:53:26 +02:00
Emil Siverhall
2a8a4b6d08 Merge branch 'peer_design' into develop
* peer_design:
  code cleanup after failed wicket test
  design changes when performing reviews and feedback panel error fix.
  Design changes when a reviewer is performing a review.
  fixade så att flikarnas storlek  nu kan modifieras ifrån en enda klass
2011-08-12 08:27:50 +02:00
Emil Siverhall
ddd7fd5caf code cleanup after failed wicket test 2011-08-12 08:27:03 +02:00
Emil Siverhall
abe6df1e36 Merge branch 'develop' into peer_design
* develop:
  Added cancel button to aborted peer panel
  Aborting accepted peer reviews with notification to requester and reviewers supervisor.
  Aborting peer review features. Dialog in My requests and reviews added.
2011-08-11 16:21:13 +02:00
Emil Siverhall
c227c9031e Merge branch 'aborted_peers' into develop
* aborted_peers:
  Added cancel button to aborted peer panel
  Aborting accepted peer reviews with notification to requester and reviewers supervisor.
  Aborting peer review features. Dialog in My requests and reviews added.
2011-08-11 16:19:04 +02:00
Emil Siverhall
702e22263e Merge branch 'develop' into aborted_peers
* develop:
  gjorde toppdelen lite mindre
2011-08-11 16:17:33 +02:00
Emil Siverhall
31db4f1831 design changes when performing reviews and feedback panel error fix. 2011-08-11 16:12:43 +02:00
Emil Siverhall
a3b3f884b7 Design changes when a reviewer is performing a review. 2011-08-11 13:30:02 +02:00
Emil Siverhall
0422a8069a Added cancel button to aborted peer panel 2011-08-11 11:08:22 +02:00
Fredrik Friis
7324a9034b fixade så att flikarnas storlek nu kan modifieras ifrån en enda klass 2011-08-11 18:00:00 +09:00
Fredrik Friis
a4389cf5f5 gjorde toppdelen lite mindre 2011-08-11 17:14:22 +09:00
Emil Siverhall
83aad23c06 Merge branch 'develop' into aborted_peers
* develop:
  fixade positionering av toppflikarna igen
  flyttade resources och communications mer till höger
  fixade bakgrund på flikarna och rundade kanter
  tog bort border från multitabmenu
  fixade så alla flikar använder multitabmenucssklass
  fixade bort bakgrunder och lite borders på multitab
  fixade tillbaka, gjorde fel
  fixade så att både toppflikarna och underflikarna är samma css klasser
  flyttade in resource o messagesfliken lite till höger
  tog bort hänvisning till css klass som inte finns (abstract-menu)
  flyttade ner toppflikarna
2011-08-11 09:04:54 +02:00
Emil Siverhall
4ee70f6aaf Aborting accepted peer reviews with notification to requester and reviewers supervisor. 2011-08-10 15:53:03 +02:00
Marcus Höjvall
6c61d98631 Fixed css for firefox in author, conference 2011-08-10 13:52:20 +02:00
Fredrik Friis
fcacebf52f Merge branch 'myfeature' into develop 2011-08-10 20:46:54 +09:00
Fredrik Friis
14244a8b2a fixade positionering av toppflikarna igen 2011-08-10 20:21:38 +09:00
Fredrik Friis
d3b8d7d8af flyttade resources och communications mer till höger 2011-08-10 20:12:24 +09:00
Fredrik Friis
34fd00ac05 fixade bakgrund på flikarna och rundade kanter 2011-08-10 20:09:30 +09:00
Fredrik Friis
f59b7364e3 tog bort border från multitabmenu 2011-08-10 19:36:55 +09:00
Fredrik Friis
151ecf4bcd fixade så alla flikar använder multitabmenucssklass 2011-08-10 18:42:32 +09:00
Fredrik Friis
87e39c4b7a fixade bort bakgrunder och lite borders på multitab 2011-08-10 18:34:45 +09:00
Fredrik Friis
50eaed1cbc fixade tillbaka, gjorde fel 2011-08-10 18:33:56 +09:00
Marcus Höjvall
50505d7479 Fixed css for firefox in supervisor, schedule 2011-08-10 11:32:35 +02:00
Emil Siverhall
3cff2f0566 Merge branch 'develop' into aborted_peers
* develop:
  removed icons from buttons in peer portal.
  removed show more from latestreviewerspanel and some style corrections on peer button icons.
2011-08-10 11:12:00 +02:00
Fredrik Friis
f0ba6e105e fixade så att både toppflikarna och underflikarna är samma css klasser 2011-08-10 17:43:22 +09:00
Fredrik Friis
762da611cb flyttade in resource o messagesfliken lite till höger 2011-08-10 17:37:39 +09:00
Emil Siverhall
f943531175 Merge branch 'peer_improvements' into develop
* peer_improvements:
  removed icons from buttons in peer portal.
  removed show more from latestreviewerspanel and some style corrections on peer button icons.
2011-08-10 10:35:34 +02:00
Emil Siverhall
627f400036 removed icons from buttons in peer portal. 2011-08-10 10:34:57 +02:00
Emil Siverhall
d81ccb0d02 Merge branch 'develop' into peer_improvements
* develop:
  Added fix for auto-initialization of project-classes, not optimal.
  Semi-quick hack to support failing workerthreads.
  Removed unneeded imports
  testar commita demopage och två csser
  Modified tests to accomodate refactoring changes.
  Refactoring of the lookup/json-mess, this is slightly experimental and the code base is so messy it will likely end up needing a total re-write at some point. Note: this currently fails many unit-tests due to some weird stuff in the development branch, needs to be fixed.
  Small fix to user switching, roles should be correctly reset now.
  Removed old unused data initializers, and rewrote the one in-use.
  Remote request-queries now again uses the live server, this is to ensure proper deployment configuration.
  More refactoring and a workaround to support the iPhone/android way of authenticating.
  1: Permanently Removed deprecated "getUserByUsername" methods. 2: Lookups and Json response handlers now use Autowiring instead of xml-boilerplate 3: Some minor refactoring in the response handlers, lots more to come
  Lots of restructuring, we'll need to dive deeper into this to make the import jobs actually work
2011-08-10 10:27:55 +02:00
Fredrik Friis
8eb7afbce8 tog bort hänvisning till css klass som inte finns (abstract-menu) 2011-08-10 17:25:13 +09:00
Fredrik Friis
e542983fe2 flyttade ner toppflikarna 2011-08-10 17:18:56 +09:00
Emil Siverhall
5c2c413ab3 Aborting peer review features. Dialog in My requests and reviews added. 2011-08-10 09:38:12 +02:00
Fredrik Norberg
40cc86d41b Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  Added fix for auto-initialization of project-classes, not optimal.
  Semi-quick hack to support failing workerthreads.
  Removed unneeded imports
  testar commita demopage och två csser
  Modified tests to accomodate refactoring changes.
  Re-added a file required by the unit test-suite
  Refactoring of the lookup/json-mess, this is slightly experimental and the code base is so messy
  Activation of public peer review links in the Latest reviewers panel is not available through peer portal settings. + removal of unused file.
  more code cleanup in ControllerImpl.
  Minor changes in SciProApplication.properties and code cleanup in ControllerImpl.
  Rewrite of .properties file that handles notification messages. Properties now take parameters for easier modification and localization.
  Small fix to user switching, roles should be correctly reset now.
  Removed old unused data initializers, and rewrote the one in-use.
  Remote request-queries now again uses the live server, this is to ensure proper deployment configuration.
  More refactoring and a workaround to support the iPhone/android way of authenticating.
  1: Permanently Removed deprecated "getUserByUsername" methods.
  Lots of restructuring, we'll need to dive deeper into this to make the import jobs actually work
  Replaced all getRootLogger() with getLogger(this.getClass())
2011-08-09 14:31:47 +02:00
Robin Eklund
d60ca5da7c Added fix for auto-initialization of project-classes, not optimal. 2011-08-08 16:51:57 +02:00
Emil Siverhall
a3649b56ed removed show more from latestreviewerspanel and some style corrections on peer button icons. 2011-08-08 16:20:08 +02:00
Robin Eklund
14fc1c6d30 Merge branch 'workerErrorHandling' into develop 2011-08-08 16:17:39 +02:00
Robin Eklund
d80616977d Semi-quick hack to support failing workerthreads. 2011-08-08 16:16:59 +02:00
Robin Eklund
996100644a Merge branch 'lookupRefactoring' into develop 2011-08-08 15:39:27 +02:00
Robin Eklund
15ca55f417 Removed unneeded imports 2011-08-08 15:35:48 +02:00
Fredrik Friis
c926a58c02 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-08-08 17:06:46 +09:00
Fredrik Friis
f07467ce23 testar commita demopage och två csser 2011-08-08 17:05:43 +09:00
Robin Eklund
c252513bb7 Modified tests to accomodate refactoring changes. 2011-08-05 17:51:11 +02:00
Robin Eklund
a4df7447d5 Re-added a file required by the unit test-suite 2011-08-05 17:23:12 +02:00
Robin Eklund
d15f25e509 Refactoring of the lookup/json-mess, this is slightly experimental and the code base is so messy
it will likely end up needing a total re-write at some point.
Note: this currently fails many unit-tests due to some weird stuff in the development branch, needs to be fixed.
2011-08-05 16:58:47 +02:00
Emil Siverhall
dbc03057f9 Merge branch 'review_access' into develop
* review_access:
  Activation of public peer review links in the Latest reviewers panel is not available through peer portal settings. + removal of unused file.
2011-08-05 13:39:01 +02:00
Emil Siverhall
b37b958a89 Activation of public peer review links in the Latest reviewers panel is not available through peer portal settings. + removal of unused file. 2011-08-05 13:38:06 +02:00
Emil Siverhall
959b13e01e Merge branch 'notification_properties' into develop
* notification_properties:
  more code cleanup in ControllerImpl.
  Minor changes in SciProApplication.properties and code cleanup in ControllerImpl.
  Rewrite of .properties file that handles notification messages. Properties now take parameters for easier modification and localization.
2011-08-05 10:40:28 +02:00
Emil Siverhall
d9cc046464 more code cleanup in ControllerImpl. 2011-08-05 10:39:36 +02:00
Emil Siverhall
9fe7bfc5be Minor changes in SciProApplication.properties and code cleanup in ControllerImpl. 2011-08-05 10:25:17 +02:00