DMC/scipro
7
0
Fork 0
Code Issues 27 Pull Requests 4 Actions Projects 1 Wiki Activity
5,272 Commits 8 Branches 416 Tags
Commit Graph

4783 Commits

Author SHA1 Message Date
Emil Siverhall
5c2c413ab3 Aborting peer review features. Dialog in My requests and reviews added. 2011-08-10 09:38:12 +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
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
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
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
Emil Siverhall
d70fdee6a5 Rewrite of .properties file that handles notification messages. Properties now take parameters for easier modification and localization. 2011-08-05 09:04:07 +02:00
Robin Eklund
e9273a97eb Small fix to user switching, roles should be correctly reset now. 2011-08-04 16:27:57 +02:00
Robin Eklund
2c8df42a18 Removed old unused data initializers, and rewrote the one in-use. 2011-08-04 15:11:16 +02:00
Robin Eklund
b7c8fd5aa8 Remote request-queries now again uses the live server, this is to ensure proper deployment configuration. 2011-08-04 13:29:57 +02:00
Robin Eklund
8832cc2374 More refactoring and a workaround to support the iPhone/android way of authenticating. 2011-08-04 13:24:19 +02:00
Robin Eklund
ec9691ecd3 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
 2011-08-04 13:02:59 +02:00
Robin Eklund
bed74f671a Lots of restructuring, we'll need to dive deeper into this to make the import jobs actually work 2011-08-03 17:50:25 +02:00
Marcus Höjvall
b0cd57a750 Replaced all getRootLogger() with getLogger(this.getClass()) 2011-08-03 09:33:52 +02:00
Fredrik Norberg
2198cefdec Merge branch 'checklists' into develop 
* checklists:
  added ListCheckListTemplatePanel
  added listCheckListPanel
  Implemented creation of checklist templates
  checklist foundation
  added adminchecklistpage
 2011-08-02 15:47:06 +02:00
Fredrik Norberg
19a80d3935 added ListCheckListTemplatePanel 2011-08-02 15:45:00 +02:00
Fredrik Norberg
7496952a32 fixed a bugg where events didnt order properly 2011-08-02 14:37:32 +02:00
Fredrik Norberg
a2b09124f7 added listCheckListPanel 2011-08-02 14:12:26 +02:00
Robin Eklund
658cf09e9a Merge branch 'uiMods' into develop 2011-08-02 13:35:17 +02:00
Robin Eklund
1eaf2a733c Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-08-02 13:34:56 +02:00
Robin Eklund
38685a6e8d Changed project menu to use the multi-row type, small modifications to the service/system menus 2011-08-02 13:30:29 +02:00
Fredrik Norberg
6e36c1b685 Implemented creation of checklist templates 2011-08-01 17:10:19 +02:00
Robin Eklund
665d558fef Main menu now uses the TAB type, we might need to create a new type or fix the images used in the tabbed types to make this look decent. 2011-08-01 11:57:41 +02:00
joha-asc
d026cfb9d3 checklist foundation 2011-07-29 15:35:11 +02:00
mpeters
169df83554 Allow supervisors to view opposition reports, not only admins 
Change-Id: Ib089d2b7b784828fdb0ab6559ca02f4cf2b60735
 2011-07-29 13:54:43 +02:00
mpeters
0da9284647 Fix of several serious bugs in final seminar file handling and 
addition of possibility of deletion of all documents related to a
final seminar by an admin

Change-Id: If75bee176893c36e14c12deee3d17098a83fa260
 2011-07-29 13:25:15 +02:00
U-XeNote\Martin
ac8716d4b0 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into local_develop 2011-07-29 12:34:33 +02:00
mpeters
04e4810d68 Removal of unused css file 
Change-Id: I92c0fab31151c74194f027d01f9b25a84ddb9396
 2011-07-29 10:25:20 +02:00
joha-asc
890fd5daef Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-07-29 10:25:12 +02:00
joha-asc
45b238d7fe removed system out println 
Change-Id: Ib8c29b473ec14538ef04f7bf2455ea0214cef60f
 2011-07-29 10:23:51 +02:00
mpeters
ea71229867 Bugfix 
Change-Id: Idd844e32c98e973b30e0f1dd7bc72bb5f63e0b52
 2011-07-29 10:04:41 +02:00
mpeters
7fda6144a7 Removal of old incorrectly added javascript code 
Change-Id: I8e6930381d1b83e44795fe3cdfd38534bd09d4f5
 2011-07-28 17:32:27 +02:00
Fredrik Norberg
7563cc7e7f Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  Fix of broken ui-logic, was impossible to create new final seminar
  Spelling+comments
  Fix of hiding of "Last 12 months" on peer portal page depending on
 2011-07-28 17:15:10 +02:00
Fredrik Norberg
242f93fe2c fixed test failure 2011-07-28 17:14:22 +02:00
Fredrik Norberg
556a610949 added adminchecklistpage 2011-07-28 17:10:21 +02:00
mpeters
42f49be0a4 Fix of menu label 
Change-Id: I5532e492381c36671c1bb1a6d1043715eb7b8dff
 2011-07-28 16:51:51 +02:00
Robin Eklund
356d71ac98 Removed unused stuff 2011-07-28 16:48:46 +02:00
Robin Eklund
7eb784eda3 Refactored main menu to use another base 2011-07-28 16:44:59 +02:00
U-XeNote\Martin
8197a87fc7 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into local_develop 2011-07-28 16:37:13 +02:00
mpeters
deab4f9271 Fix of broken ui-logic, was impossible to create new final seminar 
(unless there was one already)

Change-Id: Ia190765d0df29c0e730653e724b80e6018522b89
 2011-07-28 16:36:50 +02:00
mpeters
8506215602 Spelling+comments 
Change-Id: I51065466031338b116ab185722915bae1c45c5cc
 2011-07-28 16:07:37 +02:00
Fredrik Norberg
3b160e63cc fixed merge conflicts 2011-07-28 16:05:07 +02:00