|
|
92730755f6
|
Fixed bad merge from develop.
|
2013-10-15 10:49:36 +02:00 |
|
fred-fri
|
52ece99041
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-15 17:28:06 +09:00 |
|
fred-fri
|
e9349dccf2
|
made view dev profile active by default
|
2013-10-15 17:27:16 +09:00 |
|
Dan Lagnöhed
|
50e83f1dbd
|
Checking wicket upgrade
|
2013-10-15 10:19:28 +02:00 |
|
Dan Lagnöhed
|
3c175bceb2
|
Checking wicket upgrade
|
2013-10-15 10:16:50 +02:00 |
|
Dan Lagnöhed
|
a7a4066913
|
Checking wicket upgrade
|
2013-10-15 10:13:05 +02:00 |
|
|
|
71de5a26f4
|
Merge branch 'develop' into wicketupdate
Conflicts:
view/pom.xml
view/src/main/java/se/su/dsv/scipro/activityplan/panels/ActivityPlanPanel.html
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaDetailsCrudPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaOverviewPanel.html
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaOverviewPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaPopupPanel.html
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaPopupPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminRolesPanel.html
view/src/main/java/se/su/dsv/scipro/basepages/BasePage.html
view/src/main/java/se/su/dsv/scipro/checklists/panels/AnswerDialogPanel.html
view/src/main/java/se/su/dsv/scipro/components/StylableDateTimeField.html
view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.html
view/src/main/java/se/su/dsv/scipro/landingpages/NewIdeaLandingPage.java
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectOppositionPage.html
view/src/main/java/se/su/dsv/scipro/project/panels/ProjectMyIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/ProjectNewAllSupervisorIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/ProjectNewIdeaSubmissionPanel.html
view/src/main/java/se/su/dsv/scipro/project/panels/ProjectNewIdeaSubmissionPanel.java
view/src/main/java/se/su/dsv/scipro/repository/pages/RepositoryDownloadPage.java
view/src/main/java/se/su/dsv/scipro/reusable/AbstractRoleAutoCompleteComponent.java
view/src/main/java/se/su/dsv/scipro/security/auth/ExternalAuthenticationRequestHelper.java
view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarThesisPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAllSupervisorIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewAllStudentIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewEditIdeaPanel.html
view/src/test/java/se/su/dsv/scipro/panels/ChecklistAnswerCommentPanelTest.java
view/src/test/java/se/su/dsv/scipro/panels/CommentThreadPanelTest.java
|
2013-10-15 10:09:28 +02:00 |
|
Dan Lagnöhed
|
528381fc5a
|
Checking wicket upgrade
|
2013-10-15 10:00:11 +02:00 |
|
Dan Lagnöhed
|
4cd96e23d8
|
Checking wicket upgrade
|
2013-10-15 09:57:58 +02:00 |
|
Richard
|
8a0bcf52aa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-15 09:57:52 +02:00 |
|
Richard
|
e885ea44d1
|
Changed "Peer portal" to "Peers" in supervisor menu.
|
2013-10-15 09:57:40 +02:00 |
|
Dan Lagnöhed
|
fe4bbcf978
|
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
|
2013-10-15 09:23:26 +02:00 |
|
Dan Lagnöhed
|
435f10f143
|
Checking wicket upgrade
|
2013-10-15 09:23:15 +02:00 |
|
|
|
aec12f4144
|
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
|
2013-10-15 09:16:14 +02:00 |
|
|
|
48813e3685
|
Tested AdminPeerReviewPage
|
2013-10-15 09:16:09 +02:00 |
|
fred-fri
|
92d410aacb
|
fixed bug
|
2013-10-15 15:46:57 +09:00 |
|
fred-fri
|
54c67d7c51
|
fixed lazy
|
2013-10-15 15:28:24 +09:00 |
|
Emil Siverhall
|
205fcb247d
|
removed jquery script reference form BasePage.html
|
2013-10-15 08:02:00 +02:00 |
|
|
|
a5935337fc
|
Tested AdminRolePage
|
2013-10-14 17:15:03 +02:00 |
|
|
|
0ff20183ef
|
Tested AdminManageIdeaPage
|
2013-10-14 17:03:38 +02:00 |
|
|
|
0fdabbd0b1
|
Tested AdminManageMatchPeriodsPage
|
2013-10-14 16:55:50 +02:00 |
|
|
|
aa23a9a8f2
|
Tested AdminManageTargetsPage
|
2013-10-14 16:49:15 +02:00 |
|
|
|
663e9ab4ed
|
Tested AdminKeywordPage
|
2013-10-14 16:41:50 +02:00 |
|
|
|
7f10c1dcfb
|
Tested AdminStartPage
|
2013-10-14 16:15:20 +02:00 |
|
|
|
224efc708a
|
Tested AdminRegistrationPage
|
2013-10-14 16:11:11 +02:00 |
|
|
|
abcabdbd1d
|
Tested ProjectManagementPage
|
2013-10-14 15:54:59 +02:00 |
|
|
|
ffdc72485c
|
Added default date formats.
|
2013-10-14 15:54:33 +02:00 |
|
|
|
391cba5b9d
|
Tested SystemMaintenancePage
|
2013-10-14 15:43:33 +02:00 |
|
|
|
1914376db6
|
Tested AdminPeerListPage
|
2013-10-14 15:35:07 +02:00 |
|
|
|
d3738a4044
|
Error mails now include hostname in subject line.
|
2013-10-14 15:19:53 +02:00 |
|
|
|
2c91dcfcf5
|
Tested AdminProjectPartnerPage
|
2013-10-14 14:53:21 +02:00 |
|
|
|
26203fcbe4
|
Tested AdminMailPage
|
2013-10-14 14:26:13 +02:00 |
|
|
|
74e903eb43
|
Tested AdminScheduleTemplatesPage
|
2013-10-14 14:18:54 +02:00 |
|
|
|
000f19b74e
|
Added constructor that does not require PageParameters
|
2013-10-14 14:12:21 +02:00 |
|
|
|
40b8e5856d
|
Tested AdminCheckListPage
|
2013-10-14 13:57:41 +02:00 |
|
|
|
eb0c3e1887
|
Tested AdminApplicationPeriodStatisticPage
|
2013-10-14 13:43:51 +02:00 |
|
|
|
22acf29557
|
Tested AccessDeniedPage
|
2013-10-14 13:36:05 +02:00 |
|
Richard
|
531eed3ce6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-14 13:17:00 +02:00 |
|
Richard
|
d7b4c5cf3a
|
Minor font changes.
Added "preliminary grading report" to final seminar-page.
|
2013-10-14 13:16:54 +02:00 |
|
Dan Lagnöhed
|
555e73f698
|
Fixed turnItIn component. Initial checkin without test
|
2013-10-14 13:13:36 +02:00 |
|
|
|
cbf38ab4d2
|
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
|
2013-10-14 12:49:47 +02:00 |
|
|
|
9456f3797c
|
Tested LoginPage and made it stateless so the login/sso redirect initialization works.
Fixed warnings about missing login configuration files when running tests.
|
2013-10-14 12:47:40 +02:00 |
|
|
|
3287116aae
|
Tested MenuPage.
|
2013-10-14 12:46:54 +02:00 |
|
Richard
|
e3e3bdc7a3
|
Fixed minor problem with filtering-panels not scaling as they should.
|
2013-10-14 11:37:12 +02:00 |
|
Richard
|
fe72264b34
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-14 11:19:59 +02:00 |
|
Richard
|
5c6cdca24f
|
Removed links to old css-files in BasePage.
|
2013-10-14 11:19:50 +02:00 |
|
Richard
|
3c097f30ba
|
Minor styling changes, buttons and overview.
|
2013-10-14 11:16:48 +02:00 |
|
Leo
|
f0c7dbd46b
|
fixed the iterator problem (probably)
|
2013-10-14 10:20:09 +02:00 |
|
fred-fri
|
ea18e02b09
|
created local version of autocomplete with source code from components, commented out artifactory from settings.xml
|
2013-10-14 15:27:33 +09:00 |
|
fred-fri
|
f973a21cf3
|
used program code where appropriate
|
2013-10-14 14:15:43 +09:00 |
|
