|
|
30dd9d7244
|
Removed unused parameter.
|
2013-10-15 14:14:12 +02:00 |
|
|
|
f0c2181b54
|
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
|
2013-10-15 14:08:47 +02:00 |
|
|
|
e65f29ae59
|
Tested ProjectExternalStatisticsPage
|
2013-10-15 14:08:43 +02:00 |
|
Dan Lagnöhed
|
76605f638c
|
Checking wicket upgrade
|
2013-10-15 14:03:59 +02:00 |
|
Dan Lagnöhed
|
715c789a4a
|
Checking wicket upgrade
|
2013-10-15 13:56:01 +02:00 |
|
Emil Siverhall
|
4a8eb91d71
|
Merge branch 'wicketupdate' of ssh://git.dsv.su.se/git/scipro/scipro into wicketupdate
|
2013-10-15 13:53:56 +02:00 |
|
Emil Siverhall
|
ef734a8f8a
|
fixed compile failure
|
2013-10-15 13:53:39 +02:00 |
|
|
|
c212585604
|
Tested AdminIdeaStatisticsPage
|
2013-10-15 13:52:40 +02:00 |
|
|
|
76e46f333f
|
Tested AdminUnitStatisticsPage
|
2013-10-15 13:49:31 +02:00 |
|
Emil Siverhall
|
1da1e6c3c9
|
resolved merge conflic
|
2013-10-15 13:47:11 +02:00 |
|
Emil Siverhall
|
4494afba37
|
added new keyword autocomplete and refactored role autocomplete providers
|
2013-10-15 13:46:04 +02:00 |
|
|
|
b810099da4
|
Tested AbstractAdminSettingsPage
|
2013-10-15 13:42:53 +02:00 |
|
|
|
57751fd9e4
|
Tested AdminFinalSeminarSettingsPage
|
2013-10-15 13:37:19 +02:00 |
|
|
|
7ea74090c5
|
Tested AdminPeerSettingsPage
|
2013-10-15 13:33:32 +02:00 |
|
|
|
5f63fe78db
|
Tested AdminMileStoneSettingsPage
|
2013-10-15 13:25:01 +02:00 |
|
|
|
1b5af33fe5
|
Changed wiquery dialog to wicket modalwindow.
Removed test that tested nested panel, let that panel test its own functionality.
|
2013-10-15 13:09:48 +02:00 |
|
|
|
dabdf21a9c
|
Removed explicit dependency on jquery.
|
2013-10-15 12:58:33 +02:00 |
|
|
|
a645d5d4cc
|
Tested AdminDateSettingsPage
|
2013-10-15 12:01:40 +02:00 |
|
Emil Siverhall
|
93f36492c6
|
resolved merge conflicts
|
2013-10-15 11:42:42 +02:00 |
|
|
|
7726602ac5
|
Tested AdminNotificationSettingsPage
|
2013-10-15 11:37:41 +02:00 |
|
|
|
0a8447c827
|
Tested TurnitinSettingsPage
|
2013-10-15 11:34:42 +02:00 |
|
Emil Siverhall
|
714aa7a371
|
switched out the autocomplete component to use select2choice instead of our old broken component
|
2013-10-15 11:28:09 +02:00 |
|
|
|
dcb438f0c7
|
Tested AdminProjectClassSettingsPage
|
2013-10-15 11:19:48 +02:00 |
|
|
|
0b1f9ad983
|
Merge branch 'develop' into wicketupdate
|
2013-10-15 10:54:33 +02:00 |
|
|
|
be5d418cdc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-15 10:54:12 +02:00 |
|
|
|
ca544e765f
|
Fucking git can suck my balls.
|
2013-10-15 10:51:57 +02:00 |
|
|
|
70faceb775
|
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
Conflicts:
view/src/main/java/se/su/dsv/scipro/admin/pages/settings/TurnitinSettingsPage.java
view/src/test/java/se/su/dsv/scipro/admin/pages/settings/TurnitinSettingsPageTest.java
|
2013-10-15 10:51:27 +02:00 |
|
|
|
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 |
|
