Leo
|
1455656171
|
readded QueryInit annotations and removed @Data from Employee
|
2013-10-03 13:56:53 +02:00 |
|
Leo
|
6754fe0a75
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-03 13:32:07 +02:00 |
|
Leo
|
1c870476af
|
readded QueryInit annotations
|
2013-10-03 13:31:40 +02:00 |
|
Dan Lagnöhed
|
4a4b86bdc1
|
Trying to find bug...
|
2013-10-03 11:14:38 +02:00 |
|
Dan Lagnöhed
|
a417d85fa9
|
Trying to find bug... Also changed to new junit package name in som places
|
2013-10-03 11:04:01 +02:00 |
|
Dan Lagnöhed
|
13712ec86c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-03 10:31:43 +02:00 |
|
Dan Lagnöhed
|
758072b47b
|
Trying to find bug...
|
2013-10-03 10:31:32 +02:00 |
|
fred-fri
|
478af0e3df
|
cleanup
|
2013-10-03 15:37:21 +09:00 |
|
fred-fri
|
0925b5db42
|
cleanup
|
2013-10-03 15:36:55 +09:00 |
|
fred-fri
|
88ecefd015
|
edited params
|
2013-10-03 15:32:05 +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 |
|
fred-fri
|
18ea51b972
|
removed queryinit annotations that prevents app from starting
|
2013-10-03 11:34:27 +09:00 |
|
Richard
|
b8e0480d42
|
Continued work with upgrading to bootstrap 3.
|
2013-10-02 16:46:13 +02:00 |
|
Leo
|
2a82995a15
|
more tests
|
2013-10-02 15:27:38 +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 |
|
Leo
|
b67d73c29e
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-02 15:03:11 +02:00 |
|
Leo
|
05ca92ac4e
|
more tests
|
2013-10-02 15:02:59 +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
|
e46d96111e
|
tests for validateAdminAddAuthor and validateStudentAcceptance
|
2013-10-02 13:36:20 +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
|
103c1b5cad
|
removed a unused repo from MileStoneServiceImpl
|
2013-10-02 10:41:34 +02:00 |
|
Leo
|
06173046e8
|
Hide milestone activities and phases based on project date created
|
2013-10-02 10:40:13 +02:00 |
|
Emil Siverhall
|
b447bfa529
|
some more validation tests to new idea service
|
2013-10-02 08:57:59 +02:00 |
|
Richard
|
2ddb807be4
|
Continued work with upgrading to bootstrap 3.
Fixes - Some inputs.
|
2013-10-01 17:03:47 +02:00 |
|
Leo
|
8145fe9f12
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-01 16:50:35 +02:00 |
|
Leo
|
b0c4bf3371
|
More tests to NewIdeaService
Refactored ProjectNewIdeaSubmissionPage
|
2013-10-01 16:50:22 +02:00 |
|
Leo
|
882cb85cd6
|
tests for validateSupervisorIdeaSubmission
|
2013-10-01 16:08:00 +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 |
|
Dan Lagnöhed
|
72da0964f4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-01 14:14:53 +02:00 |
|
Dan Lagnöhed
|
3afa55c630
|
Removed sprint tag for test
|
2013-10-01 14:14:45 +02:00 |
|
Leo
|
08b5fa49c4
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
Conflicts:
core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/ProjectServiceImplTest.java
|
2013-10-01 13:45:30 +02:00 |
|
Leo
|
eee64015b6
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
Conflicts:
core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/ProjectServiceImplTest.java
|
2013-10-01 13:44:54 +02:00 |
|
Leo
|
64db042920
|
merge
|
2013-10-01 13:40:06 +02:00 |
|
Dan Lagnöhed
|
c17c765d8c
|
Fix for failing test
|
2013-10-01 13:38:22 +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 |
|
Leo
|
4759d77312
|
added test for BooleanBuilders in ProjectService
|
2013-10-01 13:15:15 +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 |
|
Leo
|
84eaa82b7a
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-01 09:57:14 +02:00 |
|
Leo
|
c233c15af0
|
added tests to sendNotification
|
2013-10-01 09:56:55 +02:00 |
|
