leosu
|
3ec16cea6b
|
fixed NPE
|
2014-03-04 10:23:03 +01:00 |
|
fred-fri
|
983ce7bc71
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 18:11:17 +09:00 |
|
fred-fri
|
7d9862ac89
|
student can no longer activate milestones that shouldnt be possible for them to activate
|
2014-03-04 18:11:02 +09:00 |
|
Emil Siverhall
|
d0dde877c7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 10:09:17 +01:00 |
|
Emil Siverhall
|
8ca53cb82a
|
form feedback to display error if overlapping period already exists.
|
2014-03-04 10:09:00 +01:00 |
|
Richard
|
d3411604bb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 09:52:05 +01:00 |
|
Richard
|
fd50b61253
|
Added list-unstyled on upcoming project milestones.
|
2014-03-04 09:51:51 +01:00 |
|
Emil Siverhall
|
43698b917b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 09:48:22 +01:00 |
|
|
|
212d7f71d9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 09:41:02 +01:00 |
|
fred-fri
|
112a14281f
|
adding asterisk around required points
|
2014-03-04 17:40:42 +09:00 |
|
Emil Siverhall
|
46f651cb3d
|
removed old manage targets page and panel
|
2014-03-04 09:38:49 +01:00 |
|
Emil Siverhall
|
14cea7c24d
|
checkbox for filtering out employees with target > 0
|
2014-03-04 09:23:12 +01:00 |
|
fred-fri
|
3adbb5bb8b
|
removing final seminar comment file upload and thesis comment for supervisor, reviewer and opponent
|
2014-03-04 17:20:38 +09:00 |
|
Golrokh Moattar
|
edab28191c
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarOppositionPanel.html
|
2014-03-04 09:11:26 +01:00 |
|
|
|
f0709914cb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 08:54:21 +01:00 |
|
fred-fri
|
0a6dd35a5e
|
removed package cycle
|
2014-03-04 11:27:29 +09:00 |
|
fred-fri
|
6ab97fe136
|
bug fixes
|
2014-03-04 11:01:04 +09:00 |
|
fred-fri
|
81461aa32e
|
confirmation added
|
2014-03-04 09:54:19 +09:00 |
|
Emil Siverhall
|
cd7777ba6e
|
skipping ajax for filtering
|
2014-03-03 22:46:38 +01:00 |
|
Emil Siverhall
|
aaec7c17a4
|
styling
|
2014-03-03 20:47:44 +01:00 |
|
Richard
|
90ae3e7a80
|
Fixed dead links to icons.
|
2014-03-03 18:05:40 +01:00 |
|
Richard
|
bd39733b59
|
Improved the final seminar pages.
|
2014-03-03 17:36:00 +01:00 |
|
Emil Siverhall
|
e04afced48
|
filtering
|
2014-03-03 16:57:08 +01:00 |
|
|
|
b8987024d9
|
Cleaning
|
2014-03-03 16:28:23 +01:00 |
|
|
|
d7cbcfdf70
|
Fixed broken test.
|
2014-03-03 16:27:26 +01:00 |
|
|
|
4bf99559ff
|
Fixed broken test.
|
2014-03-03 16:19:26 +01:00 |
|
Emil Siverhall
|
7e0c12c3b5
|
display previous periods targets as well.
|
2014-03-03 15:43:57 +01:00 |
|
Golrokh Moattar
|
4c0dcad69e
|
fixed NullPointerException when there is no Reviewer for FinalSeminar
|
2014-03-03 15:36:54 +01:00 |
|
Emil Siverhall
|
c4eb7f745f
|
new edit targets page with first columns initiated
|
2014-03-03 15:14:15 +01:00 |
|
Golrokh Moattar
|
d02801f4f6
|
Delete icon removed from AutoComplete field
|
2014-03-03 15:03:15 +01:00 |
|
|
|
abaeabc061
|
Changed from CMC to individual with add/remove methods.
|
2014-03-03 12:19:27 +01:00 |
|
|
|
bc185fa283
|
Fixed application periods creation thing.
|
2014-03-03 12:02:40 +01:00 |
|
Emil Siverhall
|
531720f1ff
|
style changes
|
2014-03-03 11:23:27 +01:00 |
|
Emil Siverhall
|
4284d473fa
|
feedback panel changes to admin match pages
|
2014-03-03 11:21:49 +01:00 |
|
Emil Siverhall
|
084c3cc281
|
basic styling to page
|
2014-03-03 10:45:01 +01:00 |
|
Emil Siverhall
|
8f815bea98
|
date validator only allowed to work with <Date> formComponents
|
2014-03-03 10:24:53 +01:00 |
|
Emil Siverhall
|
4fe333711a
|
page mount and header change
|
2014-03-03 10:04:25 +01:00 |
|
Emil Siverhall
|
a15142e358
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/match/panel/MatchPeriodEditPanel.java
view/src/test/java/se/su/dsv/scipro/SciProTest.java
|
2014-03-03 08:47:45 +01:00 |
|
Emil Siverhall
|
3db1993b2b
|
formatting
|
2014-03-03 08:45:21 +01:00 |
|
Emil Siverhall
|
0a18c2cda9
|
deleted old match period edit panel and moved doesPeriodOverlap to application period service
|
2014-03-03 08:37:11 +01:00 |
|
Emil Siverhall
|
64dcc086ea
|
overlapping application period not allowed
|
2014-03-03 08:28:49 +01:00 |
|
Emil Siverhall
|
e219c0002d
|
feedback and redirect on submit
|
2014-03-02 15:42:08 +01:00 |
|
Emil Siverhall
|
907c1ed22d
|
new page for creating/editing application periods
|
2014-03-02 15:35:45 +01:00 |
|
|
|
d5db5f580a
|
StudyPlan uses a Comparator for the set instead of AnnualReview implementing Comparable. With the internal set ordered the sort method is not needed.
|
2014-03-02 00:48:38 +01:00 |
|
|
|
15861cf0ba
|
Consolidated three different idea data tables to use the new GenericDataPanel2 and a FilteredDataProvider.
|
2014-03-01 14:51:13 +01:00 |
|
|
|
90680a2b2b
|
Ensure the data table is added to a table tag.
|
2014-03-01 11:33:46 +01:00 |
|
|
|
3c3e3a9033
|
Renamed countAll to count
|
2014-03-01 09:22:40 +01:00 |
|
|
|
d916727653
|
Created a generic filtered data provider.
|
2014-03-01 08:54:03 +01:00 |
|
|
|
2e87b53fe6
|
Diamond operator.
|
2014-03-01 08:03:07 +01:00 |
|
|
|
a649666063
|
Removed commented out code.
|
2014-03-01 07:58:54 +01:00 |
|
