fred-fri
|
f7d0fd93fe
|
removed double feedback message
|
2013-12-12 17:22:11 +09:00 |
|
Emil Siverhall
|
f18c6face6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 08:47:32 +01:00 |
|
Emil Siverhall
|
e8e66b2b94
|
changed date format on participation/opposition page
|
2013-12-12 08:46:53 +01:00 |
|
fred-fri
|
a7c6f7bcbf
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-12-12 16:42:51 +09:00 |
|
fred-fri
|
5f43d76fd4
|
removing things named projectclass
|
2013-12-12 16:37:22 +09:00 |
|
fred-fri
|
d0b8db78e4
|
removing things named projectclass
|
2013-12-12 16:22:35 +09:00 |
|
Emil Siverhall
|
040738467b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 08:21:10 +01:00 |
|
fred-fri
|
3b577c4ae1
|
removing things named projectclass
|
2013-12-12 14:43:22 +09:00 |
|
fred-fri
|
1f7389487f
|
removing things named projectclass
|
2013-12-12 14:40:15 +09:00 |
|
fred-fri
|
224c74f359
|
renaming target projectclass to projecttype
|
2013-12-12 14:06:34 +09:00 |
|
fred-fri
|
7876be9709
|
renamed projectclasssettings projecttypesettings
|
2013-12-12 13:43:58 +09:00 |
|
Emil Siverhall
|
7253c80691
|
replaced last occurrence of FilterFormCheckBoxPanel and deleted the class
|
2013-12-11 22:00:36 +01:00 |
|
Emil Siverhall
|
9fba54a578
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 17:20:46 +01:00 |
|
|
|
912f31f0fa
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/reusable/AjaxCheckBoxMultipleChoice.java
|
2013-12-11 17:14:03 +01:00 |
|
Emil Siverhall
|
cea3f859ce
|
replaced FilterFormCheckboxPanel on AdminRolePage
|
2013-12-11 17:07:55 +01:00 |
|
Emil Siverhall
|
b5335f7686
|
replaced FilterFormCheckboxPanel on ProjectDataPanel
|
2013-12-11 16:54:29 +01:00 |
|
Emil Siverhall
|
832de7c068
|
replaced FilterFormCheckboxPanel on AdminFinalSeminarExemptionPage
|
2013-12-11 16:44:11 +01:00 |
|
Emil Siverhall
|
b6ec2c87e0
|
replaced FilterFormCheckboxPanel on SupervisorAllStudentIdeasPanel
|
2013-12-11 16:33:14 +01:00 |
|
Emil Siverhall
|
c7d658d9cc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 16:23:20 +01:00 |
|
Emil Siverhall
|
56ec336e73
|
replaced FilterFormCheckboxPanel on ProjectAllSupervisorIdeasPanel (renamed panel as well)
|
2013-12-11 16:23:00 +01:00 |
|
niklas3
|
73cffa4477
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 16:17:40 +01:00 |
|
niklas3
|
6c87eb255b
|
Hide "Opposition and peer review" from tabs if active project is ICT4D. Had to fix null pointers for every test in the world
|
2013-12-11 16:17:28 +01:00 |
|
Emil Siverhall
|
3f75dfa29c
|
replaced FilterFormCheckboxPanel on PeerReviewListPanel/PeerRequestListPanel
|
2013-12-11 16:07:42 +01:00 |
|
|
|
7cb9c92df4
|
Updated status filter to use better wicket components.
|
2013-12-11 16:07:34 +01:00 |
|
|
|
6c53fb9172
|
Updated role filter to use better wicket components.
|
2013-12-11 15:56:47 +01:00 |
|
|
|
d13d6bb532
|
Added constructor that does not require default selection to AjaxCheckBoxMultipleChoice.
|
2013-12-11 15:54:44 +01:00 |
|
Emil Siverhall
|
e71c419122
|
replaced FilterFormCheckboxPanel on ManageTargetsPanel
|
2013-12-11 15:49:39 +01:00 |
|
Emil Siverhall
|
d33b70fe97
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 15:40:53 +01:00 |
|
Emil Siverhall
|
834d13b716
|
removed use of FilterFormCheckboxPanel on Admin->Match->Ideas
|
2013-12-11 15:40:43 +01:00 |
|
|
|
403585d3f6
|
Added checkbox to toggle supervisor only filter.
|
2013-12-11 15:14:25 +01:00 |
|
niklas3
|
6eb0f2caa7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 14:59:56 +01:00 |
|
niklas3
|
24dbe0ceb7
|
Clean-up in aisle 5.
|
2013-12-11 14:59:52 +01:00 |
|
Emil Siverhall
|
adbae5ec9a
|
changed path to checkgroup, text fix
|
2013-12-11 14:58:06 +01:00 |
|
niklas3
|
dae636eb30
|
Changed peer related stuff from aborted to expired.
|
2013-12-11 14:55:21 +01:00 |
|
|
|
035182f711
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 14:53:30 +01:00 |
|
Emil Siverhall
|
5cc2f7309d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 14:50:24 +01:00 |
|
Emil Siverhall
|
63b31d93b3
|
removed ProjectClassFilter and replaced it with CheckBoxMultipleChoice component with Ajax behavior
|
2013-12-11 14:50:11 +01:00 |
|
niklas3
|
6c5ee2a26d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 13:30:31 +01:00 |
|
Richard
|
d2bb237a88
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 12:58:17 +01:00 |
|
|
|
2ca1198faa
|
Moved some presentation stuff to html.
|
2013-12-11 12:52:05 +01:00 |
|
Leo
|
98382e099c
|
GradingReport.getCriteria() sort criteria
|
2013-12-11 12:46:09 +01:00 |
|
|
|
526da96760
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 11:59:28 +01:00 |
|
|
|
a73e8e6069
|
Moved plagiarism feedback requirement to isFinished in GradingReport.
Turned <a> tag into <button> to get automatic disabled="disabled" attribute.
|
2013-12-11 11:59:23 +01:00 |
|
|
|
a4ac0dbf15
|
Added tests and renamed method.
|
2013-12-11 11:47:42 +01:00 |
|
Richard
|
a8e00aacc0
|
Added bootstrap-styling to ExaminerReviewPanel.
|
2013-12-11 11:45:28 +01:00 |
|
|
|
6373e404e7
|
Removed unused code.
|
2013-12-11 11:20:04 +01:00 |
|
niklas3
|
3cc9461698
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 11:12:45 +01:00 |
|
niklas3
|
d31f947584
|
stuff
|
2013-12-11 11:12:41 +01:00 |
|
|
|
8d9babbf77
|
Simplified.
|
2013-12-11 11:11:41 +01:00 |
|
Emil Siverhall
|
5867968066
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 11:10:52 +01:00 |
|
