fred-fri
|
a3a9cc5c22
|
finishing partner program addition
|
2013-10-08 17:44:26 +09:00 |
|
fred-fri
|
6258f98c24
|
moving stuff
|
2013-10-08 17:41:24 +09:00 |
|
fred-fri
|
eb454fc5b2
|
moving stuff
|
2013-10-08 17:15:17 +09:00 |
|
fred-fri
|
53ac215944
|
adding program selection for partner
|
2013-10-08 17:07:45 +09:00 |
|
fred-fri
|
703867a5c6
|
adding program selection for partner
|
2013-10-08 17:03:10 +09:00 |
|
Emil Siverhall
|
08e8b40b20
|
more update changes
|
2013-10-08 09:27:59 +02:00 |
|
fred-fri
|
cd06e5fe83
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-08 16:20:01 +09:00 |
|
Dan Lagnöhed
|
e18da87dfb
|
.
|
2013-10-08 09:18:35 +02:00 |
|
fred-fri
|
8ca1fbb413
|
added dialog
|
2013-10-08 16:14:58 +09:00 |
|
fred-fri
|
e48c8f90db
|
fixed display
|
2013-10-08 15:20:30 +09:00 |
|
fred-fri
|
2c503a087c
|
hiding programs if none present
|
2013-10-08 14:39:02 +09:00 |
|
fred-fri
|
155b57d3e4
|
hiding programs if none present
|
2013-10-08 14:36:29 +09:00 |
|
fred-fri
|
cfd961e59c
|
added program selector to select supervisor idea page
|
2013-10-08 14:19:47 +09:00 |
|
fred-fri
|
c7632c277a
|
fixed conflict
|
2013-10-08 13:47:57 +09:00 |
|
fred-fri
|
7eeed0c5dd
|
added program info to student my ideas page
|
2013-10-08 13:16:48 +09:00 |
|
fred-fri
|
976f5d1aa2
|
added program info to select student ideas page
|
2013-10-08 13:13:07 +09:00 |
|
fred-fri
|
1af4c64fff
|
added program info to select student ideas page
|
2013-10-08 13:11:37 +09:00 |
|
fred-fri
|
04099227ad
|
added program info to popuppanel
|
2013-10-08 13:01:56 +09:00 |
|
fred-fri
|
e06cf46e8c
|
added program to admin overview
|
2013-10-08 12:59:23 +09:00 |
|
fred-fri
|
42f1d37c90
|
added new profile and program component
|
2013-10-08 12:35:58 +09:00 |
|
fred-fri
|
f8030a94ad
|
cleanup and adding info
|
2013-10-08 11:41:29 +09:00 |
|
fred-fri
|
db0e79165c
|
added saving of creators program
|
2013-10-08 11:20:12 +09:00 |
|
fred-fri
|
cff4f59c4c
|
adding programs to newideaparticipation and student idea submission
|
2013-10-08 10:39:44 +09:00 |
|
Emil Siverhall
|
566b3b37c9
|
started upgrade from wicket 1.4 to 6.10.0
|
2013-10-07 16:53:21 +02:00 |
|
Dan Lagnöhed
|
d2532edc5a
|
Fixed deprecated code
|
2013-10-07 13:35:03 +02:00 |
|
Dan Lagnöhed
|
5b63d299d2
|
Fixed some sonar critical issues
|
2013-10-07 13:17:02 +02:00 |
|
Richard
|
4e375dbb9c
|
Fixed date-time fields.
|
2013-10-07 12:48:22 +02:00 |
|
Richard
|
905213eb3d
|
Fixed date-time fields.
|
2013-10-07 12:34:42 +02:00 |
|
Richard
|
c9f4a15dc6
|
Fixed minor problems with some popups not displaying correctly after implementing bootstrap 3.
Fixed Header switching to mobile-view in desktop mode.
|
2013-10-07 11:33:36 +02:00 |
|
fred-fri
|
5a763feb39
|
merge
|
2013-10-07 12:01:43 +09:00 |
|
Richard
|
c1d688e7fc
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/panels/PeerReviewListPanel.html
|
2013-10-04 16:50:04 +02:00 |
|
Richard
|
8379a22084
|
Continued work with upgrading to bootstrap 3.
|
2013-10-04 16:47:43 +02:00 |
|
Richard
|
4b60c9c399
|
Continued work with upgrading to bootstrap 3.
|
2013-10-04 15:29:54 +02:00 |
|
Leo
|
b3a8cd63a9
|
fix
|
2013-10-04 11:25:07 +02:00 |
|
Leo
|
97e6a08154
|
Removed circular dependencies between NewIdeaServiceImpl and TargetServiceImpl by creating NewIdeaFacade
|
2013-10-04 11:03:43 +02:00 |
|
Leo
|
f32ed71444
|
Removed some unused methods
|
2013-10-04 10:16:56 +02:00 |
|
Emil Siverhall
|
8562ef59de
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-04 09:52:24 +02:00 |
|
Leo
|
0f6adadac1
|
Removed ImageIcon and replaced with ImageObject
|
2013-10-04 09:43:58 +02:00 |
|
Emil Siverhall
|
df2888456a
|
target service refactoring
|
2013-10-04 08:48:53 +02:00 |
|
fred-fri
|
1fff47df68
|
removed redundant asserts
|
2013-10-04 15:26:45 +09:00 |
|
fred-fri
|
90cbbc7836
|
only try to export projects with no export
|
2013-10-04 14:25:12 +09:00 |
|
fred-fri
|
68b3f3d491
|
improved error display
|
2013-10-04 14:17:36 +09:00 |
|
Richard
|
e33e9c47b8
|
Continued work with upgrading to bootstrap 3.
- Login page.
- Milestones icon.
- Minor design changes to the overview page.
|
2013-10-03 16:41:29 +02:00 |
|
Leo
|
b4f2564a58
|
refactoring on different places
|
2013-10-03 16:38:59 +02:00 |
|
fred-fri
|
0925b5db42
|
cleanup
|
2013-10-03 15:36:55 +09:00 |
|
fred-fri
|
934407194a
|
added radiofilter
|
2013-10-03 15:26:46 +09:00 |
|
fred-fri
|
5260d56642
|
removed statusfilter
|
2013-10-03 15:23:15 +09:00 |
|
Richard
|
b8e0480d42
|
Continued work with upgrading to bootstrap 3.
|
2013-10-02 16:46:13 +02:00 |
|
Richard
|
27d09e0f21
|
Continued work with upgrading to bootstrap 3.
Admin settings pages fixed.
Added glyphicons.
|
2013-10-02 15:17:23 +02:00 |
|
|
|
829b028502
|
Subject now has a simple [SciPro] tag so that people can filter them if they are not interested.
|
2013-10-02 14:31:07 +02:00 |
|
|
|
b8ef0379f0
|
Tests no longer generate error mails.
|
2013-10-02 14:26:25 +02:00 |
|
|
|
811c35d831
|
Enjoy the mails motherfuckeeeeeeeeeers.
|
2013-10-02 14:11:51 +02:00 |
|
Richard
|
7078121011
|
Continued work with upgrading to bootstrap 3.
Different fixes, for example droplists, non-column data that break grid, buttons.
|
2013-10-02 13:37:37 +02:00 |
|
Leo
|
7f3e6d4d5f
|
changed validation for contract checkbox
|
2013-10-02 11:51:08 +02:00 |
|
Leo
|
bffe52ba22
|
tests for validateSupervisorAcceptance
|
2013-10-02 11:34:01 +02:00 |
|
Leo
|
ce999e4eca
|
hides MilesStoneSummaryPanel and the link to MileStones when there are no active milestones
|
2013-10-02 11:07:12 +02:00 |
|
Leo
|
06173046e8
|
Hide milestone activities and phases based on project date created
|
2013-10-02 10:40:13 +02:00 |
|
Richard
|
2ddb807be4
|
Continued work with upgrading to bootstrap 3.
Fixes - Some inputs.
|
2013-10-01 17:03:47 +02:00 |
|
Leo
|
b0c4bf3371
|
More tests to NewIdeaService
Refactored ProjectNewIdeaSubmissionPage
|
2013-10-01 16:50:22 +02:00 |
|
Richard
|
db4f662725
|
Continued work with upgrading to bootstrap 3.
Fixes - Milestones.
Fixes - Project state panel.
Fixes - Different form objects.
|
2013-10-01 16:00:30 +02:00 |
|
Leo
|
a76d10582f
|
Removed some circular dependencies and added test to NewIdeaService
|
2013-10-01 15:35:39 +02:00 |
|
Richard
|
b604a04885
|
Continued work with upgrading to bootstrap 3.
Different layout fixes.
|
2013-10-01 14:26:31 +02:00 |
|
Leo
|
4ceaf3fb9d
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-01 13:29:18 +02:00 |
|
Leo
|
b8f8598720
|
added tests for TurnItInCheckService and removed PasswordService
|
2013-10-01 13:29:04 +02:00 |
|
Dan Lagnöhed
|
110a8e1f20
|
Fitnesse infrastructure finished
|
2013-10-01 13:20:49 +02:00 |
|
Richard
|
d1266c81bb
|
Continued work with upgrading to bootstrap 3.
Forum fixes.
|
2013-10-01 11:35:56 +02:00 |
|
Leo
|
0a37699aed
|
minor refactoring and tests added to ProjectServiceImpl
|
2013-10-01 11:31:06 +02:00 |
|
Richard
|
292c1bee4e
|
Continued work with upgrading to bootstrap 3.
First button update.
|
2013-10-01 09:56:24 +02:00 |
|
Richard
|
bb8995419e
|
Continued work with upgrading to bootstrap 3.
Fixed padding-problems.
HTML cleanup.
|
2013-10-01 09:49:29 +02:00 |
|
Richard
|
2df19187ae
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.html
view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPage.html
|
2013-10-01 08:40:10 +02:00 |
|
fred-fri
|
23d5debcda
|
markup improvement
|
2013-10-01 14:04:46 +09:00 |
|
fred-fri
|
66d14643c1
|
removed old panel
|
2013-10-01 13:55:17 +09:00 |
|
fred-fri
|
65900ce67b
|
removed old panel and markup improvements
|
2013-10-01 13:53:23 +09:00 |
|
fred-fri
|
7a6890384a
|
removed old panel
|
2013-10-01 13:49:29 +09:00 |
|
fred-fri
|
2c3a0dcf88
|
markup improvements
|
2013-10-01 13:45:50 +09:00 |
|
fred-fri
|
0f64fe865f
|
added tests
|
2013-10-01 13:26:00 +09:00 |
|
fred-fri
|
0d9268186c
|
added tests
|
2013-10-01 13:19:18 +09:00 |
|
fred-fri
|
3391b44de7
|
added test file
|
2013-10-01 13:15:33 +09:00 |
|
fred-fri
|
222f951554
|
added properties file
|
2013-10-01 13:09:43 +09:00 |
|
fred-fri
|
85c67957c1
|
cleanup
|
2013-10-01 13:08:02 +09:00 |
|
fred-fri
|
ae3a3054bf
|
added no activities label
|
2013-10-01 13:06:23 +09:00 |
|
fred-fri
|
a4adf0f701
|
sort order correct
|
2013-10-01 13:01:11 +09:00 |
|
fred-fri
|
8632fa67ed
|
added stuff to list, made panel abstract
|
2013-10-01 12:15:56 +09:00 |
|
fred-fri
|
fd6ac15216
|
added list
|
2013-10-01 12:11:38 +09:00 |
|
fred-fri
|
7d80b77c58
|
added new panel to page
|
2013-10-01 12:06:26 +09:00 |
|
fred-fri
|
1cfb69ec37
|
added new panel
|
2013-10-01 12:03:55 +09:00 |
|
fred-fri
|
5f40922d98
|
reorganized projectstartpage
|
2013-10-01 11:00:15 +09:00 |
|
|
|
df9aec4e29
|
Fixed typo
|
2013-09-30 19:52:31 +02:00 |
|
Emil Siverhall
|
7e83a7a9fe
|
removed some service dependencies from final seminar service
|
2013-09-30 17:42:02 +02:00 |
|
|
|
db272cd089
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-09-30 15:31:24 +02:00 |
|
|
|
ff946f2c0e
|
Only 2 weeks of logs are saved.
|
2013-09-30 15:31:16 +02:00 |
|
|
|
22fcf5753d
|
Added separate log files for every worker.
|
2013-09-30 15:00:33 +02:00 |
|
Richard
|
c6262c32b1
|
Changed offset to col-md-offset.
|
2013-09-30 14:43:21 +02:00 |
|
Leo
|
3151c9f5d6
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-30 14:40:02 +02:00 |
|
Leo
|
fedfad5e6b
|
*added test to FinalSeminarServiceImpl
*removed FinalSeminarActiveParticipationService
|
2013-09-30 14:39:47 +02:00 |
|
Richard
|
f44c3eef41
|
Changed span10 to col-md-10.
|
2013-09-30 14:28:00 +02:00 |
|
Richard
|
23a4f1de3c
|
Changed span5 to col-md-5.
Changed span7 to col-md-7.
Changed span8 to col-md-8.
Changed span9 to col-md-9.
|
2013-09-30 14:27:10 +02:00 |
|
Richard
|
e6779b17ff
|
Changed span2 to col-md-2.
Changed span3 to col-md-3.
Changed span4 to col-md-4.
|
2013-09-30 14:24:59 +02:00 |
|
Richard
|
fdf6e71c5b
|
Changed span12 to col-md-12
|
2013-09-30 14:20:49 +02:00 |
|
Richard
|
36f23e6691
|
Changed row-fluid to row.
Changed span6 to col-md-6
|
2013-09-30 14:16:00 +02:00 |
|
Richard
|
8f452b1f91
|
Temporary change - milestones icon.
Added bootstrap 3.0.0 css-file.
Added bootstrap 3.0.0-file in basepage.
|
2013-09-30 14:04:29 +02:00 |
|
Leo
|
81a448196e
|
removed FinalSeminarOppositionService
|
2013-09-30 12:45:37 +02:00 |
|
|
|
1b09d8326b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-09-30 11:36:19 +02:00 |
|
|
|
e2745d5530
|
Updated logging to LOG4J version 2 and split up the logging so there is one each for Spring, Wicket and Hibernate at warning level and one for everything else at info that also includes the aforementioned frameworks so following the flow is easy.
|
2013-09-30 11:36:14 +02:00 |
|
fred-fri
|
d287aeffb1
|
fixed critical errors
|
2013-09-30 14:06:42 +09:00 |
|
fred-fri
|
5d246ef29c
|
fixed critical errors
|
2013-09-30 14:05:25 +09:00 |
|
fred-fri
|
9fe13ead5e
|
fixed critical errors
|
2013-09-30 14:04:16 +09:00 |
|
fred-fri
|
944d19c203
|
fixed critical errors
|
2013-09-30 14:03:19 +09:00 |
|
fred-fri
|
dd1f9e8570
|
fixed critical errors
|
2013-09-30 14:00:35 +09:00 |
|
fred-fri
|
7eb5cf8d77
|
fixed critical errors
|
2013-09-30 13:59:14 +09:00 |
|
fred-fri
|
c2c4d33f25
|
fixed critical errors
|
2013-09-30 13:49:48 +09:00 |
|
fred-fri
|
d843e6890e
|
fixed critical errors
|
2013-09-30 13:48:34 +09:00 |
|
fred-fri
|
55a0b9ea46
|
fixed critical errors
|
2013-09-30 13:47:29 +09:00 |
|
fred-fri
|
74cc0531ec
|
fixed critical errors
|
2013-09-30 13:46:13 +09:00 |
|
fred-fri
|
38d1a599a4
|
fixed critical errors
|
2013-09-30 13:42:50 +09:00 |
|
fred-fri
|
200631ee32
|
fixed critical errors
|
2013-09-30 13:41:29 +09:00 |
|
fred-fri
|
cf59756e5b
|
fixed critical errors
|
2013-09-30 13:38:12 +09:00 |
|
fred-fri
|
bda552a1da
|
fixed critical errors
|
2013-09-30 13:36:59 +09:00 |
|
fred-fri
|
745b7c8d51
|
fixed critical errors
|
2013-09-30 13:32:05 +09:00 |
|
fred-fri
|
c68de2abb7
|
fixed critical errors
|
2013-09-30 13:28:15 +09:00 |
|
fred-fri
|
fa8d51bc0c
|
fixed critical errors
|
2013-09-30 13:26:21 +09:00 |
|
fred-fri
|
d7bcb0e053
|
fixed critical errors
|
2013-09-30 13:17:15 +09:00 |
|
Emil Siverhall
|
56185c3d3b
|
minor cleanup
|
2013-09-27 11:24:50 +02:00 |
|
fred-fri
|
2f1e9d0e6b
|
removed unnecessary semicolons
|
2013-09-27 15:10:27 +09:00 |
|
fred-fri
|
e0cab18c88
|
fixed display
|
2013-09-27 11:05:29 +09:00 |
|
fred-fri
|
28f55112a4
|
typo
|
2013-09-27 10:29:47 +09:00 |
|
Emil Siverhall
|
ee40f21404
|
moved target count methods to facade class to avoid circular dependencies between application period service and idea service
|
2013-09-26 20:57:51 +02:00 |
|
Leo
|
f23b301665
|
added tests to ApplicationPeriodServiceImpl
|
2013-09-26 20:57:49 +02:00 |
|
Richard
|
aa4802c7c9
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/pom.xml
|
2013-09-26 16:45:29 +02:00 |
|
Richard
|
ef06d3d80f
|
Continued styling - overview page.
|
2013-09-26 16:41:32 +02:00 |
|
Emil Siverhall
|
2e12611d35
|
new idea service fixes
|
2013-09-26 10:46:08 +02:00 |
|
fred-fri
|
0542bfa2e6
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-26 17:23:29 +09:00 |
|
fred-fri
|
b985f4d60f
|
merge
|
2013-09-26 17:22:29 +09:00 |
|
Leo
|
4d82d3ebbb
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-26 10:01:09 +02:00 |
|
Leo
|
70213f3493
|
removed all SuperDaos
|
2013-09-26 10:00:57 +02:00 |
|
Leo
|
7944f812d2
|
removed RoleDao
|
2013-09-26 09:45:41 +02:00 |
|
Emil Siverhall
|
dfb0ec9ad1
|
added some tests to peer review service
|
2013-09-26 08:57:28 +02:00 |
|
fred-fri
|
0b8e376c14
|
using new constructor
|
2013-09-26 15:46:54 +09:00 |
|
fred-fri
|
7481cc3dab
|
added new constrcutor with set, using it once
|
2013-09-26 15:29:13 +09:00 |
|
fred-fri
|
b5874b2319
|
fixed display
|
2013-09-26 14:57:33 +09:00 |
|
fred-fri
|
20875716df
|
fixed display
|
2013-09-26 14:49:03 +09:00 |
|
fred-fri
|
9028ec813c
|
fixed display
|
2013-09-26 14:45:43 +09:00 |
|
fred-fri
|
6544eca364
|
fixed display
|
2013-09-26 13:33:26 +09:00 |
|
fred-fri
|
f4dd1dba34
|
fixed display
|
2013-09-26 13:00:47 +09:00 |
|
Leo
|
dcf2d0822e
|
started removing RoleDao
|
2013-09-25 17:01:56 +02:00 |
|
Richard
|
14d34db47d
|
Continued styling - overview page.
|
2013-09-25 16:57:56 +02:00 |
|
Leo
|
c927b51002
|
removed ChecklistTemplateDao
|
2013-09-25 16:41:55 +02:00 |
|
Leo
|
3856f522e2
|
removed ProjectClassDao
|
2013-09-25 15:58:11 +02:00 |
|
Leo
|
83eb142353
|
removed PeerReviewDao
|
2013-09-25 15:10:10 +02:00 |
|
Leo
|
642d643b00
|
*removed ProjectDao
*changed CreateOrUpdate to updateExternalResearchArea in ResearchAreaService
|
2013-09-25 13:59:16 +02:00 |
|
Emil Siverhall
|
22344ae4ee
|
added missing tests for comment thread panel
|
2013-09-25 09:04:49 +02:00 |
|
Richard
|
9fdf22508d
|
Continued styling - overview page.
|
2013-09-25 08:52:23 +02:00 |
|
fred-fri
|
9e6a2f8a2d
|
fixing display
|
2013-09-25 14:15:01 +09:00 |
|
fred-fri
|
ce07349560
|
removed tostring from role, employee and student and fixing display
|
2013-09-25 13:11:54 +09:00 |
|
fred-fri
|
493c0410e2
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-25 11:55:45 +09:00 |
|
fred-fri
|
a6068e15bd
|
refactored panel and fixed display
|
2013-09-25 11:55:08 +09:00 |
|
fred-fri
|
58b9127c11
|
fixed displays
|
2013-09-25 11:15:12 +09:00 |
|
Leo
|
d78f7d607a
|
removed PeerRequestDao
|
2013-09-24 16:56:12 +02:00 |
|
Leo
|
f0a12b5148
|
removed PeerReviewDao
|
2013-09-24 16:03:01 +02:00 |
|
Leo
|
0b3484e0ab
|
removed SupervisorDao and QueryableDao
|
2013-09-24 14:33:43 +02:00 |
|
Leo
|
ca9ee995b3
|
started removing SupervisorDao
|
2013-09-24 14:18:34 +02:00 |
|
fred-fri
|
56977c29bc
|
hooked project class display to name attribute
|
2013-09-24 20:02:44 +09:00 |
|
fred-fri
|
5da66a00c7
|
hooked project class display to name attribute
|
2013-09-24 19:56:56 +09:00 |
|
Leo
|
4c2825910e
|
removed AuthorrDao
|
2013-09-24 11:57:50 +02:00 |
|
Leo
|
c243466b74
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-24 10:30:42 +02:00 |
|
Leo
|
57d80aa7ec
|
removed UserDao
|
2013-09-24 10:30:28 +02:00 |
|
Dan Lagnöhed
|
8e364a2d3b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-09-24 08:29:54 +02:00 |
|
Dan Lagnöhed
|
a1d1bec63d
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/activityplan/facade/ProjectScheduleFacadeImpl.java
|
2013-09-24 08:27:02 +02:00 |
|
fred-fri
|
9fc705790c
|
made it possible to run jetty locally
|
2013-09-24 15:23:36 +09:00 |
|
Dan Lagnöhed
|
de29529a9f
|
Removed all dependencies to Wicket in the core-module
|
2013-09-24 08:23:31 +02:00 |
|
fred-fri
|
29635ae31a
|
fixed display
|
2013-09-24 14:44:55 +09:00 |
|
fred-fri
|
addcb1c619
|
fixed display
|
2013-09-24 14:43:58 +09:00 |
|
fred-fri
|
812cce6e48
|
fixed display
|
2013-09-24 14:20:39 +09:00 |
|
fred-fri
|
c9b61f51e9
|
some refactoring
|
2013-09-24 13:19:50 +09:00 |
|
fred-fri
|
0f0c2d10e9
|
adding components
|
2013-09-24 12:49:44 +09:00 |
|
fred-fri
|
9263c3bf67
|
adding new panel for displaying students
|
2013-09-24 12:36:58 +09:00 |
|
Leo
|
c3ac7fcb7e
|
removed WorkerDataDao
|
2013-09-23 17:20:29 +02:00 |
|
Leo
|
973283856c
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-23 16:58:51 +02:00 |
|
Emil Siverhall
|
d8a34f9bd7
|
removed UserSettingsDao
|
2013-09-23 16:57:29 +02:00 |
|
Emil Siverhall
|
0c400fed09
|
removed ScheduleTemplateDao
|
2013-09-23 16:12:33 +02:00 |
|
Leo
|
d8ee48c469
|
merge
|
2013-09-23 15:51:47 +02:00 |
|
Emil Siverhall
|
c2d8688c5f
|
removed ProjectScheduleEventDao and fixed bug with date selection on activity plan panel
|
2013-09-23 15:20:20 +02:00 |
|
Emil Siverhall
|
aade094a1d
|
revert unrelated changes that followed last commit
|
2013-09-23 13:10:47 +02:00 |
|
Emil Siverhall
|
77ac009ccd
|
made paging work better when combining external data provider with springs PageRequest
|
2013-09-23 13:06:59 +02:00 |
|
Richard
|
e8db23efab
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-09-23 10:05:47 +02:00 |
|
Dan Lagnöhed
|
be6f4f8c9b
|
Clean up of pom-files. Ignored some non unit-tests
|
2013-09-23 08:22:44 +02:00 |
|
Dan Lagnöhed
|
00eb651585
|
Introduced dependency management in pom-files
|
2013-09-22 19:36:54 +02:00 |
|
Richard
|
f2ad8ebdec
|
Continued styling - overview page.
|
2013-09-20 16:54:00 +02:00 |
|
Leo
|
7a6bed150b
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-20 16:14:32 +02:00 |
|
Leo
|
ba58e71efd
|
removed ProjectPartnerDao
|
2013-09-20 16:13:48 +02:00 |
|
|
|
99f45b0f0e
|
Moved finalName parameter to where it matters.
|
2013-09-20 15:42:39 +02:00 |
|
|
|
7954ee23de
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-09-20 15:36:47 +02:00 |
|
|
|
7c64a0956a
|
Fixed broken test after implementing Lombok @ToString
|
2013-09-20 15:36:02 +02:00 |
|
|
|
53233ff371
|
Import related service methods implemented.
|
2013-09-20 15:35:45 +02:00 |
|
Leo
|
8d241861f4
|
removed FileDescriptionDao
|
2013-09-20 14:49:53 +02:00 |
|
Leo
|
58de77a047
|
removed CommentThreadDao
|
2013-09-20 13:59:04 +02:00 |
|
Leo
|
4f9f655024
|
removed CommentDao and the old CommentThreadPanel
|
2013-09-20 11:12:44 +02:00 |
|
Leo
|
4a75b8e373
|
CommentThreadPanelNew now works as intended
|
2013-09-20 10:56:40 +02:00 |
|
Richard
|
33a11e69f0
|
Continued styling - project state.
|
2013-09-20 09:53:02 +02:00 |
|
|
|
d247083b05
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/io/facade/ImporterFacade.java
|
2013-09-20 08:53:43 +02:00 |
|
|
|
47ce3f6753
|
Whole import rewritten.
Still not importing project participants/authors.
|
2013-09-20 08:50:31 +02:00 |
|
Leo
|
f838c3b4f3
|
Started removing CommentDao and rewriting CommentThreadPanel. Not done and note working due to MySQL constraint of strange origins
|
2013-09-19 16:57:02 +02:00 |
|
Richard
|
5b45aeede7
|
Styling - project state.
|
2013-09-19 16:37:03 +02:00 |
|
Richard
|
d72d5e47c1
|
Styling - project details.
|
2013-09-19 16:20:55 +02:00 |
|
Leo
|
f034298ffc
|
Added a ChecklistCategoryService mock to SciproTest
|
2013-09-19 14:06:49 +02:00 |
|
Leo
|
d4977a46ea
|
removed CheckListCategoryDao
|
2013-09-19 13:48:32 +02:00 |
|
Leo
|
1925b6fc5a
|
removed FinalSeminarDao
|
2013-09-19 11:20:58 +02:00 |
|
Leo
|
37fb95e21f
|
URL added
|
2013-09-19 10:55:09 +02:00 |
|
Leo
|
dcd0eecf92
|
added more info about research areas. URL to link missing
|
2013-09-19 10:38:29 +02:00 |
|
|
|
a6d6014d6d
|
Merge stuff
|
2013-09-18 16:30:22 +02:00 |
|
|
|
483b0ae730
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
src/main/java/se/su/dsv/scipro/checklists/panels/AnswerDialogPanel.java
src/main/java/se/su/dsv/scipro/checklists/panels/ChecklistQuestionPanel.java
src/main/java/se/su/dsv/scipro/project/panels/NewIdeaWatsonCompletionPanel.java
|
2013-09-18 16:19:48 +02:00 |
|
|
|
5ec3c88c79
|
Split SciPro into modules separating view from logic.
|
2013-09-18 16:13:08 +02:00 |
|
