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 |
|
