fred-fri
7d6002d5a8
improved opposition and participation gui
2014-10-15 14:46:58 +09:00
fred-fri
5247359421
stupid dates
2014-10-15 13:36:15 +09:00
fred-fri
55ff5ce76e
dunno why injections doesnt work
2014-10-15 13:17:30 +09:00
fred-fri
7d43b92534
removed unused declarations
2014-10-15 10:25:20 +09:00
8638f20a70
Clean up forum create and reply panels 3
2014-10-14 17:14:15 +02:00
4a88d51e7c
More bootstrap linting.
2014-10-14 15:20:34 +02:00
6e1552e2cf
More bootstrap linting.
2014-10-14 14:55:41 +02:00
2be8ec30b0
More bootstrap linting.
2014-10-14 14:53:44 +02:00
e5acc0ceae
More bootstrap linting.
2014-10-14 14:45:14 +02:00
0dde8e6815
Bootstrap linting.
2014-10-14 14:33:08 +02:00
4128e5195e
Merge remote-tracking branch 'origin/develop' into develop
2014-10-14 14:21:04 +02:00
dabecd107c
Fixed spacing of ActivityPlanPanel buttons when they wrap.
2014-10-14 14:20:51 +02:00
fred-fri
4966c869ab
these should be there
2014-10-14 15:31:51 +09:00
fred-fri
feb96fd706
moving methods
2014-10-14 12:52:23 +09:00
fred-fri
cb9c12232a
moving methods
2014-10-14 12:11:09 +09:00
fred-fri
1784b0b934
stranger danger
2014-10-14 10:26:48 +09:00
fred-fri
a7edccdcb3
Merge branch 'movez' into develop
2014-10-14 10:19:21 +09:00
5e021725cd
Removed more stupid code.
2014-10-13 14:58:41 +02:00
aaa2e1ba81
Removed close buttons on the dialogs used to move the grading report between the different states (-> reviewing, -> finalized).
2014-10-13 14:21:46 +02:00
d81fdd9ff8
Fixed visibility of individual criteria, points and grade for the reviewer grading report.
2014-10-13 14:17:56 +02:00
fred-fri
83e0ccc75b
what the flip is a checklistquestionanswer
2014-10-13 14:00:27 +09:00
fred-fri
54be4509ab
moving methods
2014-10-13 12:44:56 +09:00
golrokh
712509d073
html
2014-10-10 15:25:51 +02:00
golrokh
16bc4a7eae
html
2014-10-10 14:55:38 +02:00
f26da56185
Added confirmation dialog when deleting the final seminar.
2014-10-10 14:01:33 +02:00
a9fad69729
Merge remote-tracking branch 'origin/develop' into develop
2014-10-10 13:55:23 +02:00
a52ee16d7b
"Improvements"
2014-10-10 13:55:19 +02:00
golrokh
ba8dc52e17
Merge remote-tracking branch 'origin/develop' into develop
2014-10-10 13:50:35 +02:00
golrokh
18086cbf1c
Completed test even for coSupervisor for ForumMailPage
2014-10-10 13:50:29 +02:00
aa887b21ed
Merge remote-tracking branch 'origin/develop' into develop
2014-10-10 13:38:53 +02:00
4c6b0819dc
Refactored the filter HTML of the PeerRequestListPanel to match the PeerReviewListPanel.
2014-10-10 13:38:25 +02:00
675efba9fe
Re-arranged some filters. "Show only my projects" is now always available.
2014-10-10 13:34:35 +02:00
213cb29981
Re-arranged some filters. "Show only my projects" is now always available.
2014-10-10 13:32:05 +02:00
02f785209a
Fixed some HTML
2014-10-10 13:10:13 +02:00
golrokh
9a40ba06fe
Finished tests for ForumMail
2014-10-10 10:59:32 +02:00
golrokh
f0d355785c
fixed tests
2014-10-10 10:01:27 +02:00
golrokh
01e92b9884
fixed tests
2014-10-10 09:43:36 +02:00
af9292957e
Bye bye.
2014-10-10 08:56:13 +02:00
3412032949
Turned the Admin / Statistics / Peers page into proper tabs.
2014-10-10 08:55:12 +02:00
45e1013e6a
Turned the Supervisor / All Projects / Peers page into proper tabs.
2014-10-10 08:53:38 +02:00
ed3b0eb0b9
Removed confusing text from the finalizing grading report dialog.
2014-10-10 08:22:02 +02:00
a63d4f28d4
Fixed apostrophe
2014-10-10 08:12:19 +02:00
golrokh
102fbccdb8
fixed texts for ForumMailPage
2014-10-09 15:57:12 +02:00
77a29b211c
Seriously WTF Wicket, why go to the page before the panel that the component is in?
2014-10-09 11:41:13 +02:00
cde61f160f
A reviewer trying to submit a report that does not meet the requirement for initial assessment will now show an error.
2014-10-09 11:18:28 +02:00
d3ad10cdc8
A supervisor trying to submit a report that does not meet the requirement for initial assessment will now show an error.
2014-10-09 11:14:57 +02:00
0f0c83c7fd
Fixed sticky scroll on supervisor grading page.
2014-10-09 09:47:33 +02:00
a1de25cb73
Added calculation information to the reviewers grading report.
2014-10-09 09:30:38 +02:00
a737500b0e
Fixed text on compare button for the reviewer.
2014-10-09 09:20:31 +02:00
225d129116
Added notifications for when the initial grading assessment is complete.
2014-10-08 15:44:23 +02:00
17558cc9cf
Merge remote-tracking branch 'origin/develop' into develop
2014-10-08 12:37:04 +02:00
40f0db9f55
Removed annotation that does not work either. ProjectModule is such a stupid concept.
2014-10-08 12:36:58 +02:00
4573315264
Removed old submit button.
2014-10-08 12:35:35 +02:00
c68ba371dd
Reviewer can now move through the initial->reviewing->finalized steps.
2014-10-08 12:32:19 +02:00
fred-fri
ce09e711da
working on attachments
2014-10-08 17:52:39 +09:00
0929b099d0
Added supervisor reports to the reviewer grading page. They are only visible if both have done an initial assessment.
2014-10-08 10:41:04 +02:00
golrokh
0c47043b4c
fixed texts
2014-10-08 10:37:47 +02:00
golrokh
48d348fa1e
Merge remote-tracking branch 'origin/develop' into develop
2014-10-08 10:23:23 +02:00
golrokh
96cce53580
fixed properties
2014-10-08 10:23:16 +02:00
fred-fri
31422b5d21
no crash on sort
2014-10-08 16:02:36 +09:00
golrokh
3b55482a33
Merge remote-tracking branch 'origin/develop' into develop
2014-10-08 08:58:37 +02:00
golrokh
9fbf491d2d
Deleted DSV from Application's Title
2014-10-08 08:58:30 +02:00
fred-fri
eba5ed2906
no null dates
2014-10-08 15:48:08 +09:00
1d226d7765
Merge remote-tracking branch 'origin/develop' into develop
2014-10-07 16:48:04 +02:00
d64120ecd1
Fixed test.
2014-10-07 16:43:49 +02:00
8a3ef958f7
Downloading the grading report is now always possible for the reviewer, the info text has been updated to warn them about possible changes coming for the supervisor.
2014-10-07 16:42:46 +02:00
c12a0f4b27
Moved final thesis file from the panel to the page.
2014-10-07 16:32:54 +02:00
golrokh
955005d0d8
Added ForumLink in ForumMail
2014-10-07 16:15:23 +02:00
5249f6d265
Added project header to the reviewer grading page so they know what they are assessing.
2014-10-07 16:12:38 +02:00
a96d163693
Added the reviewer interaction thread to the reviewer final grading page.
2014-10-07 16:06:35 +02:00
89ba7ca5f0
Basic HTML structural layout of the new reviewer grading page.
2014-10-07 14:44:18 +02:00
d3f6261a9f
Merge remote-tracking branch 'origin/develop' into develop
2014-10-07 13:30:02 +02:00
714f0f1913
Made it so the "next" step button gets refreshed properly.
2014-10-07 13:29:43 +02:00
2bdfd20161
Fixed some styling and text on the supervisor grading page.
2014-10-07 13:24:40 +02:00
9a1f503d42
Moved the "copy" button into the button group at the bottom of the page.
2014-10-07 13:21:27 +02:00
5a00feb177
Made bottom buttons into a dropdown button group.
2014-10-07 11:34:09 +02:00
79e8c4aa55
Bootstrapped the HTML.
2014-10-07 11:17:36 +02:00
a4b6a3d8d7
Moved Download template report to within the tab.
2014-10-07 11:15:14 +02:00
0549abc4a1
Models please... We want dynamic content not static.
2014-10-07 11:07:33 +02:00
693c1d27e2
This is Lomboks primary purpose, not getters and setters.
2014-10-07 10:49:14 +02:00
fred-fri
b716cb9790
green button
2014-10-07 17:10:37 +09:00
8d6b386431
Improved feedback.
2014-10-07 10:05:44 +02:00
1841fa0fc9
Changed all forum submit buttons to green, fix test 2
2014-10-06 16:36:56 +02:00
ed386854a0
Merge remote-tracking branch 'origin/develop' into develop
2014-10-06 15:02:30 +02:00
18d3b85fde
Changed all forum submit buttons to green, fix test
2014-10-06 15:02:09 +02:00
fred-fri
289ecbbce2
Merge remote-tracking branch 'origin/develop' into develop
2014-10-06 18:00:51 +09:00
fred-fri
c0a7383f38
notification page "improvements"... not sure the result is any prettier though
2014-10-06 18:00:32 +09:00
bc5c8d8d98
Refactored component hierarchy so it is now a list with separate forms for each report rather than a single form for all reports.
2014-10-06 10:57:19 +02:00
d873e7adfe
Merge remote-tracking branch 'origin/develop' into develop
2014-10-06 10:22:28 +02:00
5faf22b4a8
Changed all forum submit buttons to green
2014-10-06 10:21:57 +02:00
fred-fri
b07aa880f1
added edit icon to project header panel
2014-10-06 16:13:20 +09:00
fred-fri
a933b8e71e
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-10-06 16:00:38 +09:00
fred-fri
c79b7479b4
refactoring
2014-10-06 15:54:45 +09:00
182259efee
Removed unnecessary code.
2014-10-06 08:38:28 +02:00
fred-fri
72ea49a39a
clearer checkboxes
2014-10-06 14:33:22 +09:00
fred-fri
11b96a5cc5
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-10-06 12:26:15 +09:00
fred-fri
69d96f7ac3
major refactor and cleanup for finalseminareventhandling
2014-10-06 12:25:02 +09:00
9af1146de8
Added finalize grading report step with dialog explaining what happens.
2014-10-03 11:21:27 +02:00
149a782c64
Added dialog explaining what happens when clicking "Compare with reviewer".
2014-10-03 10:59:23 +02:00
9ad3a541fc
Simplified some component creation.
2014-10-03 10:43:08 +02:00
714af88166
Updated rules for when the reviewers report is shown.
2014-10-03 10:34:56 +02:00
ecd0a4b4d2
Fixed test.
2014-10-03 10:27:02 +02:00
f116d2d0ab
Added button to signal that the initial assessment is done.
2014-10-02 17:05:43 +02:00
61729e3ba4
Added state to grading reports (initial, reviewing and finalized).
...
The reviewer report is now only visible for the supervisor if the reviewer has done his initial review.
2014-10-02 16:33:44 +02:00
45dc118784
Added some spacing between introduction and the report forms.
2014-10-02 11:26:30 +02:00
7fa5a863c2
Put the scrolling save button within each tab.
...
Clicking on tabs no longer saves the report.
2014-10-02 11:19:51 +02:00
1d7af615a1
Moved introduction and final thesis file to the supervisor grading page to improve alignment between supervisor and reviewer report.
2014-10-02 10:47:52 +02:00
69e9e03243
Moved the scrolling save button inside the form.
2014-10-02 10:33:52 +02:00
f667bdf21f
Fixed test.
2014-10-02 10:01:19 +02:00
268c472842
Merge remote-tracking branch 'origin/develop' into develop
2014-10-02 09:29:33 +02:00
fred-fri
baf54d33eb
naming conventions
2014-10-02 12:28:26 +09:00
fred-fri
acbb4e94cf
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-10-02 10:12:35 +09:00
bc23906ec6
Added discussion with reviewer to the grading tab.
2014-10-01 16:38:55 +02:00
fd8cf5b246
Minor HTML improvements.
2014-10-01 16:27:27 +02:00
7951246cba
Shows reviewers report on the supervisor grading page.
2014-10-01 16:10:41 +02:00
7995d00a3b
Head supervisor is now mandatory on projects.
2014-10-01 16:02:31 +02:00
334b339306
Merge remote-tracking branch 'origin/develop' into develop
2014-10-01 09:07:57 +02:00
fred-fri
ddae29a3c0
plural and clearer text instead of show all
2014-10-01 13:32:23 +09:00
fred-fri
4b7800fc8b
plural
2014-10-01 13:31:07 +09:00
fred-fri
c10ecb21cc
sonar
2014-10-01 12:00:19 +09:00
fred-fri
273f25164b
sonar
2014-10-01 11:27:53 +09:00
fred-fri
0eda2be8a0
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-10-01 09:28:26 +09:00
fred-fri
69f37ffa17
sonar
2014-10-01 09:27:42 +09:00
84020a3965
Refactored and broke out auto-saving functionality of the criteria panel to its own class.
2014-09-30 17:08:25 +02:00
2aeef96184
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-09-30 16:58:01 +02:00
13c9c8ed12
Deleted Check List tab
2014-09-30 16:57:35 +02:00
7b536a9460
Removed old unused Shibboleth page.
2014-09-30 15:19:29 +02:00
fbd6f7c384
Removed ugly : from the local log in.
2014-09-30 14:50:07 +02:00
e8fa9ca5ce
Removed automatic addition of * after each required label.
2014-09-30 14:45:32 +02:00
ae33a0b884
Merge remote-tracking branch 'origin/develop' into develop
2014-09-30 14:41:29 +02:00
77fa249705
Added notification when reviewer submits their grading report.
2014-09-30 14:41:20 +02:00
golrokh
9e00e9a29e
Filtering in All Student ideas same as All supervisor ideas
2014-09-30 14:39:44 +02:00
torgny
be17e81625
Flyttat upp Groups-panelen även på Author-sidan, plus bytt namn på panelen till "Group forums"
2014-09-30 13:53:48 +02:00
fred-fri
6ccb15a5be
making two different versions
2014-09-30 16:21:27 +09:00
fred-fri
b0e05fdfc0
sonar
2014-09-30 15:47:02 +09:00
fred-fri
cc814c6b63
sonar
2014-09-30 15:14:07 +09:00
fred-fri
f8dfff8ceb
sonar
2014-09-30 14:09:11 +09:00
fred-fri
43d9f6b751
sonar
2014-09-30 12:25:10 +09:00
fred-fri
f536f81dd7
refactoring and removing models
2014-09-30 12:21:09 +09:00
fred-fri
6fded8fece
sonar
2014-09-30 11:30:19 +09:00
fred-fri
ffe84f9d7b
sonar
2014-09-30 11:29:02 +09:00
fred-fri
f5046a66eb
sonar
2014-09-30 11:26:21 +09:00
fred-fri
33474fab88
sonar
2014-09-30 10:45:36 +09:00
fred-fri
4867a492f8
sonar
2014-09-30 10:45:19 +09:00
fred-fri
60e2bc59bf
sonar
2014-09-30 10:44:48 +09:00
fred-fri
8ba5b9b621
sonar
2014-09-30 10:44:24 +09:00
fred-fri
fd41518b39
sonar
2014-09-30 10:42:55 +09:00
fred-fri
27ddc51b48
sonar
2014-09-30 10:41:55 +09:00
fred-fri
90d88f569b
sonar
2014-09-30 10:41:33 +09:00
fred-fri
1dccd55016
sonar
2014-09-30 10:41:01 +09:00
fred-fri
28daad3fb9
sonar
2014-09-30 10:35:17 +09:00
fred-fri
676a40fa84
sonar
2014-09-30 10:33:55 +09:00
fred-fri
b6aa80912f
sonar
2014-09-30 10:33:20 +09:00
fred-fri
d6bbed7036
sonar
2014-09-30 10:32:27 +09:00
fred-fri
21de6f680a
sonar
2014-09-30 10:31:55 +09:00
fred-fri
e280e95593
sonar
2014-09-30 10:31:23 +09:00
fred-fri
fe27060302
sonar
2014-09-30 10:30:53 +09:00
fred-fri
42baa2b5df
sonar
2014-09-30 10:28:19 +09:00
fred-fri
2d2a06cb79
sonar
2014-09-30 10:27:39 +09:00
fred-fri
6724d6d299
switching from ajax to normal, see if that makes multipart form bug go away
2014-09-30 10:17:56 +09:00
golrokh
95ff09e4de
fixed layout
2014-09-29 13:57:54 +02:00
golrokh
572c1c1271
fixed the problem with datetimepicker stylesheet
2014-09-29 11:11:26 +02:00
torgny
6ded3e10c7
Removed "Upcoming activities" from overview page for the supervisor.
2014-09-29 11:08:22 +02:00
432f7c1e0c
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/grading/FillOutGradingReportPanel.html
2014-09-29 00:02:42 +02:00
70ddb29a43
Fix3 Improved the Grading tab
2014-09-28 23:58:04 +02:00
7a2ef7d00a
Fixed test
2014-09-26 20:00:03 +02:00
19a46fb3c4
Merge remote-tracking branch 'origin/develop' into develop
2014-09-26 17:39:02 +02:00
ab049679ff
Changed to pretty date and time field when editing a single activity.
2014-09-26 17:38:57 +02:00
9e8d831c04
Changed to pretty date and time field.
2014-09-26 17:28:41 +02:00
816be8140a
Fixed bootstrap validation CSS when using proper wicket labels (<label wicket:for="...">)
...
Made the * automatic on proper wicket labels when the form component is required.
2014-09-26 16:52:58 +02:00
b30ae9e513
Created a better date- and time-field (BootstrapDateTimeField).
2014-09-26 16:47:53 +02:00
golrokh
f2491d5fab
Improving Interact with reviewer page
2014-09-26 14:54:15 +02:00
torgny
2e28b39d5e
Made the Groups panel first on the right hand side of the Qverwiev page.
2014-09-26 12:53:38 +02:00
torgny
abd2a13e2f
Merge remote-tracking branch 'origin/develop' into develop
2014-09-26 11:21:47 +02:00
torgny
e7e004fa0e
Tagit bort hakparenteserna runt författarnamnen.
2014-09-26 11:21:40 +02:00
golrokh
17e72580b2
Merge remote-tracking branch 'origin/develop' into develop
2014-09-26 10:56:01 +02:00
golrokh
b5ca9451ac
Improving Reviewer page
2014-09-26 10:55:56 +02:00
8cc6c62cc3
Added feedback when deleting an activity.
2014-09-26 10:55:29 +02:00
ec5b3cacae
Added confirmation when deleting an activity.
2014-09-26 10:50:13 +02:00
dba6f10371
Fixed parameter name.
2014-09-26 10:44:46 +02:00
0850ff8ca1
Activity plan now defaults to 100 rows instead of 20.
2014-09-26 10:40:43 +02:00
63df8425ba
Removed "show activities between" filter in activity plan.
2014-09-26 10:36:07 +02:00
torgny
02b27594d4
Jag glömde Skapat-kolumnen...
2014-09-25 14:41:48 +02:00
golrokh
1d8224d747
change style of buttons so that they become more readable
2014-09-25 14:05:23 +02:00
golrokh
cfa6469a5c
Merge remote-tracking branch 'origin/develop' into develop
2014-09-25 13:56:35 +02:00
golrokh
5f9bb0971f
change style of buttons so that they become more readable
2014-09-25 13:56:21 +02:00
50758a3734
Added * to the required input fields and re-ordered so the required fields are at the top instead of split top and bottom.
2014-09-25 13:49:03 +02:00
golrokh
3215f70a99
Merge remote-tracking branch 'origin/develop' into develop
2014-09-25 13:28:15 +02:00
golrokh
3b7dcc5876
change style of buttons so that they become more readable
2014-09-25 13:27:55 +02:00
fred-fri
dbcb1a6197
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-09-25 18:40:25 +09:00
fred-fri
5b637ba131
EVEN MORE SENSE
2014-09-25 18:39:45 +09:00
fred-fri
44f6423c3e
and even more
2014-09-25 18:24:17 +09:00
fred-fri
1653bc52c7
sense- this makes more
2014-09-25 18:17:26 +09:00
torgny
dc8d337135
Merge remote-tracking branch 'origin/develop' into develop
2014-09-25 10:47:22 +02:00
torgny
ea87160136
Glömde läsa kortet, nu är användarna sorterade med senast först...
2014-09-25 10:47:15 +02:00
fred-fri
0d281cd5d7
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-09-25 17:46:47 +09:00
fred-fri
7c7d1c3d7c
PUT DE KOKKI BAKK!
2014-09-25 17:46:00 +09:00
torgny
023f2bd61c
Merge remote-tracking branch 'origin/develop' into develop
2014-09-25 10:37:37 +02:00
torgny
baaecad099
Made local users sortable.
2014-09-25 10:37:28 +02:00
c73d2566ac
It is now possible to specify an "anchor" named page parameter when redirecting and that will be set as the anchor on the page when it is loaded.
2014-09-25 10:28:26 +02:00
1a7e60f32a
Bunch of PO review fixes.
2014-09-25 10:28:26 +02:00
fred-fri
5aef729f00
test and page fixes
2014-09-25 16:58:23 +09:00
fred-fri
069010b1eb
fixed a test
2014-09-25 16:19:03 +09:00
fred-fri
93b9d92aee
refactoring this mess
2014-09-25 16:18:52 +09:00
fred-fri
4ffc42bb92
defaults in switches
2014-09-25 14:31:46 +09:00
fred-fri
244232a110
test fix
2014-09-25 13:35:12 +09:00
fred-fri
5a43f96e1e
default
2014-09-25 13:17:40 +09:00
fred-fri
ffd4724269
test fixes
2014-09-25 12:51:07 +09:00
fred-fri
f55ea44e3f
removing unused stuff
2014-09-25 12:09:09 +09:00
fred-fri
7c07227dfe
model fix
2014-09-25 12:04:11 +09:00
fred-fri
a374f59422
switch to stringubilder
2014-09-25 11:54:22 +09:00
fred-fri
385e0c7360
switch to stringubilder
2014-09-25 11:45:41 +09:00
fred-fri
efca04117e
sonar
2014-09-25 11:38:33 +09:00
fred-fri
6f87a6bdc5
sonar
2014-09-25 11:35:43 +09:00
fred-fri
0fa8184770
sonar
2014-09-25 11:05:12 +09:00
fred-fri
30c752639e
sonar
2014-09-25 10:59:48 +09:00
fred-fri
3526d4fb5e
sonar
2014-09-25 10:53:54 +09:00
fred-fri
1af13569ed
sonar
2014-09-25 10:29:22 +09:00
fred-fri
e2c995e540
sonar
2014-09-25 10:28:39 +09:00
3ee5e91a4a
Email is now set correctly when registering the first user.
2014-09-24 15:12:40 +02:00
golrokh
e903eaf1a9
set DEV profile to be active by default to prevent jira errors
2014-09-24 15:09:11 +02:00
da68ae430e
Fixed test by adding missing mock implementation.
2014-09-24 14:44:22 +02:00
1f33955cf0
Fixed some i18n.
2014-09-24 14:39:58 +02:00
212387891a
Saves the reason when supervisor creates final seminar without approval.
2014-09-24 14:30:09 +02:00
68e1a4c963
Merge remote-tracking branch 'origin/develop' into final_seminar_creation
2014-09-24 13:53:36 +02:00
55c511b68f
Implemented case when the reviewer has not reached a decision yet.
2014-09-24 13:46:34 +02:00
95484abc74
Implemented case when the reviewer denied the request.
2014-09-24 13:11:57 +02:00
591153b3e7
Minor refactoring.
2014-09-24 09:19:20 +02:00
7795dce142
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-09-23 16:39:21 +02:00
63a8c278b6
Fix2 Improved the Grading tab
2014-09-23 16:36:50 +02:00
golrokh
6c708e5b79
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-09-23 15:12:06 +02:00
golrokh
f7451870c0
Added forum notification in admin/notification settigns/general settings
2014-09-23 15:11:56 +02:00
48c7f39cbd
Fix Improved the Grading tab
2014-09-23 14:51:51 +02:00
5b2b2540c5
Merge remote-tracking branch 'origin/develop' into develop
2014-09-23 13:54:44 +02:00
dedd75f90f
Improved the Grading tab
2014-09-23 13:54:09 +02:00
4b8b128f05
Bootstrapped-ified the forms for editing projects (admin and supervisor) as well as removed the hard-coded width of the AddUsersPanel, it is better to specify the width where the panel is used so it can fit in all situations.
2014-09-23 13:40:48 +02:00
7a4d0ff8d5
Bootstrapped-ified the final seminar form.
2014-09-23 13:13:10 +02:00
3e9e72faa6
Fixed some minor warnings.
2014-09-23 12:49:26 +02:00
golrokh
9ecb835096
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-09-23 12:42:32 +02:00
f437d5f5b3
Added screen-reader only label for the reason text area.
2014-09-23 12:28:57 +02:00
600cfea517
Added show/hide client side functionality for the reason text field.
2014-09-23 12:25:12 +02:00
fred-fri
a944b63548
cleanup
2014-09-23 19:07:05 +09:00
fred-fri
3ddefbd3b9
added confirmation
2014-09-23 19:06:28 +09:00
7224231e91
Hooked up logic for when there is a reviewer but no request.
2014-09-23 11:28:01 +02:00
golrokh
74e0ed1414
Merge branch 'forum-mail-notification' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-09-23 11:19:09 +02:00
fred-fri
1c13dff744
only display templates of same level as project
2014-09-23 18:04:07 +09:00
fred-fri
e11b4c5526
checklist fix
2014-09-23 17:31:28 +09:00
fred-fri
0de469674f
argh checklist
2014-09-23 14:32:00 +09:00
fred-fri
df1b318325
password stuff
2014-09-23 13:40:47 +09:00
fred-fri
4ece578bd8
password stuff
2014-09-23 13:40:01 +09:00
fred-fri
d35b684efe
cleanup
2014-09-23 13:10:22 +09:00
fred-fri
59dd74417d
fixes
2014-09-23 13:09:38 +09:00
fred-fri
ca4181bca4
supervisor stuff
2014-09-23 10:50:13 +09:00
fred-fri
b3cd62c54c
tests
2014-09-23 10:19:20 +09:00
fred-fri
08b6f4b5b4
refactoring into panel
2014-09-23 09:42:07 +09:00
9fc4441dc0
Simple method rename.
2014-09-22 16:54:32 +02:00
31284c82ee
Renamed FinalSeminarCreationApproval to FinalSeminarCreationReviewerApproval and added NoReviewer as a possible case.
2014-09-22 16:54:17 +02:00
b42fd86f71
Injected FinalSeminarCreationService into SeminarCRUDPanel and hooked up simple logic when trying to create the final seminar.
2014-09-22 16:50:51 +02:00
d43450494c
SeminarCRUDPanel converted to Scala.
2014-09-22 16:08:56 +02:00
golrokh
2f38211cc2
Work in progress
2014-09-22 15:08:44 +02:00
e23258a877
What is this test doing here? (Also it does not test anything since there is no functionality for disabling that specific date field.
2014-09-22 12:27:36 +02:00
fred-fri
1720d44f21
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-09-22 14:22:23 +09:00
fred-fri
100b9f16b1
cleanup
2014-09-22 14:19:46 +09:00
fred-fri
c2215cc792
blargh
2014-09-22 14:05:46 +09:00
fred-fri
fc4fe69c11
verify
2014-09-22 14:04:28 +09:00
fred-fri
32b1b6dcba
nasty users
2014-09-22 13:58:26 +09:00
fred-fri
9231e1590a
trigger
2014-09-22 13:33:14 +09:00
fred-fri
61c14f2f7c
adding stuff, making page work
2014-09-22 13:03:18 +09:00
2b79caab5f
Merge remote-tracking branch 'origin/develop' into develop
2014-09-19 16:12:31 +02:00
fred-fri
9ae5453b23
adding stuff
2014-09-19 17:42:42 +09:00
fred-fri
eae8d1563e
adding new page
2014-09-19 14:40:45 +09:00
fred-fri
5a0b522bdf
added filters
2014-09-19 13:18:39 +09:00
f7132bcb0e
Added tests for when the seminar exists and when the head supervisor is supposed to create it.
2014-09-18 15:49:40 +02:00
a87019cf31
Minor touches.
2014-09-18 15:44:07 +02:00
d7f22434cc
Refactored to prepare for approval before creation.
2014-09-18 14:29:42 +02:00
395c2750b0
Fixed display of "Students" column in opposition panel.
2014-09-18 13:27:43 +02:00
fred-fri
aef0951af5
password 20 char limit removed
2014-09-18 15:17:27 +09:00
fred-fri
c90cbe7405
password 20 char limit removed
2014-09-18 15:17:00 +09:00
fred-fri
3a90a58a4e
removed creator
2014-09-18 15:05:53 +09:00
fred-fri
74e751cbb0
info added
2014-09-18 15:03:18 +09:00
fred-fri
57d9d159f7
more specific info
2014-09-18 14:59:41 +09:00
fred-fri
644c3808fc
info added
2014-09-18 14:57:32 +09:00
fred-fri
d845911613
sonar
2014-09-18 14:50:18 +09:00
fred-fri
6011016b66
sonar
2014-09-18 13:54:20 +09:00
fred-fri
596ad6ab29
sonar
2014-09-18 12:03:39 +09:00
fred-fri
fb0b1c97a5
sonar
2014-09-18 12:00:52 +09:00
fred-fri
d6e414e3f5
test
2014-09-18 11:18:14 +09:00
fred-fri
c2f7e76adc
test
2014-09-18 10:55:40 +09:00
fred-fri
45258ad699
fixes
2014-09-18 10:39:41 +09:00
fred-fri
3392813163
fixes
2014-09-18 10:06:03 +09:00
fred-fri
a9d2394ea0
fixes
2014-09-18 09:34:59 +09:00
fred-fri
c1ab5b319b
top tab fixes when opening grading reports
2014-09-18 09:13:05 +09:00
6036a2bd22
[SCIPRO-20183] Fixed sorting/display of supervisor in Supervisor > All projects > Final theses
2014-09-16 15:47:14 +02:00
fred-fri
9ff56ddf04
adding interact with supervisor
2014-09-16 16:17:59 +09:00
fred-fri
92a5dcef7f
tab fixes
2014-09-16 12:22:57 +09:00
fred-fri
821958f829
new top reviewer and examiner tabs
2014-09-16 11:35:24 +09:00
fred-fri
f9b742b840
findbugs
2014-09-15 13:58:17 +09:00
fred-fri
f5427c5272
findbugs
2014-09-15 13:54:34 +09:00
fred-fri
b1a235bcb1
findbugs
2014-09-15 13:49:59 +09:00
fred-fri
81b19c0266
utf8
2014-09-15 13:46:32 +09:00
fred-fri
9b081e4ea5
code inspection issues
2014-09-12 16:09:48 +09:00
2ea1c276e8
Button layout is now always vertical instead of switching to horizontal on big screens.
2014-09-11 15:20:38 +02:00
a967be3370
Fixed spacing of log in buttons.
2014-09-11 15:20:38 +02:00
fred-fri
82b0366412
pretty url
2014-09-11 16:59:33 +09:00
fred-fri
5936f31f0b
fixed milestones set project status
2014-09-10 11:22:23 +09:00
fred-fri
e08ecc1552
cleanup
2014-09-10 09:21:19 +09:00
fred-fri
ffcb8f174c
cleanup
2014-09-10 09:20:56 +09:00
fred-fri
fd1d170761
Merge branch 'importusersback' into develop
2014-09-10 09:10:29 +09:00
fred-fri
bed881739b
some tests
2014-09-08 13:45:58 +09:00
fred-fri
86c6f14171
refactoring
2014-09-08 11:02:25 +09:00
fred-fri
3311567dd4
refactoring
2014-09-08 10:17:57 +09:00
fred-fri
f431c36489
refactoring
2014-09-08 09:33:37 +09:00
fred-fri
e12acbf43e
refactoring
2014-09-08 09:25:28 +09:00
cf0a15caff
Styled the identity selection buttons and removed faulty help text.
2014-09-05 10:51:01 +02:00
fred-fri
2d9f76fcd1
feedbcak
2014-09-05 16:50:18 +09:00
fred-fri
59d2b6d68b
css
2014-09-05 15:44:47 +09:00
fred-fri
94379993c8
sort fix
2014-09-05 15:36:18 +09:00
fred-fri
c11fbfb125
what have i done II
2014-09-05 14:55:40 +09:00
fred-fri
ec212f962c
what have i done
2014-09-05 12:52:21 +09:00
fred-fri
98d570c396
deleting unused local users now works. this is crude but imo better than lazy deleting (because adding lazy deleted checks everywhere simply isnt feasible)
2014-09-04 11:11:08 +09:00
fred-fri
a9beffb460
test fix
2014-09-03 12:50:27 +09:00
fred-fri
551e040962
final seminar created notification leads to projects final seminar page rather than project overview page
2014-09-03 09:53:34 +09:00
fred-fri
20e8ad63e9
bug fix
2014-09-03 09:34:27 +09:00
fred-fri
3a75d289ea
sorting
2014-09-03 09:05:10 +09:00
fred-fri
4c5113d0df
fixes
2014-09-03 08:21:28 +09:00
fred-fri
74e3ffaa84
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-09-03 07:07:12 +09:00
fred-fri
d1b9dee6dc
fix namespace
2014-09-03 07:06:27 +09:00
cc84521277
Send email to supervisors with targets > 0 in a period
2014-09-02 13:59:31 +02:00
fred-fri
59ed4f4d0a
remind match responsible to match
2014-09-02 16:16:26 +09:00
fred-fri
69e260edf8
refactor, tests fail
2014-09-02 10:43:31 +09:00
801aa8eb75
Fixed test.
2014-09-01 13:51:21 +02:00
7e2aced4e2
Merge remote-tracking branch 'origin/develop' into develop
2014-09-01 13:37:35 +02:00
e856e09363
Uploading a file to an activity in the activity plan creates a thread for discussion.
...
Subsequent uploads generates a reply in the same thread.
2014-09-01 13:34:10 +02:00
fred-fri
cffd6ef35b
doing the round in the service seems to be the only way to make this work smoothly...
2014-09-01 17:59:08 +09:00
8f54c6499c
Some restructuring.
2014-09-01 10:42:06 +02:00
fred-fri
e68741d29a
moar refactor
2014-09-01 17:30:14 +09:00
e4a04279c4
DIE NULL
2014-09-01 10:29:18 +02:00
fred-fri
bdaf17dcb6
more refactor
2014-09-01 17:18:43 +09:00
fred-fri
05f5cc1cd0
refactor dat bitch
2014-09-01 16:17:33 +09:00
fred-fri
9b91ba8f72
removed projects
2014-09-01 11:22:27 +09:00
fred-fri
b2854033ce
default stuff
2014-09-01 11:11:59 +09:00
fred-fri
1d03b2a7cc
default project types
2014-09-01 11:03:45 +09:00
fred-fri
a773270c96
naiz url
2014-09-01 10:48:49 +09:00
fred-fri
00693a6781
language fix
2014-09-01 10:46:14 +09:00
fred-fri
1b22b2ccd3
null program other now
2014-08-29 15:45:06 +09:00
fred-fri
e1bcc4cda6
remind supervisors to add more ideas
2014-08-29 15:00:37 +09:00
fred-fri
4a1444cccc
css
2014-08-29 11:02:02 +09:00
b72d306d71
entityID with capital D.
2014-08-28 15:51:50 +02:00
e0066cd546
Merge remote-tracking branch 'origin/develop' into develop
2014-08-28 09:34:34 +02:00
abcf36d034
Merged first meeting package into match.
2014-08-28 09:34:30 +02:00
fred-fri
0f94386ae7
cleanup
2014-08-28 11:53:11 +09:00
fred-fri
1edfc098b3
Merge branch 'develop2' into develop
2014-08-28 11:50:00 +09:00
fred-fri
75146bb821
added count of projects that didnt complete both milestones, cleanup
2014-08-28 11:49:03 +09:00
fred-fri
87118eecc5
added count, cleanup
2014-08-28 11:14:09 +09:00
fred-fri
ed0daaa9d2
extensive cleanup
2014-08-28 10:35:39 +09:00
55764204ac
Merged applicationperiod package into match.
2014-08-27 17:08:31 +02:00
c7da4ee31e
Unmet target statistics is now available under Admin / Statistics
2014-08-27 13:34:22 +02:00
fred-fri
4288ad934a
median works, time to clean up
2014-08-27 20:15:07 +09:00
fred-fri
853e1879b1
working on median page
2014-08-27 18:21:35 +09:00
fred-fri
dbb583d06e
Merge branch 'develop' into develop2
2014-08-27 18:06:12 +09:00
fred-fri
bb0e12e430
working on page
2014-08-27 11:43:05 +09:00
fred-fri
a426d930d1
working on page
2014-08-27 11:32:42 +09:00
fred-fri
e70265fd9a
working on page
2014-08-27 08:12:31 +09:00
cb9518b907
Merge remote-tracking branch 'origin/develop' into develop
2014-08-26 15:42:15 +02:00
c1c1badb2e
Removed notification when resetting password.
2014-08-26 15:42:05 +02:00
5f9f6fed2f
Made it easier to create new locale users
2014-08-26 15:29:56 +02:00
950668de02
Fixed test
2014-08-26 14:07:44 +02:00
81b9b03774
Choice of application period is now stored between page refreshes in admin idea panels.
2014-08-26 14:05:25 +02:00
6f5a21ed85
Replaced the big ugly tables with a simple list.
2014-08-26 13:50:19 +02:00
aed39efaf0
Minor refactoring
2014-08-26 11:13:57 +02:00
fred-fri
6027735f25
basic median milestone page
2014-08-26 13:58:44 +09:00
fred-fri
f07de0f207
send password hidden if not local user
2014-08-26 13:55:07 +09:00
fred-fri
3b3d6145a0
cant get querydsl queries to work no matter what, sticking with this in the meantime
2014-08-26 12:23:19 +09:00
fred-fri
e57d30d2ff
Merge remote-tracking branch 'origin/develop' into develop
2014-08-26 12:21:47 +09:00
21cbfc672a
Ops.
2014-08-25 16:09:02 +02:00
4e8bceb4e1
Model.of() is forbidden, stop using it. The only thing it is good at is generating LazyInitializationExceptions.
2014-08-25 14:55:06 +02:00
6e23791b2a
Merge remote-tracking branch 'origin/develop' into develop
2014-08-25 14:27:58 +02:00
a314e8a8a1
Fixed header on the public log in pages.
2014-08-25 14:27:46 +02:00
d3c6ef9e50
Fixed Wicket XML namespace declaration.
2014-08-25 14:25:53 +02:00
07ab0675a6
When logging in to SciPro you are first presented with an identity selection (if SSO is enabled).
2014-08-25 14:24:21 +02:00
torgny
bd9089ab96
Enklare skapande av nya projekt.
2014-08-25 13:30:32 +02:00
fred-fri
bc2e787809
improved queries
2014-08-25 13:24:17 +09:00
fred-fri
c0d8e31044
adding adminpeoplestatisticspage
2014-08-22 16:44:14 +09:00
fred-fri
0130966322
edited admin info
2014-08-22 11:05:57 +09:00
fred-fri
7c222cfddc
removed column
2014-08-21 15:34:14 +09:00
fred-fri
72e1abd8b6
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-08-21 13:16:24 +09:00
fred-fri
f91e97ae53
this is so beautiful
2014-08-21 13:15:43 +09:00
a09b6b84db
Fixed unchecked warning.
2014-08-20 17:06:39 +02:00
3fe4ad5d9f
Extended the duplicated code block :)
2014-08-20 16:03:51 +02:00
122f2c4eb6
Sonar
2014-08-20 15:50:42 +02:00
ae7472722b
Moved MailEvent, MailEventService(Impl) to the mail package.
2014-08-20 15:39:33 +02:00
3488a0fbfe
Added an alt attribute to the Gravatar <img>-tag containing the users full name.
2014-08-20 14:58:12 +02:00
574f086a4a
Made plugin toggling a nice and switch-like.
2014-08-20 14:56:36 +02:00
86e6e7d370
Basic plugin system.
2014-08-20 14:42:27 +02:00
af5f5c08e6
Fixed unchecked warning.
2014-08-20 13:56:56 +02:00
fred-fri
fb0ffbeaa1
added send to forum button
2014-08-20 16:37:59 +09:00
4fa266af2f
Fixed name sorting in the admin role management.
2014-08-20 08:48:12 +02:00
28d174dd77
Fixed name sorting in the admin role management.
2014-08-20 08:44:30 +02:00
fred-fri
a1590b8a9d
notes
2014-08-20 13:16:38 +09:00
6cafb216fb
Added ToString implementation to CurrentUserImpl
2014-08-19 16:48:26 +02:00
10a6b78eec
Fixed some faulty texts.
2014-08-19 16:46:54 +02:00
torgny
464578e38d
Författare kan inte spara Activity Plan template.
2014-08-19 13:37:45 +02:00
8e0e4ea042
Re-ordered the settings a bit.
2014-08-19 11:23:39 +02:00
897f23dad7
Separated reply e-mail and account name.
2014-08-19 11:21:17 +02:00
e43f2d20d6
Fixed label markup.
2014-08-19 11:15:06 +02:00
09a370fce1
Renamed some forum mail settings.
2014-08-19 11:13:56 +02:00
b8179745ab
Fixed warning.
2014-08-19 10:52:40 +02:00
fred-fri
7079762c2d
removed import
2014-08-19 15:39:35 +09:00
fred-fri
3614e6694f
admin can now cancel final seminars
2014-08-19 15:27:17 +09:00
fred-fri
85a939c7aa
final seminar now has activity in activity plan
2014-08-19 12:34:33 +09:00
82f2ee2fa5
Merge remote-tracking branch 'origin/develop' into develop
2014-08-18 17:26:34 +02:00
e2f2865284
Export av edit targets till excel
2014-08-18 17:25:54 +02:00
ec1c279751
I hate whoever invented null.
...
I hate JPA for enforcing default constructors.
I hate Java for not having Option.
2014-08-18 16:48:20 +02:00
f4f9e908ab
Tests now use a properly populated user with an e-mail address.
2014-08-18 16:10:48 +02:00
e2644f1be7
Tests now use a properly populated user with an e-mail address.
2014-08-18 16:09:30 +02:00
847f20b484
User link panel now uses gravatar images instead of default anonymous icon.
2014-08-18 15:55:57 +02:00
9ab5bdc1eb
Removed hard-coded normal font-weight for label and made the font-weight fix run after ajax completions in addition to page load.
2014-08-18 15:46:22 +02:00
f412558654
Fixed proper Bootstrap markup.
2014-08-18 15:45:18 +02:00
514c8708e6
Users can now choose to hide their Gravatar image.
2014-08-18 15:36:21 +02:00
491a3a916e
Moved the md5 utility function out of TurnItInComponent.
...
Added Gravatar images to user profiles.
2014-08-18 15:23:13 +02:00
8666f0594f
Rewrote the md5 function so you can actually understand what is going on.
...
There is a test verifying with 1000 random 4096 byte arrays that the results are still the same.
2014-08-18 14:53:23 +02:00
384f2356da
Merge remote-tracking branch 'origin/develop' into develop
2014-08-18 14:25:51 +02:00
e871b0b393
Public page that lists the next 20 upcoming final seminars.
2014-08-18 14:25:46 +02:00
0464d6f7e8
Merge remote-tracking branch 'origin/develop' into develop
2014-08-18 13:55:13 +02:00
c3a90bb264
GRU replaced with Match
2014-08-18 13:54:43 +02:00
ce153311a2
Merge remote-tracking branch 'origin/develop' into develop
2014-08-18 13:10:00 +02:00
2024bd5ac2
Removed ignored test.
2014-08-18 13:07:32 +02:00
12b0b3a141
Removed commented out code.
2014-08-18 13:01:58 +02:00
e98f92ed8a
Un-ajaxified the student idea submission page. It was not used for anything except complicating re-rendering of feedback panels.
2014-08-18 13:01:38 +02:00
5baeb2e71f
Ideas can now have multiple languages selected.
2014-08-18 11:35:56 +02:00
torgny
64a8743ecd
Ändrat ordningen mellan flikarna Reviewing och Examining.
2014-08-18 11:13:27 +02:00
97aa07b32d
Fixed unchecked warning.
2014-08-18 10:04:36 +02:00
ab75916dd6
Fix
2014-08-15 10:31:36 +02:00
55ed8300f3
Minor refactorings.
2014-08-15 10:26:02 +02:00
293b09cbc2
Make the test class name match the class under test.
2014-08-15 10:17:22 +02:00
d0c425165b
Removed stupid SSO redirect.
2014-08-15 10:16:55 +02:00
c983c26d92
Merge remote-tracking branch 'origin/develop' into develop
2014-08-14 16:45:24 +02:00
52140b8809
Changed FileUpload to work with InputStream using the loaner pattern rather than in-memory byte arrays.
...
Why does so much stuff depend on uploading files? It should really only be FileDescriptionService.
2014-08-14 13:24:44 +02:00
b689dd23db
Tiny refactor
2014-08-14 11:50:55 +02:00
196004d43e
Refactored some file uploads.
2014-08-14 11:42:57 +02:00
Golrokh Moattar
da838d66f9
Merge remote-tracking branch 'origin/develop' into develop
2014-08-13 16:18:53 +02:00
Golrokh Moattar
4120dc40f0
styling
2014-08-13 16:18:46 +02:00
0ac564076d
Fixed some Sonar problems.
2014-08-13 15:08:44 +02:00
665852cc74
Removed "some" unused code.
2014-08-13 11:12:01 +02:00
49d87b3f4c
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
view/src/test/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanelTest.java
2014-08-13 08:20:47 +02:00
fred-fri
9f69b5b67d
shortened some texts
2014-08-13 15:13:55 +09:00
fred-fri
ef0b24af56
individual milestone graphics added
2014-08-13 15:03:51 +09:00
fred-fri
5f4a1ba2e3
added new link to download report without input
2014-08-13 11:26:27 +09:00
fred-fri
d34f4a27bc
gradingreport pdf no longer says null at grade if grade is null, it says that grade will be calculated when all critera have been assessed
2014-08-13 10:03:17 +09:00
Golrokh Moattar
28edfb76b0
opposition and active participation parts separated in the supervisor project overview
2014-08-12 16:34:34 +02:00
Golrokh Moattar
6131126cdb
adding "s" to "review"
2014-08-12 15:03:02 +02:00
Golrokh Moattar
74cef17beb
Merge remote-tracking branch 'origin/develop' into develop
2014-08-12 14:55:02 +02:00
Golrokh Moattar
4aaec0df6d
"Opposition & active participation" removed from the supervisor tabs and moved to the project overview page
2014-08-12 14:54:45 +02:00
ca3da5826b
Fixed test
2014-08-12 09:41:18 +02:00
43ac32e263
"Matched, has project" is now not selected by default on the supervisor ideas page.
2014-08-12 09:38:43 +02:00
90e6e85b16
Removed the old "Published" column, it is now included in the new selection column.
2014-08-12 09:32:54 +02:00
22a11437b0
Removed redundant local variable.
2014-08-12 09:31:52 +02:00
8bd97b7b97
Fixed some non-detachable models.
2014-08-12 09:31:36 +02:00
def64c9802
Made title column exportable.
2014-08-12 09:25:48 +02:00
95f750081b
Show every ideas selection state in the supervisors list of ideas.
2014-08-12 09:21:47 +02:00
fred-fri
80c3d0e5e9
removed all traces of final version (changed to final thesis, which it should be)
2014-08-12 14:07:50 +09:00
fred-fri
e5f7c15870
grading report can now be downloaded even though nothing has been filled in
2014-08-12 10:32:58 +09:00
fred-fri
fbc81445b0
supervisor now always has access to grading
2014-08-12 09:36:09 +09:00
Golrokh Moattar
9125f6f8d3
Grading template changed so that we have project type in the pdf file as well
2014-08-11 16:23:45 +02:00
8356e44405
Removed "Matched, has project" as default filter selection from supervisor my ideas page.
2014-08-11 16:20:00 +02:00
eae65c23d0
Removed unnecessary service method.
2014-08-11 15:46:11 +02:00
7c37377d36
Merge remote-tracking branch 'origin/develop' into develop
2014-08-11 15:24:04 +02:00
Golrokh Moattar
6a48d6d82f
Reset removed from login page, Forgot password moved down
2014-08-11 15:10:58 +02:00
69c95f3bb4
More cleaning.
2014-08-11 14:56:05 +02:00
a9d947e14a
Changed so its called Final theses not Final versions
2014-08-11 13:48:11 +02:00
2ba6689dab
Made the final thesis list sortable.
2014-08-11 13:47:52 +02:00
197d3f5f27
Added help text to the group panel.
2014-08-11 13:40:39 +02:00
e46cdf707d
Added date filtering to the unfinished seminar page.
2014-08-11 13:32:07 +02:00
7ee225352c
Changed text.
2014-08-11 12:35:39 +02:00
a8809267d8
Added feedback when requesting password reset.
2014-08-11 12:32:04 +02:00
fred-fri
ca004ae7e3
removed unused method
2014-08-11 16:40:29 +09:00
fred-fri
ea4886bba8
removed unused method
2014-08-11 14:19:54 +09:00
fred-fri
1502097308
sonar
2014-08-11 13:49:43 +09:00
fred-fri
e644bcfcfa
doesnt appear as if these old icons are being used, removing
2014-08-11 13:39:18 +09:00
fred-fri
90ea694fcd
removed some old markup file with no corresponding java file
2014-08-11 13:03:22 +09:00
fred-fri
701691f3dc
wish we could get rid of imageobject classs, removed one usage
2014-08-11 12:59:23 +09:00
fred-fri
857d826d41
sonar
2014-08-11 12:53:15 +09:00
fred-fri
e01ee1d7bf
sonar
2014-08-11 12:51:59 +09:00
fred-fri
1afe15ee40
sonar
2014-08-11 12:51:47 +09:00
fred-fri
529543c67b
sonar
2014-08-11 12:50:15 +09:00
716a851d07
Installed the ForumMailModule in the web application.
2014-08-06 15:51:39 +02:00
d0bf95ab3b
Moved some remaining entities to the proper package.
2014-08-06 14:30:13 +02:00
fae50cc0d5
Extracted forum mail related stuff to its own package.
2014-08-05 16:43:45 +02:00
fred-fri
ee8555dd41
fenced feedback stuff
2014-08-01 15:53:03 +09:00
fred-fri
5545a4bf3d
removed getsession
2014-08-01 09:29:45 +09:00
fred-fri
22efb07eb5
removed getsession
2014-08-01 09:25:04 +09:00
fred-fri
db709668d5
removed getsession
2014-08-01 09:23:02 +09:00
fred-fri
8f8c8a1108
removed getsession
2014-08-01 09:21:23 +09:00
fred-fri
9b3d7b5d8a
removed getsession
2014-08-01 09:18:24 +09:00
Emil Siverhall
f4086dfa09
changed header under forum settings
2014-07-31 21:40:17 +02:00
Emil Siverhall
0a550feab5
mounting admin forum settings
2014-07-31 14:54:17 +02:00
Emil Siverhall
16ee33c830
changed to use a password text field to not show password in the user interface
2014-07-31 14:12:23 +02:00
f5fb7c0944
Revert "Changed DataView in threaded forum to a simple ListView since we don't use the pagination and removed some more forum service interface methods."
...
This reverts commit 9d6723d39a
2014-07-31 11:36:01 +02:00
fred-fri
fe927eab33
removed getsession
2014-07-31 16:30:38 +09:00
fred-fri
fa88dbb0a8
removed getsession
2014-07-31 16:10:21 +09:00
fred-fri
8c63b2f2ce
removed getsession
2014-07-31 14:26:12 +09:00
fred-fri
8ec9430054
removed getsession
2014-07-31 14:05:14 +09:00
fred-fri
b3697e3bd7
removed getsession
2014-07-31 14:02:12 +09:00
fred-fri
f70ddd3ddd
removed getsession
2014-07-31 13:28:26 +09:00
fred-fri
107956c8b9
removed getsession
2014-07-31 12:12:52 +09:00
fred-fri
2653d17a97
removed getsession
2014-07-31 10:15:50 +09:00
fred-fri
9e3f4c49ca
removed getsession
2014-07-31 10:07:33 +09:00
af622fd75c
Removed more methods on the forum interfaces.
2014-07-30 16:33:09 +02:00
9d6723d39a
Changed DataView in threaded forum to a simple ListView since we don't use the pagination and removed some more forum service interface methods.
2014-07-30 16:31:58 +02:00
e945e7dfb4
Removed useless interface methods.
2014-07-30 16:18:33 +02:00
326013089e
Made Thread abstract.
2014-07-30 12:36:54 +02:00
fred-fri
22643498bd
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-07-30 17:56:11 +09:00
fred-fri
ff5fd1192f
removed getsession
2014-07-30 17:54:47 +09:00
fred-fri
b5bba513dd
removed getsession
2014-07-30 14:07:40 +09:00
fred-fri
547e9adf72
removed getsession
2014-07-30 14:05:37 +09:00
fred-fri
3f87a7946d
removed getsession
2014-07-30 13:43:44 +09:00
fred-fri
74125a9662
removed getsession
2014-07-30 13:38:53 +09:00
fred-fri
e616814be9
removed getsession
2014-07-30 13:36:48 +09:00
fred-fri
0986be392b
removed getsession
2014-07-30 13:31:32 +09:00
fred-fri
1ff65b20e2
removed getsession
2014-07-30 13:27:07 +09:00
fred-fri
ad18b6ef5f
removed getsession
2014-07-30 13:26:15 +09:00
fred-fri
aa55897fd4
removed getsession
2014-07-30 13:20:48 +09:00
fred-fri
1c5ff3a019
removed getsession
2014-07-30 13:18:26 +09:00
fred-fri
2a9dad9871
removed getsession
2014-07-30 13:15:08 +09:00
fred-fri
a821e27471
removed getsession
2014-07-30 13:09:26 +09:00
fred-fri
2a6d58282c
removed getsession
2014-07-30 07:51:21 +09:00
fred-fri
d4aebb4b17
removed getsession
2014-07-30 07:33:17 +09:00
fred-fri
643998d39d
removed getsession
2014-07-30 07:31:34 +09:00
fred-fri
dbb6391d7d
removed getsession
2014-07-30 07:29:06 +09:00
fred-fri
06b1c208e9
removed getsession
2014-07-30 07:03:28 +09:00
Emil Siverhall
e7aa4ef146
Merge remote-tracking branch 'origin/develop' into develop
2014-07-29 16:48:22 +02:00
Emil Siverhall
7857154886
administration page for forum mail settings
2014-07-29 16:36:28 +02:00
Emil Siverhall
f9cd3d82a8
service for forum mail settings
2014-07-29 15:42:35 +02:00
a8a3a3069b
Merge remote-tracking branch 'origin/develop' into develop
2014-07-29 15:32:04 +02:00
1639c1ef6f
Moved mail classes to their own package.
2014-07-29 13:10:56 +02:00
Emil Siverhall
dabff40ffd
Merge remote-tracking branch 'origin/develop' into develop
2014-07-29 10:19:43 +02:00
Emil Siverhall
7bd36a1a98
added filter details to milestone chart as well
2014-07-29 10:19:11 +02:00
Emil Siverhall
a2e6d96eea
panelified milestone filter details
2014-07-29 09:49:35 +02:00
33c8410d51
Merge branch 'mss' into develop
2014-07-29 09:21:25 +02:00
56960053a9
Added milestone progress to the statistics menu.
2014-07-29 09:21:03 +02:00
fred-fri
14e411595b
switching from google inject
2014-07-29 15:12:32 +09:00
fred-fri
969e8c6435
test stuff
2014-07-29 15:09:27 +09:00
fred-fri
a9ce67e1d7
moved some stuff into userfacade
2014-07-29 15:07:13 +09:00
fred-fri
7264c59db4
basic userfacade stuff
2014-07-29 14:54:12 +09:00
fred-fri
e19c563e91
removing commented out lines from test
2014-07-29 14:48:12 +09:00
fred-fri
5f9aa56952
moved some code into passwordFacade
2014-07-29 14:47:28 +09:00
fred-fri
8d8e22411b
basic passwordfacade stuff
2014-07-29 14:35:49 +09:00
Emil Siverhall
1cb49aee28
test coverage for supplier links related to group overview panel
2014-07-28 16:25:59 +02:00
4da2666d70
Fixed properties.
2014-07-28 15:56:36 +02:00
Emil Siverhall
c49884eac2
included script in application to prevent https-block
2014-07-28 15:23:02 +02:00
fab6436cdc
Fixed NPE.
2014-07-28 15:06:42 +02:00
Emil Siverhall
e89ceb6f65
missing pages..
2014-07-28 14:29:47 +02:00
Emil Siverhall
c686396f47
Merge remote-tracking branch 'origin/develop' into develop
2014-07-28 14:23:28 +02:00
Emil Siverhall
5252d8df65
milestone statistics goes graphical
2014-07-28 14:22:24 +02:00
6bfc7fbc6b
Start of new milestone progress statistics
2014-07-28 14:07:17 +02:00
fred-fri
32e801eac5
cleanup, redirect
2014-07-28 18:33:59 +09:00
fred-fri
10fa4703ae
doesnt redirect to setpasswordpage while logged in so we must use notification
2014-07-28 18:30:46 +09:00
fred-fri
ac76f419ec
cleanup
2014-07-28 18:15:37 +09:00
fred-fri
ef520ff7f5
tests
2014-07-28 18:12:47 +09:00
fred-fri
4a4057464b
cleaning up setpasswordpage
2014-07-28 18:06:44 +09:00
fred-fri
1e2822e9ba
one hour to change password
2014-07-28 18:02:17 +09:00
fred-fri
24b6d3e7b8
dont validate users
2014-07-28 18:01:45 +09:00
fred-fri
77b21ec6b8
Merge branch 'develop' into hashuser
2014-07-28 17:58:20 +09:00
fred-fri
3423189a1d
adding stuff into turnitinsettings class and removing it from elsewhere (turnitinmodule properties should go too but leaving them for now)
2014-07-28 11:54:22 +09:00
606569005e
Merge branch 'develop' into hashuser
2014-07-25 16:03:19 +02:00
Emil Siverhall
2b82784c02
start page for All projects, could use some more useful information
2014-07-25 11:31:48 +02:00
Emil Siverhall
7f6aa46947
all projects -> final seminar is now module dependent as well
2014-07-25 09:57:43 +02:00
Emil Siverhall
0d5705bb5c
hi
2014-07-25 08:51:43 +02:00
Emil Siverhall
26bcad4f02
mount supervisor milestone statistics page
2014-07-25 08:30:27 +02:00
Emil Siverhall
d4530b8a05
correct menu highlighting for supervisor pages
2014-07-25 08:27:53 +02:00
Emil Siverhall
05c0373d12
supervisor milestone statistics details pages
2014-07-25 08:19:28 +02:00
fred-fri
3de922d445
maybe this will improve readibility a bit
2014-07-25 12:25:53 +09:00
fred-fri
3642e98190
yay regex and tests work
2014-07-25 12:23:31 +09:00
fred-fri
3de323048c
cleaning and trying to figure out regex
2014-07-25 11:20:18 +09:00
fred-fri
bc9ae80559
tests
2014-07-25 08:59:24 +09:00
fred-fri
2d9bc914d9
delete all users hashes when setting password
2014-07-25 08:15:54 +09:00
Emil Siverhall
0bebabf73f
supervisor milestone statistics page
2014-07-24 23:34:40 +02:00
Emil Siverhall
3b46c83f02
properties refactoring
2014-07-24 23:05:27 +02:00
Emil Siverhall
7fdd0ca60a
test refactoring
2014-07-24 22:37:18 +02:00
Emil Siverhall
4de89991ec
abstract page to abstract panel, pages to panels, refactor refactor refactor
2014-07-24 22:29:55 +02:00
Emil Siverhall
f6b1a4baae
supplier for details pages since we need different links for supervisors
2014-07-24 20:37:14 +02:00
Emil Siverhall
5cec81acce
milestone statistics page to panel
2014-07-24 16:11:08 +02:00
Emil Siverhall
26a87be73d
system module component-annotated the overview panel
2014-07-24 14:28:16 +02:00
Emil Siverhall
258f108731
implemeted in author view as well. panel is invisible if no group connections are found
2014-07-24 14:27:09 +02:00
Emil Siverhall
b9a12d40c3
links implemented in supervisor view
2014-07-24 14:13:48 +02:00
Emil Siverhall
afd1304cd1
group overview with title labels for each group
2014-07-24 13:27:07 +02:00
fred-fri
21db90fbd5
notification type change
2014-07-24 16:20:57 +09:00
fred-fri
98d2bb8ac5
testing
2014-07-24 16:17:01 +09:00
fred-fri
a2680cbed1
added forgot password page, testing
2014-07-24 15:59:52 +09:00
fred-fri
793a194e18
refactoring
2014-07-24 12:01:33 +09:00
fred-fri
b2816f7ad7
user who requests new password gets notification
2014-07-24 11:27:53 +09:00
fred-fri
0cef4685da
refactoring
2014-07-24 10:48:26 +09:00
fred-fri
bf0b2085fd
refactoring
2014-07-24 10:40:20 +09:00
fred-fri
f7e5083fc2
refactoring
2014-07-24 10:40:06 +09:00
fred-fri
02c06d6f02
refactoring
2014-07-24 10:28:23 +09:00
fred-fri
a27c7f72a6
removed user details from notification, some cleanup
2014-07-24 09:59:01 +09:00
fred-fri
e9737b0fd6
nicer notification
2014-07-24 09:48:40 +09:00
Emil Siverhall
a0df57970d
Supervisor -> All projects tabs rearranged to have Final seminar as first tab since this one is always visible.
...
The other tabs visibility depends on modules
2014-07-23 21:04:30 +02:00
Emil Siverhall
e728ba80cf
Ideas only visible for supervisors if any active project type have it switched on
2014-07-23 15:10:36 +02:00
Emil Siverhall
b734431bbb
Ideas only visible for authors if any active project type have it switched on
2014-07-23 15:00:19 +02:00
Emil Siverhall
6a8edc3e33
Ideas only visible for authors if any active project type have it switched on
2014-07-23 14:16:53 +02:00
Emil Siverhall
61371bb99b
link to project in groups view projects. enabled for supervisors, co supervisors and reviewers of a specified project
2014-07-23 13:35:24 +02:00
Emil Siverhall
77312fbae0
moved active/inactive label on project details
2014-07-23 09:02:00 +02:00
Emil Siverhall
5525563cb7
moved active/inactive label on group view
2014-07-23 08:54:49 +02:00
fred-fri
c9acdbc689
hooking up notification, error
2014-07-23 15:14:33 +09:00
fred-fri
0488b38d5f
creating and saving hash when admin creates user (but not when admin merely edits)
2014-07-23 12:04:19 +09:00
fred-fri
d3ec278710
adding notifications for user created, user change password and user password changed
2014-07-23 10:30:38 +09:00
fred-fri
43abc2d54f
adding hash service
2014-07-23 09:31:19 +09:00
Emil Siverhall
5f59c51c5a
fixed milestone phase inactivation
2014-07-22 21:38:25 +02:00
Emil Siverhall
5a586008f7
filter by project type when adding projects to a group
2014-07-22 21:18:05 +02:00
Emil Siverhall
80afbbfddc
only active projects selectable
2014-07-22 15:27:57 +02:00
Emil Siverhall
8326deb7b1
exportable to default data panel on my groups
2014-07-22 15:22:57 +02:00
Emil Siverhall
fe748ea523
Merge remote-tracking branch 'origin/develop' into develop
2014-07-22 15:12:16 +02:00
Emil Siverhall
01c7704ad8
de-ajaxified submit on edit groups to make it easier to understand that changes was saved
2014-07-22 15:12:05 +02:00
99d36a5d6c
Removed the ability to sort by the user column since it did not work.
2014-07-22 15:09:06 +02:00
8f9b68d13c
Made dialog larger.
2014-07-22 14:53:40 +02:00
d3a8de2117
Merge remote-tracking branch 'origin/develop' into develop
2014-07-22 14:42:00 +02:00
17174b29d2
Removed unused code.
2014-07-22 14:39:18 +02:00
Emil Siverhall
b557a7bb89
some alignment
2014-07-22 13:45:30 +02:00
Emil Siverhall
cc20d6cb7d
editing of footer links enabled
2014-07-22 13:38:39 +02:00
fred-fri
5b6c1cc778
working on setpasswordpage
2014-07-22 16:09:43 +09:00
fred-fri
56cd9fe30d
replacing create new idea tab with link
2014-07-22 11:30:32 +09:00
fred-fri
0c7861eede
replacing listview with exportabledatatable
2014-07-22 11:18:03 +09:00
fred-fri
2d4d6dd150
test fix
2014-07-22 10:54:19 +09:00
fred-fri
d49462a280
test fix
2014-07-22 08:23:55 +09:00
fred-fri
2ba5a594e2
readded projectdetailspanel
2014-07-22 07:54:19 +09:00
fred-fri
2a48919739
showing what group members receives notifications
2014-07-21 18:04:30 +09:00
fred-fri
840709551c
showing more participants in groups
2014-07-21 17:45:42 +09:00
fred-fri
e86270f850
removing redundant link
2014-07-21 17:28:01 +09:00
fred-fri
5626fd627a
removing unused old bootstrap css files
2014-07-21 17:12:33 +09:00
fred-fri
b6e28b6487
removed redundant info
2014-07-21 15:16:01 +09:00
fred-fri
ce9f452f7e
label css fix
2014-07-21 14:57:20 +09:00
fred-fri
0b6b1cca3a
test fix
2014-07-21 14:35:25 +09:00
fred-fri
90a329e095
added published column to supervisor my ideas table
2014-07-21 12:45:59 +09:00
fred-fri
ecec03018a
changed infotext
2014-07-21 12:40:17 +09:00
fred-fri
da9101b7d8
my projects titles truncated and tooltipped
2014-07-21 12:36:49 +09:00
Emil Siverhall
b880f1a0f6
removed beta annotations from group features.
2014-07-17 15:29:29 +02:00
Emil Siverhall
02124d0872
group forums: mark threads as read when entering 'view thread page'
2014-07-17 13:44:47 +02:00
Emil Siverhall
9f657fcf20
basic test coverage for untested classes
2014-07-16 15:22:55 +02:00
Emil Siverhall
ddf7dd2c7a
sonar
2014-07-16 15:03:51 +02:00
Emil Siverhall
c508a8fb51
keyword <-> research area connection bugs
2014-07-16 12:39:00 +02:00
Emil Siverhall
6174d6088f
fixed wrongly formatted confirmation message
2014-07-16 11:12:24 +02:00
Emil Siverhall
122c7db6ca
lacking tests in footer panel + change to use model for faster update
2014-07-15 16:04:15 +02:00
Emil Siverhall
5975ef89b7
better feedback messages when validation fails in 'Create new program' dialog
2014-07-15 14:44:19 +02:00
Emil Siverhall
7be63710a0
sonar issues
2014-07-15 14:15:52 +02:00
Emil Siverhall
d11c1617d3
sonar issues
2014-07-15 14:12:12 +02:00
Emil Siverhall
923bc1708a
some basic testing for untested idea panel
2014-07-15 13:40:21 +02:00
Emil Siverhall
18e23c8a84
delivery configuration panel for group notifications
2014-07-15 09:56:44 +02:00
Emil Siverhall
4302a1de56
mail notification formatting and correct redirect page to go straight to the message threads
2014-07-15 09:31:17 +02:00
Emil Siverhall
5c547980fa
more work for group event notifications
2014-07-14 16:30:39 +02:00
02349a6f8f
Removed commented-out code.
2014-07-11 16:06:49 +02:00
9e09bb8c40
Sonar fixes: removed unused fields.
2014-07-11 15:46:37 +02:00
fb73a17c0b
Sonar fixes.
2014-07-11 15:43:22 +02:00
63d8b5db11
Sonar fixes.
2014-07-11 13:48:37 +02:00
fred-fri
40bddc9aa0
Merge remote-tracking branch 'origin/develop' into develop
2014-07-11 18:30:00 +09:00
7961f5a320
Merge remote-tracking branch 'origin/develop' into develop
2014-07-11 11:29:47 +02:00
fred-fri
87e34df0c9
thread wrong class
2014-07-11 18:29:45 +09:00
476e4c9da1
Popup when auto-saving fails.
2014-07-11 11:29:41 +02:00
fred-fri
464a974025
pageparameterkeys doesnt need to contain forumthread (ftid), groupthread (gtid) and thread (tid), thread (tid) is enough
2014-07-11 18:19:18 +09:00
fred-fri
5956b94c60
Merge remote-tracking branch 'private/threadurl' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ForumThreadOverviewPanel.java
2014-07-11 18:17:39 +09:00
fred-fri
e39f6f7db5
pageparameterkeys doesnt need to contain forumthread (ftid), groupthread (gtid) and thread (tid), thread (tid) is enough
2014-07-11 17:59:15 +09:00
62ad9df8bd
Minor style changes.
2014-07-11 10:53:30 +02:00
f7a3ff4868
Refactored old forum to use the new (and improved?) components from the group forum.
2014-07-11 10:50:10 +02:00
df08e4a456
Refactored old forum to use the new (and improved?) components from the group forum.
2014-07-11 10:46:13 +02:00
1b49198815
Moved "Mark all read" link up to the page.
2014-07-11 10:32:57 +02:00
2dd59f371a
Moved create link to their respective overview pages instead of overriding a getPage() method.
2014-07-11 10:15:52 +02:00
1cd5213093
Removed unused parameters.
2014-07-11 09:50:19 +02:00
fred-fri
b5729b2b85
pageparameterkeys doesnt need to contain forumthread (ftid), groupthread (gtid) and thread (tid), thread (tid) is enough
2014-07-11 16:29:26 +09:00
fred-fri
9dd50a1e97
Merge branch 'bookmarkableurls' into develop
2014-07-11 16:15:39 +09:00
fred-fri
2dc8f74898
css fix
2014-07-11 15:53:45 +09:00
fred-fri
70d36ac2b5
fixing urls and corresponding notifications
2014-07-11 15:37:40 +09:00
fred-fri
62ad2277d6
group forum fixes
2014-07-11 10:24:29 +09:00
937e079438
Added view group thread page for supervisors.
2014-07-10 16:18:24 +02:00
e1a87dc749
Fixed latest post (can't rely on the database fetching a list in any specific order when no ORDER BY specified).
2014-07-10 15:58:43 +02:00
c11ebe849c
Fixed thread overview for students.
2014-07-10 15:39:04 +02:00
7a28e845cb
Fixed Wicket XML namespace.
2014-07-10 15:30:27 +02:00
ac6427be0f
Removed unused field.
2014-07-10 14:27:26 +02:00
30b2437431
Fixed some bad non-detachable models.
2014-07-10 13:17:52 +02:00
0cf392c0b4
Why have this stupid flag thing if it is only used in one place and only half the time in that one place? Gone.
...
See line (81/77) in PartnerAdditionPanel where it is not used.
2014-07-10 13:09:49 +02:00
bc4ec668d4
View/reply to a thread as a author.
2014-07-10 12:05:15 +02:00
c75eed301c
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/util/PageParameterKeys.java
2014-07-10 10:39:18 +02:00
076009b670
Implemented creating group threads for authors.
2014-07-10 10:38:20 +02:00
2459a2df8f
Removed unused method.
2014-07-10 10:37:51 +02:00
427ad6b01e
Added Thread parameter to the onThreadCreated callback.
2014-07-10 10:37:23 +02:00
492507e6ce
Sonar problems.
2014-07-10 10:32:32 +02:00
fred-fri
fde79ced3d
supervisor can now view all threads (but not open)
2014-07-10 17:24:05 +09:00
fred-fri
d34859e824
Merge remote-tracking branch 'origin/develop' into develop
2014-07-10 16:50:54 +09:00
fred-fri
b4c21c2821
new basicforumservice which generifies project and group forum services
2014-07-10 16:50:41 +09:00
a45b55bd41
Link to create new thread page.
2014-07-10 09:23:55 +02:00
6a63c34d42
Moved isAuthorInGroup to isAuthor in Group class instead.
2014-07-10 09:13:28 +02:00
4fef68b8d6
Refactoring.
2014-07-10 09:07:14 +02:00
8bef32168c
Minor test refactoring.
2014-07-10 08:50:05 +02:00
a2c980c3f5
Sonar issues.
2014-07-10 08:33:41 +02:00
8714182040
Fixed unchecked warning.
2014-07-10 08:31:40 +02:00
fred-fri
3c86dec27b
test
2014-07-10 15:24:46 +09:00
fred-fri
f4823a509b
supervisor can create group threads. notification methods use project events (this should probably change to new group events) and are not implemented. showing threads and posts is not implemented.
2014-07-10 15:22:13 +09:00
fred-fri
3d7c69ea94
adding back link to supervisor group create new thread page
2014-07-10 12:58:33 +09:00
fred-fri
4613f51823
clarifying gui for project modules (vs system modules)
2014-07-10 12:23:35 +09:00
b0055206d5
Made the wrapper implementation serializable so there is no problem with stateful Wicket.
2014-07-09 17:30:53 +02:00
2a983b598d
Fixed test.
2014-07-09 17:00:09 +02:00
592fa3ddd4
Merge branch 'group_forum' into develop
...
Conflicts:
core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java
view/src/main/java/se/su/dsv/scipro/forum/pages/SupervisorForumBasePage.java
view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectCreateForumThreadPage.java
view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPage.java
view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java
2014-07-09 16:50:53 +02:00
8fc9be2a05
RejectFinalThesisPanel does not belong in the forum package.
2014-07-09 15:56:54 +02:00
bb82cf82c5
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 15:55:15 +02:00
c63e3e3eb5
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 15:35:29 +02:00
f876740203
Formatting.
2014-07-09 15:13:26 +02:00
9bed9af96b
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 14:59:56 +02:00
8755343dcf
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 14:45:48 +02:00
71bdddfe6d
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 14:44:02 +02:00
00b3b72ce0
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 14:41:40 +02:00
a163f2300c
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 14:40:01 +02:00
5cea5b9903
Refactored out problematic reference to Project in ViewForumThreadPanel.
2014-07-09 14:29:11 +02:00
26d0e72de7
Made it compile.
2014-07-09 11:17:53 +02:00
49d4ddccb1
Renamed FinalSeminarApprovalDecisionPage to ReviewerApprovalDecisionPage.
2014-07-09 10:44:06 +02:00
31b6ee4287
Removed role from forum post panel.
2014-07-09 10:35:33 +02:00
33245272e1
Merge remote-tracking branch 'origin/develop' into develop
2014-07-09 10:12:55 +02:00
fred-fri
bec32e562e
removing last modified from group details panel
2014-07-09 17:11:58 +09:00
fred-fri
3151adf4dc
bug fix
2014-07-09 17:10:45 +09:00
fred-fri
263c1befe1
gui for system modules
2014-07-09 16:47:51 +09:00
fred-fri
b1af5ccea4
renaming modules
2014-07-09 16:30:53 +09:00
fred-fri
66080c9fd6
test fix
2014-07-09 15:35:03 +09:00
fred-fri
6b48f7f914
adding system modules, group module
2014-07-09 14:59:01 +09:00
fred-fri
62b079381b
adding system modules, group module
2014-07-09 14:00:01 +09:00
fred-fri
1e9d0ff233
removed incorrect group module
2014-07-09 11:42:36 +09:00
915b38e690
Fixed unchecked warning.
2014-07-08 15:50:12 +02:00
fred-fri
5e4a56482a
submitforumthreadpanel and submitforumreplypanel generified
2014-07-08 20:07:42 +09:00
fred-fri
cc0e21214c
conform to new argument project
2014-07-08 19:52:42 +09:00
fred-fri
966743b652
moving wrapper argument last
2014-07-08 19:35:49 +09:00
fred-fri
30e017ff2c
conform to new argument project
2014-07-08 19:22:52 +09:00
fred-fri
9b43e1d228
wicket wrapper for different service implementations that point to the project, group etc
2014-07-08 18:31:08 +09:00
fred-fri
e1fc99ead1
moving stuff
2014-07-08 17:05:07 +09:00
a05b514621
Merge remote-tracking branch 'origin/develop' into develop
2014-07-07 09:25:28 +02:00
fred-fri
ea5a3c2511
typo
2014-07-07 15:45:42 +09:00
fred-fri
37c37618dd
test fix
2014-07-07 15:38:31 +09:00
fred-fri
9713c92649
improved feedback at user edit
2014-07-07 15:26:18 +09:00
fred-fri
3265083cc3
added date
2014-07-07 12:59:01 +09:00
fred-fri
1b91cb5554
Group module
2014-07-07 12:15:35 +09:00
fred-fri
71f0ac9e5f
supervisor page
2014-07-03 15:07:39 +09:00
fred-fri
aa27870a3f
removing remote export setting
2014-07-02 10:35:17 +09:00
fred-fri
a3b39f2547
added last modified date
2014-07-02 10:13:30 +09:00
fred-fri
9502592563
(s) replaced with s
2014-07-01 17:08:33 +09:00
fred-fri
851991f6ef
more space in footer form
2014-07-01 13:02:19 +09:00
fred-fri
4073eb0ee1
clarifying
2014-07-01 11:41:31 +09:00
fred-fri
808a4def90
refactor group gui
2014-07-01 11:32:21 +09:00
fred-fri
6da866edb5
refactoring group gui
2014-07-01 10:05:21 +09:00
fred-fri
334568784b
student group pages, filtering out relevant groups rather than showing all
2014-06-30 14:22:43 +09:00
fred-fri
03aee5ad1b
moving stuff
2014-06-27 16:01:02 +09:00
fred-fri
0ca05bb54a
lots of refactoring
2014-06-27 15:44:22 +09:00
fred-fri
ee2b425019
refactoring away bad panel
2014-06-26 18:16:14 +09:00
fred-fri
97eb94c68c
refactoring away bad panel
2014-06-26 17:35:49 +09:00
fred-fri
bc9de3ad03
cleanup and test
2014-06-26 16:46:12 +09:00
fred-fri
eb9bb141ba
validation
2014-06-26 16:15:50 +09:00
fred-fri
10370ff99e
added feedback
2014-06-26 11:27:55 +09:00
fred-fri
6796b9651f
preliminary grading report only one criteria must have been filled out
2014-06-26 11:02:55 +09:00
fred-fri
a700451760
css
2014-06-26 10:21:30 +09:00
fred-fri
9745f31703
css
2014-06-26 10:19:59 +09:00
Golrokh Moattar
c205c621c7
removed breadcrumb from my group since there is no other place in the system (except forum) that we use such, we should decide about it
2014-06-25 16:03:34 +02:00
Golrokh Moattar
e963bb9693
css fixed in some places for having the same design everywhere
2014-06-25 15:46:34 +02:00
Golrokh Moattar
c9e55ecbfa
css fixed in admin local user creation
2014-06-25 15:14:23 +02:00
Golrokh Moattar
252e345318
css fixed in admin unit and program creation
2014-06-25 14:59:33 +02:00
Golrokh Moattar
c7f828bca4
catch error during deleting a language
2014-06-25 14:21:14 +02:00
Golrokh Moattar
b7349e3683
table's style fixed
2014-06-25 13:30:59 +02:00
fred-fri
6450725f98
manual adding of active participants to final seminars
2014-06-25 15:40:03 +09:00
fred-fri
a229f33a19
manual adding of active participants to final seminars
2014-06-25 15:39:40 +09:00
fred-fri
27f251b3d7
update grade and download report link on submit
2014-06-25 11:20:03 +09:00
fred-fri
c588bd23b3
refactoring group stuff
2014-06-25 09:48:07 +09:00
fred-fri
ce0c976aed
refactoring group stuff
2014-06-25 09:30:54 +09:00
fred-fri
84d636edde
adding more group stuff
2014-06-25 08:48:17 +09:00
fred-fri
ad239588b8
lazy
2014-06-25 07:52:47 +09:00
fred-fri
071edb53c3
basic more group stuff
2014-06-25 07:33:00 +09:00
fred-fri
14d9369967
refactoring group stuff
2014-06-24 15:40:53 +09:00
fred-fri
d5d0d2fa3a
refactoring group stuff
2014-06-24 15:32:31 +09:00
fred-fri
6e5aec44f0
refactoring group stuff
2014-06-24 15:15:03 +09:00
fred-fri
db982e9595
refactoring group stuff
2014-06-24 11:16:54 +09:00
Golrokh Moattar
39dd4bb21b
Merge remote-tracking branch 'origin/develop' into develop
2014-06-23 16:12:36 +02:00
Golrokh Moattar
59923f27fd
continue with group creation
2014-06-23 16:09:49 +02:00
Golrokh Moattar
18c4b24fbc
continue with group creation
2014-06-23 16:09:22 +02:00
fred-fri
f0be4c528b
small fix
2014-06-23 17:22:53 +09:00
golrokh
6bb5575b38
Create group-the very beginning
2014-06-19 16:31:24 +02:00
9133f27517
Moved jQuery rendering to BasePage so that it is always available.
2014-06-19 13:55:02 +02:00
41b57cb901
Made all help text toggleables in the idea submission page for authors.
2014-06-19 10:06:47 +02:00
1d18244e29
Added pingdom
2014-06-19 08:40:41 +02:00
693d99caeb
Admin page to manage languages.
2014-06-19 08:34:05 +02:00
349d1dc710
Renamed Language2 entity to Language.
2014-06-18 16:29:12 +02:00
1d71428dba
Migrated user to the new language entity.
2014-06-18 16:05:31 +02:00
5c44ece70e
Migrated idea to the new language entity.
2014-06-18 14:51:20 +02:00
9519371cc5
Migrated final seminar related stuff to the new language entity.
2014-06-18 11:05:34 +02:00
5713faeea7
Flipped module settings so that modules are rows and project types columns.
2014-06-17 13:55:17 +02:00
9fcf1f6571
Renamed class from a generic name to a more specific.
2014-06-17 13:44:33 +02:00
76686dde61
Added admin setting for specifying priority days.
2014-06-17 13:42:03 +02:00
Golrokh Moattar
c4446d3962
test fixed
2014-06-17 11:24:32 +02:00
Golrokh Moattar
c604c9864f
Fixed reviewing tab
2014-06-17 11:15:24 +02:00
0178882058
The text answers when filling in a peer review are now automatically saved.
2014-06-17 09:50:44 +02:00
8fd559ab12
Sonar
2014-06-17 09:24:25 +02:00
17dc1efebb
Re-ordered columns.
2014-06-17 09:21:41 +02:00
ae2f4e13b6
Added status column to reviewer deadline followup.
2014-06-17 09:20:02 +02:00
2240080687
Styled headers in tables enhanced by the DataTable plugin.
2014-06-17 09:16:33 +02:00
edbc44171d
Added requested date.
2014-06-17 09:13:44 +02:00
Golrokh Moattar
8918ee8096
Role Student changed to Author
2014-06-16 15:06:33 +02:00
Golrokh Moattar
5c2ce7e35e
Role Employee changed to Supervisor
2014-06-16 13:49:25 +02:00
Golrokh Moattar
86d70eeaa6
test fixed
2014-06-16 13:21:17 +02:00
Golrokh Moattar
729c231e4e
two separate columns for reviewers thesis approvals
2014-06-16 13:03:52 +02:00
051100f233
Escape ' in JavascriptEventConfirmation.
2014-06-13 16:42:11 +02:00
234d43dfe4
Removed unfinished stuff.
2014-06-13 16:14:27 +02:00
700d6be161
Changed final seminar approval deadlines to use the new way of checking per decision rather than the whole reviewer approval.
2014-06-13 11:50:33 +02:00
f0fa6d9b13
Merge remote-tracking branch 'origin/develop' into develop
2014-06-13 11:50:06 +02:00
golrokh
cfea2313c8
Merge remote-tracking branch 'origin/develop' into develop
2014-06-13 11:32:58 +02:00
golrokh
ba6c0c0316
fixed updating of address in footer
2014-06-13 11:32:44 +02:00
71da45739a
Changed rough draft deadlines to use the new way of checking per decision rather than the whole reviewer approval.
2014-06-13 11:26:12 +02:00
0c7ab5ed19
Forgot one place.
2014-06-13 10:57:54 +02:00
c4e4816754
Merge remote-tracking branch 'origin/develop' into develop
2014-06-13 10:56:53 +02:00
4b27a5b54c
Changed getDeadline to getCurrentDeadline (working with the latest decision) and now takes into account non-working days.
2014-06-13 10:56:48 +02:00
golrokh
7ad531b559
fixed null id problem with footer address
2014-06-13 10:41:49 +02:00
5819ba14be
Merge remote-tracking branch 'origin/develop' into develop
2014-06-12 15:56:10 +02:00
bb16703678
[SCIPRO-17846] SciPro is not stateless.
2014-06-12 15:55:56 +02:00
Golrokh Moattar
e3a152b115
updatable footer address
2014-06-12 13:59:42 +02:00
Golrokh Moattar
4d7d2f59b7
updatable footer address
2014-06-12 13:23:47 +02:00
fred-fri
e0756bfb86
Merge branch 'users' into develop
2014-06-10 14:45:56 +09:00
fred-fri
6cd40be8b3
cleanup
2014-06-10 14:45:02 +09:00
fred-fri
57c9c134fa
working on user page
2014-06-10 12:48:53 +09:00
e67ee9c1ee
Fixed last missing method for the workaround for the Wicket bug.
2014-06-09 14:16:02 +02:00
fred-fri
9fa187b47a
working on user form
2014-06-09 15:16:24 +09:00
5a0352143f
Fixed test
2014-06-05 15:01:02 +02:00
0f83f35541
Moved ReviewerDeadline stuff to reviewing package.
2014-06-05 15:00:09 +02:00
68de7c366a
Styled DataTable sorted column headers.
2014-06-05 14:35:11 +02:00
983370b228
Enabled filtering and removed Bootstrap DataTables CSS since it was only in the way.
2014-06-05 14:31:26 +02:00
327e61162e
Added some bottom-margin to the .nav-tabs
2014-06-05 14:30:23 +02:00
a7f52ee7e2
Minor JavaScript fixes.
2014-06-05 14:06:18 +02:00
a1d6bea167
Added help text.
2014-06-05 13:52:52 +02:00
9b6a5dd9b1
Styling and catch the error thrown from DataTable plugin to enable the other JavaScript to run properly.
2014-06-05 13:47:55 +02:00
ac5f25b07e
I18n and sorting of rough draft and final seminar approvals.
2014-06-05 13:16:06 +02:00
b9a0177133
Added tabs to the reviewer deadline followup for the four different steps.
2014-06-05 12:59:11 +02:00
8edaa7ea23
Show late rough draft approvals and final seminar approvals.
2014-06-05 12:50:13 +02:00
7d940e6b46
Fixed tests.
2014-06-05 10:33:11 +02:00
15698adbfe
Merge remote-tracking branch 'origin/develop' into develop
2014-06-05 09:47:40 +02:00
f82e783f7e
Added feedback when saving activity plan as template.
...
Wicket ajax... :(
2014-06-05 09:47:27 +02:00
3efd2d7793
Added title to the "Save as template" dialog.
2014-06-05 09:16:52 +02:00
fred-fri
ebf07e0264
adding program crud
2014-06-05 14:14:15 +09:00
ab785872bc
Added feedback panel to save as template panel to show error if name is not filled out.
2014-06-04 15:39:09 +02:00
5cace5398b
Removed stupid callback and made SaveAsTemplatePanel testable.
2014-06-04 15:08:31 +02:00
c6ee21847f
Refactoring.
2014-06-04 14:48:13 +02:00
9b09285a50
Removed stupid User parameter.
2014-06-04 14:46:04 +02:00
0b4cc37dad
Refactoring.
2014-06-04 14:42:26 +02:00
24c15394f5
Fixed test.
2014-06-04 14:38:45 +02:00
2103d91940
Merge remote-tracking branch 'origin/develop' into develop
2014-06-04 11:17:06 +02:00
81686695be
Tiny refactor.
2014-06-04 10:15:58 +02:00
fred-fri
f1040984aa
added reviewer deadlines
2014-06-04 16:43:27 +09:00
fred-fri
8ef62b63cb
added reviewer deadline settings
2014-06-04 14:21:42 +09:00
fred-fri
b4b8280c47
added check that makes sure the selected final seminar start date is not a non work day
2014-06-04 10:27:57 +09:00
b3e261e755
Stupid names with apostrophes.
...
Escapes ' in the javascript confirmation message.
2014-06-03 16:12:54 +02:00
fred-fri
c693c144a9
test fix
2014-06-03 12:48:52 +09:00
fred-fri
05d0a9101d
better unit handling
2014-06-03 12:22:07 +09:00
fred-fri
bb835438a8
better research area handling
2014-06-03 11:59:40 +09:00
fred-fri
4ec22bc071
Merge remote-tracking branch 'origin/develop' into develop
2014-06-03 10:28:20 +09:00
fred-fri
f4301df5b2
better keyword handling
2014-06-03 10:27:46 +09:00
5f5aad4326
Made the supervisor final thesis panel part of the grading module.
2014-06-02 16:51:12 +02:00
Golrokh Moattar
725d4e574e
Merge remote-tracking branch 'origin/develop' into develop
2014-06-02 16:26:13 +02:00
Golrokh Moattar
28eccc1627
Style fixed with the footer settings
2014-06-02 16:26:08 +02:00
8bebdaf756
Do not show information about new opposition report if the old one exists.
2014-06-02 16:19:19 +02:00
b59cd5b8f9
Added thesis summary to the opposition report pdf
2014-06-02 16:07:05 +02:00
f0acfdff44
Changed text on the supervisor profile page to indicate that unit/research area is assigned by the administrator rather than imported from Daisy.
2014-06-02 13:07:53 +02:00
ed688a45e1
Added some more logging to include the HTTP method when logging unhandled exceptions to see if the multipart issues is caused by GET form submissions.
2014-06-02 10:30:20 +02:00
c8ba4f727a
Added missing module label property.
2014-05-28 15:30:05 +02:00
be945158b4
Added grading module and put final thesis and grading in it.
2014-05-28 15:19:14 +02:00
6e5214d1e0
URL help text is now toggled independently on each tab when editing the footer links.
2014-05-28 15:07:22 +02:00
e90ea77813
Added help text explaining what you can use in the URL field when adding new footer links.
2014-05-28 14:30:49 +02:00
a38992e4d3
Merge remote-tracking branch 'origin/develop' into develop
2014-05-28 14:22:09 +02:00
06dd7a3076
Switched from clickable icon column to AbstractReadStatePanel in notification table to get consistent look and behaviour with forum.
2014-05-28 14:22:03 +02:00
052f56dabf
Test concrete implementations not abstract classes.
2014-05-28 14:20:48 +02:00
Golrokh Moattar
cd21db7e61
Style fixed with the footer settings
2014-05-28 14:07:56 +02:00
ebbcfbc862
Changed text in the matching part of the system for authors and supervisors to remove any reference to DSV.
2014-05-28 13:44:55 +02:00
fred-fri
ea17b68009
unit stuff, only available to sysadmins
2014-05-28 17:57:30 +09:00
fred-fri
ccfcb70bc2
keyword and reserach area page only available to sysadmins
2014-05-28 12:32:35 +09:00
fred-fri
75826a963f
adding of research areas and column modification
2014-05-28 12:15:06 +09:00
fred-fri
96bd037a52
deletion of reserach areas with no keywords
2014-05-28 10:02:46 +09:00
18c312f910
Made footer use the dynamic links.
2014-05-27 17:18:48 +02:00
8d634faa95
Removed URL validator to allow mailto links to be used.
2014-05-27 17:04:49 +02:00
bf62bcfd31
Hard coded the columns to Authors, 'Supervisors & Reviewers', General and Contact.
2014-05-27 16:09:45 +02:00
22bc9ceab6
Added a list of current footer links.
...
Current links can be deleted.
2014-05-27 15:02:45 +02:00
1900c266ad
Forms nested deep within other elements now correctly specify the #id on the action attribute if they are within a tab.
2014-05-27 14:58:29 +02:00
bf774bb685
Clear the input fields after successfully adding a link.
2014-05-27 14:11:38 +02:00
4592252ddf
Lists all current links.
2014-05-27 14:02:13 +02:00
d197ff709a
Styled the add new footer link as an inline form.
2014-05-27 13:48:01 +02:00
c49693bf10
Fixed bad href
2014-05-27 13:44:53 +02:00
9c3b20a8e4
Extracted editing a specific column to its own panel.
2014-05-27 13:41:10 +02:00
3fc064afc1
Fixed wicket namespace
2014-05-27 12:52:27 +02:00
fred-fri
8155431cb0
Merge remote-tracking branch 'origin/develop' into develop
2014-05-27 18:56:20 +09:00
fred-fri
cdd27c3735
working on footer settings
2014-05-27 18:55:57 +09:00
4e116882a4
English please.
2014-05-27 11:01:43 +02:00
fred-fri
204d0bd737
activity plan templates must have at least one activity in order to be able to save them
2014-05-27 16:41:15 +09:00
fred-fri
405e5800e0
final thesis panel doesnt show until after final seminar
2014-05-27 15:20:00 +09:00
fred-fri
72b20224e5
fixed opposition and active participatoin appearance
2014-05-27 15:02:03 +09:00
fred-fri
06fbaacc0f
test fix
2014-05-27 14:47:40 +09:00
fred-fri
5c0ef78fc8
reviewer role added, reviewer tab only visible to reviewers, cant add non reviewer users as reviewers to projects
2014-05-27 13:43:03 +09:00
fred-fri
6684e8dc7a
turnitin info text added
2014-05-27 11:51:19 +09:00
fred-fri
84dd06aea7
opposition report has not been submitted yet label
2014-05-27 11:45:34 +09:00
971f38a6c6
Hide "Co-Supervisors" and "Reviewers" headings in the final seminar details page if there are none.
2014-05-26 17:19:28 +02:00
7749009474
Created a simple ListView that hides itself when its list is empty.
2014-05-26 17:13:52 +02:00
0eecbc056c
Show text informing users that no opponents are registered instead of a strange empty panel.
2014-05-26 16:54:06 +02:00
4d11c6d679
Show text informing users that no active participants are registered instead of a strange empty panel.
2014-05-26 16:32:14 +02:00
685879b9ca
Clear input after creating a template from an activity plan.
2014-05-26 15:09:37 +02:00
63d34040c0
Made activity plan exportable.
2014-05-26 14:36:57 +02:00
7350b3bb72
Removed GenericColumn since it was just a duplicate AbstractExportableColumn
2014-05-26 13:10:02 +02:00
fred-fri
1891a1085d
course evaluation not visible rules
2014-05-26 17:36:58 +09:00
fred-fri
f3af673d5c
course evaluation admin gui and student link added
2014-05-26 15:58:16 +09:00
fred-fri
a00759f25d
fixed date filter bug on current date
2014-05-26 14:05:58 +09:00
914e4a0310
Set the project model to the pages model to ensure it gets detached properly in all cases.
2014-05-23 16:49:17 +02:00
9adb15864a
Removed pre-filled text.
2014-05-23 16:19:22 +02:00
db0c409568
Fixed some styling.
2014-05-23 15:38:57 +02:00
649d9466c7
Fixed some styling.
2014-05-23 15:34:17 +02:00
27a75f7133
Refactoring.
2014-05-23 12:54:28 +02:00
e57f14e004
Fixed display of the paging-navigator even when table is ajax-refreshed from the outside.
2014-05-23 12:29:43 +02:00
ace087f929
Removed hardcoded default title on new activities.
2014-05-23 11:52:48 +02:00
4b56990a63
Fixed bug that caused the ListView not to update itself after removing an active participant.
2014-05-23 11:08:53 +02:00
fred-fri
17045a05ec
reviewing preliminary grading report table and badge got a date fix
2014-05-23 17:31:32 +09:00
fred-fri
c305fa5ac4
feedback panel bug
2014-05-23 16:32:34 +09:00
fred-fri
90b430bb07
reviewers final grading report table and badge now work as they should
2014-05-23 15:23:03 +09:00
fred-fri
a8846cb525
testing query
2014-05-23 11:41:35 +09:00
33ddd0d51c
Tiny refactor.
2014-05-22 15:26:55 +02:00
531e0cd5ac
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-05-22 10:36:55 +02:00
Richard
f661c98c3f
Updated footer to work with new SciPro Resources URL's.
...
Edited some links, added new ones.
2014-05-22 08:35:57 +02:00
1ed32eb238
Realm removed from username (merged it into the username column as username@realm).
2014-05-21 17:16:59 +02:00
57d9891015
Minor semantic improvements.
2014-05-21 16:06:08 +02:00
5dfdd1f9c5
Formatting.
2014-05-21 16:02:14 +02:00
0d2e9847e4
Made log in page nice and responsive.
2014-05-21 16:00:38 +02:00
d01d455441
Removed restriction on heap space.
...
Increased PermGen to 128MB from IDEAs default of 85MB which isn't enough when all libraries from both core and view are loaded, this helps running tests inside IDEA.
2014-05-20 18:35:54 +02:00
fred-fri
b96382148d
test commit
2014-05-20 15:55:50 +09:00
4405b6d46b
Made the "Interact with Reviewer" page visible to employees
2014-05-19 14:51:21 +02:00
fred-fri
227c9f57e2
changed project state to state in gui and notifications
2014-05-19 14:05:50 +09:00
fred-fri
16121a8591
added reviewer cms link
2014-05-16 16:41:26 +02:00
Golrokh Moattar
02a62159bc
My project's excel sheet fixed
2014-05-16 11:55:54 +02:00
fred-fri
a4a2487b06
shortened text at request from fredrik björk
2014-05-14 15:39:25 +02:00
bbc849db28
Fixed scrolling and back-button support when switching between tabs.
2014-05-14 11:27:48 +02:00
1d752df8e4
Fixed crash when attempting to view a non-existent checklist. Now shows the checklist overview with an error message.
2014-05-14 10:07:40 +02:00
fred-fri
6262c4076d
Merge remote-tracking branch 'origin/develop' into develop
2014-05-13 16:07:27 +02:00
fred-fri
64392c88c7
text fix
2014-05-13 16:07:18 +02:00
7c8c6eeec5
Why specify child if there is only one.
2014-05-13 14:50:24 +02:00
05d62c6f82
Added external resources (no admin GUI yet) which are basic links to external resources.
...
Replaced PhD links with this new general model.
Add resources by populating the ExternalResource table.
2014-05-13 14:41:41 +02:00
6c6ef98572
Fixed problem with the "loading..." on buttons.
2014-05-13 13:29:21 +02:00
fred-fri
b79a3cd003
Merge remote-tracking branch 'origin/develop' into develop
2014-05-13 09:52:34 +02:00
fred-fri
24b9621828
implemented showall for reviewer final grading report
2014-05-13 09:52:23 +02:00
1fde430499
Added help to the preliminary grading report tab.
2014-05-13 09:42:51 +02:00
17bc92951f
Removed unnecessary HTML
2014-05-13 09:42:51 +02:00
Golrokh Moattar
739acb49fc
Merge remote-tracking branch 'origin/develop' into develop
2014-05-13 09:19:38 +02:00
Golrokh Moattar
cc1ec5bb9f
changed styling
2014-05-13 09:19:30 +02:00
3466cda7ab
Show information on the "Interact with Reviewer" and "Reviewing" tabs who can see what and when.
2014-05-12 17:21:30 +02:00
Golrokh Moattar
5538c8b879
Add desc above interact with reviewer tabs
2014-05-12 16:54:29 +02:00
fred-fri
0ba072a363
Merge remote-tracking branch 'origin/develop' into develop
2014-05-12 14:46:54 +02:00
fred-fri
416e8e517c
implemented show all filter for reviewer preliminary grading reports
2014-05-12 14:46:45 +02:00
88857bc691
Made buttons disabled and show "loading..." while an ajax request is in progress.
2014-05-12 14:32:11 +02:00
cc28ac1586
Changed wording to Ok/Resend.
2014-05-12 13:39:22 +02:00
Emil Siverhall
5f964f6fb8
test
2014-05-08 16:26:45 +02:00
Emil Siverhall
f2bcf85a58
fixed label
2014-05-08 15:51:37 +02:00
Emil Siverhall
8401e25dc8
show all filter for reviewer approvals
2014-05-08 15:44:32 +02:00
Emil Siverhall
546c27f844
Merge remote-tracking branch 'origin/develop' into develop
2014-05-08 14:58:20 +02:00
Emil Siverhall
c99cbb09b3
moved html as well
2014-05-08 14:57:34 +02:00
c8e3aab068
Fixed bold labels for checkboxes.
2014-05-08 14:54:25 +02:00
Emil Siverhall
b301459f14
PeerListPanel -> peer package
2014-05-08 14:16:16 +02:00
fred-fri
ab10530c18
added nice url
2014-05-08 13:27:24 +02:00
6d0da17b97
Moved landing page for final seminar notifications.
2014-05-08 12:59:07 +02:00
6a177f0e70
Final seminar-related notifications for reviewers now links to the reviewing page.
2014-05-08 11:33:33 +02:00
Emil Siverhall
e67d68a2ea
Merge remote-tracking branch 'origin/develop' into develop
2014-05-08 11:29:46 +02:00
Emil Siverhall
e912df5368
peer pages/panels -> peer package
2014-05-08 11:29:27 +02:00
f993a96b71
Fixed tests.
2014-05-08 11:23:17 +02:00
e84b460e37
Show badge if there are final grading reports to fill in.
2014-05-08 11:22:39 +02:00
e2e909f89b
Show badge if there are preliminary grading reports to fill in.
2014-05-08 11:15:26 +02:00
87c5bf2606
Removed old code that is no longer relevant.
2014-05-08 11:15:26 +02:00
c8a22dbc4b
Formatting.
2014-05-08 11:15:26 +02:00
Golrokh Moattar
e3e4d90843
Merge remote-tracking branch 'origin/develop' into develop
2014-05-08 10:08:55 +02:00
Golrokh Moattar
d92b416883
hide status "in progress" when opposition report submitted
2014-05-08 10:08:50 +02:00
Emil Siverhall
03af12d860
enum label for approval steps
2014-05-08 09:23:49 +02:00
Emil Siverhall
34ef72f1eb
Merge remote-tracking branch 'origin/develop' into develop
2014-05-07 15:22:47 +02:00
Emil Siverhall
7ee3bf49e2
populate the table in the test class
2014-05-07 15:21:41 +02:00
Emil Siverhall
4f9bf407f3
added link to final thesis in final grading report table for reviewers
2014-05-07 15:10:04 +02:00
Golrokh Moattar
97a3a35e2c
Merge remote-tracking branch 'origin/develop' into develop
2014-05-07 14:52:22 +02:00
Golrokh Moattar
38e841751b
auto saving on points in grading reports finished
2014-05-07 14:52:10 +02:00
Emil Siverhall
dad75b58eb
do not show thesis deadline information before a seminar is created. the date will always be wrong..
2014-05-07 14:49:02 +02:00
Emil Siverhall
ae6635e0d9
feedback panel when trying to submit approvals
2014-05-07 14:30:22 +02:00
Emil Siverhall
05cfd30e5d
make decision -> open approval (no decision to make if approved)
2014-05-07 14:22:14 +02:00
Emil Siverhall
4ec6c959d0
redirecting notifications
2014-05-07 14:01:59 +02:00
Emil Siverhall
1d9415ccb9
removed unnecessary extra source parameter
2014-05-07 13:39:09 +02:00
Emil Siverhall
ddc1ac15be
Merge remote-tracking branch 'origin/develop' into develop
2014-05-07 10:57:15 +02:00
6d71de28ba
Merge remote-tracking branch 'origin/develop' into develop
2014-05-07 10:56:45 +02:00
5dd631f6d8
Added badge to show how many undecided approvals there are to the tab.
2014-05-07 10:56:38 +02:00
Emil Siverhall
b54289a53b
view attachment panel to show thesis files
2014-05-07 10:54:35 +02:00
Golrokh Moattar
1b2c8da1b4
test fixed
2014-05-07 10:46:13 +02:00
Emil Siverhall
86f8ffc3fc
fixed empty space in final thesis approval panel
2014-05-07 10:11:11 +02:00
Emil Siverhall
0e41b3c1ca
Merge remote-tracking branch 'origin/develop' into develop
2014-05-07 10:08:14 +02:00
Golrokh Moattar
d8e7201ef8
FinalThesisFile is visible above the Supervisor & Reviewer GradingReport's page
2014-05-07 10:02:55 +02:00
Emil Siverhall
b1d3760303
Merge remote-tracking branch 'origin/develop' into develop
2014-05-07 09:11:34 +02:00
Golrokh Moattar
7fb4e0c602
Merge remote-tracking branch 'origin/develop' into develop
2014-05-07 09:05:51 +02:00
f7a9bd63cc
Fixed test
2014-05-07 08:47:13 +02:00
Golrokh Moattar
5b7011090c
FinalSeminarFile is viewable above the SupervisorPreliminaryGradingReport
2014-05-06 16:34:07 +02:00
82386bbacc
Fixed students being able to view any thread in the entire system with some clever URL manipulating.
2014-05-06 16:32:36 +02:00
Emil Siverhall
f379c4e074
reviewer interaction notification when posting in message thread
2014-05-06 16:24:49 +02:00
587f214cf9
Fixed test
2014-05-06 15:46:17 +02:00
Golrokh Moattar
f2366c7acf
FinalSeminarFile is viewable above the OppositionReportPage
2014-05-06 15:32:26 +02:00
Emil Siverhall
810af64489
Merge remote-tracking branch 'origin/develop' into develop
2014-05-06 15:15:59 +02:00
7518c56c19
Removed year from annual review.
2014-05-06 15:16:38 +02:00
638ac47b34
Removed year from annual review.
2014-05-06 15:15:22 +02:00
Emil Siverhall
6f2db114a8
label change
2014-05-06 15:12:20 +02:00
Emil Siverhall
aa7b17d1a2
interact with reviewer tab only visible if reviewer exists on project
2014-05-06 15:00:31 +02:00
Emil Siverhall
b4eeaae44c
Merge remote-tracking branch 'origin/develop' into develop
2014-05-06 14:45:42 +02:00
Emil Siverhall
b7a204b084
step column to approval table
2014-05-06 14:44:49 +02:00
fead772284
Removed stupid test.
2014-05-06 14:39:26 +02:00
Emil Siverhall
13d0fdf170
current status column to thesis approvals
2014-05-06 14:33:38 +02:00
af4f1964f9
Removed ThesisCommentPunishWorker (it does not work currently)
2014-05-06 14:31:40 +02:00
Golrokh Moattar
82a5598654
auto saving for opoosition-report, preliminary-grading-report and final-grading-reports done!
2014-05-06 14:19:32 +02:00
Emil Siverhall
a7b0cbe1ae
Merge remote-tracking branch 'origin/develop' into develop
2014-05-06 14:08:40 +02:00
Emil Siverhall
719ca6557b
test fix + tab label
2014-05-06 14:08:30 +02:00
e15c9fc446
Notifications are now sent out to the supervisor when the reviewer makes a decision.
2014-05-06 14:08:18 +02:00
6900301309
Changed notification for approval requests to be more generic.
2014-05-06 13:42:05 +02:00
Emil Siverhall
b3be30b3d1
rought draft approval working
2014-05-06 13:36:56 +02:00
Emil Siverhall
f243cafca0
menu highlight on review page
2014-05-06 12:50:56 +02:00
Emil Siverhall
451ff0d503
refactoring
2014-05-06 12:45:28 +02:00
67dfb3d6b5
Added notification when a request for final seminar approval is added.
2014-05-06 12:28:28 +02:00
3f3df67e9e
Revert "Fixed some more cycles."
...
This reverts commit 5317064016
2014-05-06 10:09:02 +02:00
5317064016
Fixed some more cycles.
2014-05-06 09:56:11 +02:00
d31723da8f
Moved Pair class to util package.
2014-05-06 09:50:19 +02:00
a7e4f68625
Removed export possibility from the activity plan panel.
2014-05-06 09:39:21 +02:00
450b1038fb
Tabified the review page
2014-05-06 08:48:06 +02:00
ff2d9987ba
Fixed faulty javascript (event changed in Bootstrap 3)
2014-05-06 08:47:47 +02:00
e23c50a18e
Fixed bad styling of file input.
2014-05-05 14:36:22 +02:00
885be72127
Changed input labels.
2014-05-05 14:35:32 +02:00
1d98e5d612
Added heading to the final seminar approval page to show the reviewer what he is doing.
2014-05-05 14:34:38 +02:00
6bad58f4ea
Now shows all final seminar approvals instead of only undecided.
2014-05-05 14:33:02 +02:00
d89a0c9952
Added feedback.
2014-05-05 14:29:38 +02:00
67d954557a
Removed tab fading to be consistent with the rest of the system.
2014-05-05 14:21:35 +02:00
23febc3b33
Bootstrap tab magic that shows the correct tab on page reload and form submit.
2014-05-05 14:21:15 +02:00
5264162ba8
Arbitrary wicket paths \o/
2014-05-05 13:47:13 +02:00
0f296e7165
Made button green.
2014-05-05 13:35:01 +02:00
16036fb7ab
Merge remote-tracking branch 'origin/develop' into develop
2014-05-05 13:32:58 +02:00
c0756b1adf
Made tables on ReviewPage not exportable.
2014-05-05 13:32:51 +02:00
f81193a547
Renamed GenericDataPanel to ExportableDataPanel
2014-05-05 13:29:56 +02:00
44fb6362ca
Extracted exportable data panel.
2014-05-05 13:28:58 +02:00
8a7531ee9e
Fixed test
2014-05-02 13:14:57 +02:00
dd5c7176e4
Fixed default filter.
2014-05-02 12:57:48 +02:00
079a23cba5
Labels should be bold.
2014-05-02 10:35:25 +02:00
452bb89f18
Styling.
2014-05-02 10:33:50 +02:00
a256f837c5
Fixed test.
2014-05-02 10:19:48 +02:00
0542a2f82e
Supervisor can now upload a new version if the old one is rejected in the final seminar approval step.
2014-05-02 10:02:54 +02:00
49edaa90fa
Hide decision form if a decision is already made.
2014-05-02 09:31:32 +02:00
da5fd1d03f
Show details about the final seminar approval.
2014-05-02 09:14:21 +02:00
50a9bb0d5d
Added the ability to approve final seminar approvals by the reviewer.
2014-05-02 09:11:46 +02:00
062653d43d
Added the ability to reject final seminar approvals by the reviewer.
2014-05-02 08:37:50 +02:00
72677a81dd
Show communication on decision page.
2014-05-02 08:09:22 +02:00
cf30c4d8e6
Stupid.
2014-05-02 08:06:30 +02:00
aaf390a655
Fixed test.
2014-05-02 07:31:59 +02:00
fred-fri
51d1fcb14d
added info icon with milestone description
2014-05-01 15:54:20 +09:00
fred-fri
21a9541ad6
Merge remote-tracking branch 'origin/develop' into develop
2014-05-01 15:31:20 +09:00
fred-fri
c2512fc67a
hard coded description in property file
2014-05-01 15:30:58 +09:00
52ed8ca948
Added project header to the page where decisions are made for final seminar approvals.
2014-04-30 18:45:31 +02:00
5867d72e56
Added table with undecided FinalSeminarApprovals to the reviewing page.
2014-04-30 15:21:12 +02:00
00bb3509da
Removed stupid restriction.
2014-04-30 14:06:23 +02:00
ab82e85027
Unused code.
2014-04-30 14:02:19 +02:00
9060b27d70
Unused code.
2014-04-30 14:01:22 +02:00
a4d7a306cb
Unused code.
2014-04-30 14:01:14 +02:00
1522ae9285
Merge remote-tracking branch 'origin/develop' into develop
2014-04-30 13:56:53 +02:00
7e92b27b28
Removed faulty Pageable.
2014-04-30 13:55:44 +02:00
f8a291cb8f
Unused code.
2014-04-30 13:54:37 +02:00
63be40966c
Unused code.
2014-04-30 13:54:19 +02:00
f98cad3ecc
In-lined useless class.
2014-04-30 13:53:43 +02:00
08aa39e73c
Unused code.
2014-04-30 13:51:33 +02:00
0b54c62082
Unused code.
2014-04-30 13:50:59 +02:00
a5884f4547
Unused code.
2014-04-30 13:50:05 +02:00
5c336a6b19
Unused code.
2014-04-30 13:46:08 +02:00
417bcb9c22
Unused code.
2014-04-30 13:45:11 +02:00
cb5ec9ed9f
Unused code.
2014-04-30 13:40:46 +02:00
Emil Siverhall
74cbc83a04
tab only visible for head supervisor
2014-04-30 09:33:55 +02:00
Emil Siverhall
d97ef416e1
oops
2014-04-30 08:44:24 +02:00
fred-fri
26a0d93cfe
removing edit description stuff
2014-04-30 15:42:56 +09:00
Emil Siverhall
9a2b03b081
Merge remote-tracking branch 'origin/develop' into develop
2014-04-30 08:27:12 +02:00
Emil Siverhall
61c7d34251
New message instead of New reply in reviewer interaction
2014-04-30 08:26:57 +02:00
fred-fri
9e84ec9a9d
renamed internal user to local user
2014-04-30 15:15:19 +09:00
Emil Siverhall
54de6ab54d
renamed migration scripts and some minor changes
2014-04-29 22:46:47 +02:00
Emil Siverhall
f3b48c6bae
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorInteractWithReviewerPage.html
2014-04-29 22:23:10 +02:00
fc2352b2aa
Trying to fix test for jenkins.
2014-04-29 18:21:56 +02:00
92ef98fcaa
Fixed tests.
2014-04-29 18:11:34 +02:00
d0d7437a31
Seriously tun on optimize imports.
2014-04-29 18:02:25 +02:00
e2b3468bc4
You will not be missed.
2014-04-29 16:56:45 +02:00
61e066ac17
Styling.
2014-04-29 16:50:57 +02:00
Emil Siverhall
1ab425cb59
do not notify if not forum thread being replied to
2014-04-29 16:45:42 +02:00
8d66ae9460
Made decision history start out collapsed.
2014-04-29 16:41:31 +02:00
d1d4825e7e
Added FinalSeminarApprovalPanel to the interact with reviewer page.
2014-04-29 16:36:14 +02:00
3b67ccc474
Included ReviewingModule in the application.
2014-04-29 16:21:52 +02:00
38acc9e225
Implemented FinalSeminarApprovalService.
2014-04-29 16:17:42 +02:00
Emil Siverhall
c23d3bba88
label change
2014-04-29 15:49:38 +02:00
aa66690fb3
Panel to show the current ongoing process for approving final seminars.
2014-04-29 15:29:52 +02:00
Emil Siverhall
9b3a1d03d7
project header to reviewers interaction page
2014-04-29 15:22:56 +02:00
8b2e84757f
Added constructor for use with CompoundPropertyModel.
2014-04-29 14:58:14 +02:00
Emil Siverhall
af13350b8b
interaction page for reviewers
2014-04-29 14:56:40 +02:00
38aecc1e4c
Overkill for CompoundPropertyModel
2014-04-29 14:56:28 +02:00
4431eef165
Panel for the supervisor to initiate the final seminar approval process.
2014-04-29 14:09:52 +02:00
Emil Siverhall
6bcb331de2
renamed migration scripts and merged reviewer interaction page content
2014-04-29 12:19:51 +02:00
Emil Siverhall
4cc4bbe4ea
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
core/src/main/java/modules/RepositoryModule.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java
view/src/test/java/se/su/dsv/scipro/SciProTest.java
2014-04-29 11:31:01 +02:00
Emil Siverhall
8548a39772
back link invisible if thread isn't instance of ForumThread
2014-04-29 11:21:34 +02:00
fred-fri
3bc95f1f39
added reviewer stuff
2014-04-29 17:48:01 +09:00
fred-fri
90abcf4041
add and remove draft features for supervisor
2014-04-29 15:43:54 +09:00
fred-fri
ef75cb0498
adding new interact with reviewer page
2014-04-29 13:47:41 +09:00
fred-fri
e7fb72ab6e
added points at reviewing page
2014-04-29 11:58:11 +09:00
fred-fri
bc821660b1
removed beta from latest events
2014-04-29 11:16:27 +09:00
fred-fri
438bbb1387
notification fixes
2014-04-29 11:14:39 +09:00
Emil Siverhall
f56cab5b9c
service in the wrong root and redirected foreign key on forum_posts
2014-04-28 22:46:54 +02:00
Emil Siverhall
f6a6601304
wild and crazy with the threads
2014-04-28 21:05:52 +02:00
Emil Siverhall
f7b58c2588
thread refactoring
2014-04-28 15:01:11 +02:00
fred-fri
b8b5a19438
moving order columns around
2014-04-28 14:55:32 +09:00
fred-fri
7e1a49830d
removing resourcemodels that caused issues
2014-04-28 13:33:12 +09:00
fred-fri
dae37771a4
removing resourcemodels that caused issues
2014-04-28 13:32:21 +09:00
fred-fri
f463f70b5b
test fix
2014-04-28 13:18:05 +09:00
fred-fri
6d82ea908f
filter fix
2014-04-28 13:00:58 +09:00
fred-fri
b17d790034
cleanup
2014-04-28 12:19:15 +09:00
fred-fri
8687943573
Merge remote-tracking branch 'origin/develop' into develop
2014-04-28 12:17:24 +09:00
fred-fri
3785ae1b01
cleanup
2014-04-28 12:17:00 +09:00
7bea134671
Upgraded Wicket to version 6.15.0
2014-04-25 14:51:37 +02:00
Richard
cc1382366b
Removed blue-box from the css.
2014-04-25 13:36:21 +02:00
Richard
9d7a43b158
Replaced blue-box with help-box.
2014-04-25 13:35:57 +02:00
Richard
5ff5a96279
Replaced blue-box with help-box.
2014-04-25 13:35:36 +02:00
Richard
5ca5b27c6b
Replaced blue-box with help-box.
2014-04-25 13:35:16 +02:00
Richard
b3ffe336cd
Replaced blue-box with help-box.
2014-04-25 13:34:56 +02:00
Richard
cd0441da78
Replaced reason-box with help-box.
2014-04-25 13:21:44 +02:00
Richard
48a65838d2
Removed reason-box from the css.
...
Changed color on .well .help-box to #000000 .
Changed border-color on .well .help-box to #cccccc.
2014-04-25 13:21:18 +02:00
Richard
a58d5403e2
Removed info-box from the css.
...
Removed olive-box from the css.
2014-04-25 12:03:28 +02:00
Richard
19a231bbd2
Removed info-box and replaced it with info-panel.
2014-04-25 12:00:14 +02:00
Richard
4d54a282da
Removed info-box.
2014-04-25 11:55:35 +02:00
Richard
15853cbb56
Removed info-box and replaced it with info-panel.
2014-04-25 11:49:15 +02:00
Richard
68723a1a3a
Removed info-box and replaced it with info-panel.
2014-04-25 11:48:40 +02:00
Richard
3fd880fb7f
Removed info-box.
...
Edited information text to user.
2014-04-25 11:45:41 +02:00
Richard
6b4255a52a
Removed info-box and replaced it with info-panel.
2014-04-25 11:38:59 +02:00
Richard
1ae8bc6519
Removed info-box and replaced it with info-panel.
2014-04-25 11:36:37 +02:00
Richard
9c722d4ede
Removed info-box.
2014-04-25 11:31:54 +02:00
Richard
276ee5c9b0
Removed info-box and replaced it with info-panel.
2014-04-25 11:28:38 +02:00
Richard
ae3790037d
Removed info-box and replaced it with info-panel.
2014-04-25 11:26:36 +02:00
Richard
508a84f45f
Removed info-box and replaced it with info-panel.
2014-04-25 11:25:26 +02:00
Richard
b2bcb4ea88
Removed info-box and replaced it with info-panel.
...
Added bootstrap styling to the form.
2014-04-25 11:18:02 +02:00
Richard
d054c877c8
Removed info-box and replaced it with info-panel.
2014-04-25 11:10:31 +02:00
Richard
0645bb27af
Removed info-box and replaced it with info-panel.
2014-04-25 11:08:41 +02:00
Richard
50136196fa
Removed info-box and replaced it with info-panel.
2014-04-25 10:59:54 +02:00
Richard
15603be2c8
Removed info text directly on the page since it was already being used in an info-panel.
2014-04-25 10:49:35 +02:00
Richard
5f0c74555c
Added .well .help-box.
...
Edited .help-box.
2014-04-25 10:48:54 +02:00
Richard
b0db176873
Moved text from info-box to info-panel.
...
Added properties file.
2014-04-25 10:48:25 +02:00
fred-fri
bb22f1b725
added new dp, must filter
2014-04-25 17:24:22 +09:00
fred-fri
d4d92b18e7
removed info
2014-04-25 14:11:34 +09:00
fred-fri
9c42113753
removed unneccessary abstract page
2014-04-25 14:09:23 +09:00
fred-fri
6598fe1682
show hide link fix
2014-04-25 13:32:56 +09:00
fred-fri
9b35e9720a
sonar
2014-04-25 12:48:56 +09:00
Emil Siverhall
a7960519d7
Merge remote-tracking branch 'origin/develop' into develop
2014-04-24 15:52:20 +02:00
Emil Siverhall
96cebaaf94
enum columns for language
2014-04-24 15:52:07 +02:00
Richard
819a44070f
Removed underline on btn-link:hover.
2014-04-24 15:36:24 +02:00
Richard
a34928187e
Removed underline from hover on header h1.
...
Added underline to links in header.
Added new color on current a in header.
2014-04-24 15:32:43 +02:00
Emil Siverhall
4973c2cd3f
loadable detachable model to notification settings
2014-04-24 14:40:58 +02:00
Emil Siverhall
dd5451dac3
department service form cleared on submit
2014-04-24 08:25:28 +02:00
fred-fri
d6d2a94984
improved share link
2014-04-24 11:49:06 +09:00
fred-fri
8b9acd9b48
improved show hide link on research plan
2014-04-24 11:43:35 +09:00
Richard
e2b0386376
Merge remote-tracking branch 'origin/develop' into develop
2014-04-23 17:17:45 +02:00
Richard
19198c37f4
Removed upper case from roles.
2014-04-23 17:17:39 +02:00
Emil Siverhall
a889ff97d3
toggleable transaction addition
2014-04-23 17:17:10 +02:00
Richard
a391b661a6
Removed divs that wasn't needed.
2014-04-23 16:53:50 +02:00
Richard
ca775cf280
Changed class on add button to btn-link.
...
Added "research plan" after add on link.
Added glyphicon to link.
Changed class on show/hide button to btn-link.
Moved show/hide link.
2014-04-23 16:34:03 +02:00
Richard
6c540969d6
Changed class on add annual review button to btn-link.
...
Added glyphicon to link.
2014-04-23 16:24:12 +02:00
Richard
10601f97ff
Overwrite of bootstrap btn-link (color, size and padding).
...
Overwrite of bootstrap bottom-margin on tables in wells.
2014-04-23 16:20:08 +02:00
Richard
e8c4a9ea38
Changed size to btn-xs on create transaction.
...
Changed input size to input-sm.
2014-04-23 16:18:56 +02:00
Richard
86d259e685
Added table styling to DepartmentService.
...
Changed class on add button to btn-link.
Changed class on show/hide button to btn-link.
Moved show/hide above the table.
2014-04-23 16:18:12 +02:00
Emil Siverhall
e848da84e2
fixed npe in add remove follower panel
2014-04-23 15:21:02 +02:00
Emil Siverhall
2fad2f4725
fenced feedback panel to EconomyPanel
2014-04-23 14:55:32 +02:00
Emil Siverhall
ae4562455f
added admin tab to supervisor page as well
2014-04-23 14:53:29 +02:00
Emil Siverhall
83208ec935
Merge remote-tracking branch 'origin/develop' into develop
2014-04-23 14:42:33 +02:00
Emil Siverhall
1c0dbdfaae
removed panels from project overview
2014-04-23 14:42:22 +02:00
Emil Siverhall
b672af90a4
admin module
2014-04-23 14:34:44 +02:00
Emil Siverhall
776ac48d24
styling, menu highlighting
2014-04-23 13:38:34 +02:00
Emil Siverhall
823cecde44
new page for phd admin
2014-04-23 13:21:29 +02:00
fred-fri
bc81917a59
removed unused pngs
2014-04-23 19:09:27 +09:00
fred-fri
ae2e75b2db
removed deleted imageobject constants
2014-04-23 19:04:55 +09:00
fred-fri
c75ba70c7d
removed deleted imageobjects
2014-04-23 19:02:31 +09:00
fred-fri
0eb318a8e0
fixed visibility
2014-04-23 18:53:25 +09:00
fred-fri
51df2def89
moved annual reviews out of add container
2014-04-23 18:45:12 +09:00
fred-fri
8a7bbe7692
removed duplicate basic contract stuff
2014-04-23 18:37:55 +09:00
fred-fri
3c719441d1
fixed basic contract form
2014-04-23 18:34:35 +09:00
fred-fri
b956e1fcb5
detach issue
2014-04-23 15:57:28 +09:00
Emil Siverhall
785046a914
Merge remote-tracking branch 'origin/develop' into develop
2014-04-23 08:16:50 +02:00
Emil Siverhall
8a999334cc
issues
2014-04-23 08:16:24 +02:00
fred-fri
02e9051291
sonar issues
2014-04-23 15:16:16 +09:00
fred-fri
180097efa3
sonar issues
2014-04-23 15:13:41 +09:00
fred-fri
f009671547
visiblity fixes
2014-04-23 12:05:53 +09:00
Golrokh Moattar
431b22f0e5
styling fixed
2014-04-22 17:38:02 +02:00
c4855fd972
Added confirmation when deleting a file from an activity.
2014-04-22 17:01:42 +02:00
8f5bf075bf
Extended session length.
2014-04-22 16:57:43 +02:00
f1e406db3a
Removed link to norwegian ranking system.
2014-04-22 16:55:47 +02:00
d206e0d0ad
Merge remote-tracking branch 'origin/develop' into develop
2014-04-22 16:54:27 +02:00
06575285c2
Added PhD student news.
2014-04-22 16:54:22 +02:00
Golrokh Moattar
329a3e8a14
Study plan like Research plan
2014-04-22 16:36:08 +02:00
6a41ad31c3
Changed delete file text to delete icon.
2014-04-22 16:17:49 +02:00
8affccaa9d
Fixed test
2014-04-22 16:16:37 +02:00
1c08984eaa
Merge remote-tracking branch 'origin/develop' into develop
2014-04-22 16:06:29 +02:00
60db4c1c97
Changed flag icon to bootstrap.
2014-04-22 16:06:22 +02:00
Golrokh Moattar
0aa230c1e3
Merge remote-tracking branch 'origin/develop' into develop
2014-04-22 15:51:27 +02:00
Golrokh Moattar
9a76705a8c
Wrong page redirection fixed
2014-04-22 15:50:54 +02:00
Emil Siverhall
c48465b517
Merge remote-tracking branch 'origin/develop' into develop
2014-04-22 15:49:14 +02:00
Emil Siverhall
c76b9696ce
activity plan uploads should not be deletable in files tab
2014-04-22 15:45:24 +02:00
Golrokh Moattar
a36e31b1d1
Merge remote-tracking branch 'origin/develop' into develop
2014-04-22 15:40:04 +02:00
Golrokh Moattar
ee772f44dc
Fixed the wrong title. Only 2 latest events show in Latest event panel. Right Project name when user clicks on forum post. Latest comes first.
2014-04-22 15:39:59 +02:00
bb1950f6c6
Removed "View all" link in the milestone summary.
2014-04-22 15:23:57 +02:00
f89e54b8e8
Merge remote-tracking branch 'origin/develop' into develop
2014-04-22 15:09:55 +02:00
8935dca540
Research plan panel now toggles smoothly with javascript.
2014-04-22 15:09:49 +02:00
Emil Siverhall
174bd0162b
Merge remote-tracking branch 'origin/develop' into develop
2014-04-22 15:07:38 +02:00
Emil Siverhall
19c114a253
feedback when saving/deleting as well
2014-04-22 15:07:23 +02:00
9eb3d0f6bb
Study plan panel now toggles smoothly with javascript.
2014-04-22 15:01:45 +02:00
Emil Siverhall
03927f1a59
feedback to external links panel, form is visible if errors exists, feedback messages tells what's wrong.
2014-04-22 15:00:42 +02:00
8727c2999a
HTML fixes.
2014-04-22 14:52:02 +02:00
53b262ab91
Merge remote-tracking branch 'origin/develop' into develop
2014-04-22 14:46:45 +02:00
60008b231b
Fixed styling of header.
2014-04-22 14:46:39 +02:00
Emil Siverhall
03bf645871
fixed excel export for not graded columns
2014-04-22 14:26:32 +02:00
2f0f2671a9
Changed name in header to a profile popup link.
2014-04-22 14:11:42 +02:00
2077469c9b
Moved all modal <divs> to direct children of body to prevent style inheritance and generate valid markup.
2014-04-22 14:10:15 +02:00
Emil Siverhall
9c87ea51a1
added e-mail to supervisor in export of document
2014-04-22 14:03:18 +02:00
Emil Siverhall
0526b40cda
Merge remote-tracking branch 'origin/develop' into develop
2014-04-22 11:36:04 +02:00
Emil Siverhall
97da414872
number of days since seminar configurable through filter option
2014-04-22 11:29:51 +02:00
fred-fri
e7636a8c22
visiblity fixes
2014-04-17 14:42:20 +09:00
fred-fri
3a6fc00eef
icon fixes
2014-04-17 11:54:24 +09:00
fred-fri
c6714c3df1
icon fixes
2014-04-17 11:23:46 +09:00
fred-fri
77eb956e5a
icon fixes
2014-04-17 11:21:39 +09:00
fred-fri
88c65ed4d9
icon fixes
2014-04-17 11:20:02 +09:00
fred-fri
30b709e70d
icon fixes
2014-04-17 11:18:35 +09:00
fred-fri
597709aafd
icon fixes
2014-04-17 11:15:38 +09:00
fred-fri
1b4129d434
icon fixes
2014-04-17 11:03:12 +09:00
fred-fri
57bf31e961
icon fixes
2014-04-17 11:02:40 +09:00
fred-fri
50633c1a22
icon fixes
2014-04-17 10:51:35 +09:00
fred-fri
edf49bcc88
icon fixes
2014-04-17 10:08:05 +09:00
Golrokh Moattar
27dd5bf246
Fixing table columns so that they can be shown in the excel export
2014-04-16 17:18:19 +02:00
Emil Siverhall
c0e719856e
pageable provider, sortable columns, start date column added
2014-04-16 15:44:23 +02:00
Emil Siverhall
efa52f7304
column implementations
2014-04-16 15:24:28 +02:00
Emil Siverhall
f7e3ed3384
base page in admin -> statistics for unfinished seminars
2014-04-16 15:04:43 +02:00
Golrokh Moattar
d405f6211d
Fixing table columns so that they can be shown in the excel export
2014-04-16 15:02:57 +02:00
Golrokh Moattar
2ed5c10129
Fixing table columns so that they can be shown in the excel export
2014-04-16 14:47:07 +02:00
Golrokh Moattar
f96a726516
Fixing table columns so that they can be shown in the excel export
2014-04-16 14:41:48 +02:00
Golrokh Moattar
0c29a757f9
Merge remote-tracking branch 'origin/develop' into develop
2014-04-16 14:00:34 +02:00
Golrokh Moattar
ce9d700601
Fixing table columns so that they can be shown in the excel export
2014-04-16 14:00:27 +02:00
fred-fri
66869ef2a4
icon fixes
2014-04-16 20:13:19 +09:00
fred-fri
699bc82589
fixes
2014-04-16 19:46:12 +09:00
fred-fri
86e9678376
icon fixes
2014-04-16 19:40:13 +09:00
fred-fri
a7f88e02b6
fixes
2014-04-16 19:27:38 +09:00
fred-fri
ed5b695285
column fixes
2014-04-16 19:19:03 +09:00
fred-fri
c1abd96382
icon fixes
2014-04-16 19:16:23 +09:00
fred-fri
213d70800a
Merge remote-tracking branch 'origin/develop' into develop
2014-04-16 18:50:35 +09:00
fred-fri
b78f73beec
icon fixes
2014-04-16 18:50:19 +09:00
Emil Siverhall
c383d2ef26
Merge remote-tracking branch 'origin/develop' into develop
2014-04-16 11:06:29 +02:00
Emil Siverhall
d82725055e
make sure we can't add supervisor as revewier through table cells auto complete
2014-04-16 11:04:59 +02:00
fred-fri
1dd5d1d089
fixed info icon jumping
2014-04-16 17:19:53 +09:00
Golrokh Moattar
8d7dbb1167
Titles in Export excel got fixed
2014-04-15 16:59:14 +02:00
Golrokh Moattar
0cc7b12443
GenericColumn added so that all type of columns will be exportable
2014-04-15 16:48:30 +02:00
Golrokh Moattar
5cf5b39295
GenericColumn added so that all type of columns will be exportable
2014-04-15 16:48:18 +02:00
Golrokh Moattar
c9828fc37d
table styling
2014-04-15 15:55:25 +02:00
Golrokh Moattar
77840028ff
GenericDataPanel used in supervisor->all students ideas
2014-04-15 15:19:28 +02:00
Golrokh Moattar
3edcf1ff28
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 14:38:28 +02:00
Golrokh Moattar
3a925740d0
GenericDataPanel used in author->ideas
2014-04-15 14:34:06 +02:00
Emil Siverhall
f48a8b3dc6
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 14:28:18 +02:00
Emil Siverhall
9282e8cfd2
activity plan uploads now counts as project files
2014-04-15 14:28:04 +02:00
fred-fri
b1e0098031
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 21:06:32 +09:00
fred-fri
8bd0d5c3fa
fixes
2014-04-15 21:06:16 +09:00
Golrokh Moattar
4a3ac4d286
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 13:52:04 +02:00
Golrokh Moattar
48527afcf1
GenericDataPanel used in Admin->Match->Keywords and Research areas->Research areas popup2
2014-04-15 13:50:17 +02:00
fred-fri
a87b850862
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 20:46:36 +09:00
fred-fri
bf91231a35
fixes
2014-04-15 20:46:20 +09:00
Golrokh Moattar
009446e012
fixing errors
2014-04-15 13:41:47 +02:00
Emil Siverhall
e81bc4df6d
FileSource.ACTIVITY_PLAN
2014-04-15 13:40:27 +02:00
Golrokh Moattar
215b0835d1
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 13:35:28 +02:00
fred-fri
3aae6ee775
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanel.java
view/src/main/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanel.java
2014-04-15 19:47:35 +09:00
fred-fri
4569453878
changed to infopanel
2014-04-15 19:44:46 +09:00
Golrokh Moattar
f657890ff3
GenericDataPanel used in Admin->Match->Keywords and Research areas->Research areas popup
2014-04-15 12:13:12 +02:00
Golrokh Moattar
47ed92053a
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 12:00:58 +02:00
Emil Siverhall
ce8cd2b073
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 11:59:15 +02:00
Emil Siverhall
fb6563a348
deactivatable date picker to project management
2014-04-15 11:58:56 +02:00
Golrokh Moattar
febcdc2b0b
GenericDataPanel used in Admin->Match->Ideas->Match history
2014-04-15 11:57:17 +02:00
Golrokh Moattar
93d8304ab3
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 11:42:52 +02:00
Golrokh Moattar
fdaee4a2a3
GenericDataPanel used in Admin->Statistics->Milestones
2014-04-15 11:42:03 +02:00
Emil Siverhall
a95ab9e615
date commenced -> commenced, date approved -> approved
2014-04-15 11:41:38 +02:00
Emil Siverhall
0f424bbc74
date created -> created
2014-04-15 11:34:21 +02:00
fred-fri
e705e7b6bf
changed to smartlinkmultilinelabel
2014-04-15 18:27:27 +09:00
Emil Siverhall
083fc3ddab
project -> title
2014-04-15 11:20:52 +02:00
Emil Siverhall
322054bcba
merge
2014-04-15 11:02:45 +02:00
Emil Siverhall
e38f563d44
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDataPanel.java
2014-04-15 11:02:31 +02:00
Emil Siverhall
c7d5150743
project title -> title
2014-04-15 11:02:12 +02:00
Golrokh Moattar
7bcb6dfcbb
Test fixed
2014-04-15 10:52:09 +02:00
Golrokh Moattar
83590db80b
GenericDataPanel used in Supervisor->All projects->Final seminars
2014-04-15 10:30:37 +02:00
Emil Siverhall
15a7c9d638
project type -> type
2014-04-15 10:18:04 +02:00
Emil Siverhall
aced12e6cb
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 10:15:03 +02:00
Emil Siverhall
7a2c0817b1
project type -> type
2014-04-15 10:14:52 +02:00
Golrokh Moattar
21c21e4ec6
Where ever we just need findAll and count, GenericDataProvider used instead of SortableDataProvider
2014-04-15 09:57:00 +02:00
Golrokh Moattar
2af033b500
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 09:51:39 +02:00
Golrokh Moattar
a6a7bc3309
GenericDataPanel used in Admin->System->Non working days
2014-04-15 09:51:30 +02:00
Emil Siverhall
c3ddd1ae43
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 09:48:31 +02:00
Emil Siverhall
cbdd5f8038
project type -> type
2014-04-15 09:48:21 +02:00
Emil Siverhall
8f3e5d250c
project type -> type
2014-04-15 09:46:28 +02:00
Emil Siverhall
51457f8b6d
project type -> type
2014-04-15 09:42:08 +02:00
Golrokh Moattar
5d93d9011f
GenericDataPanel used in Admin->Statistics->Ideas
2014-04-15 09:37:27 +02:00
Emil Siverhall
e2b0cfe624
project type -> type
2014-04-15 09:30:22 +02:00
fred-fri
848e2e6aa8
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 16:24:53 +09:00
fred-fri
67a506ef37
improved error message with email
2014-04-15 16:24:38 +09:00
Emil Siverhall
06041a12ee
project type -> type
2014-04-15 09:23:26 +02:00
Emil Siverhall
c544cb7386
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 08:31:52 +02:00
Emil Siverhall
0389cc8412
added enclosure to hide the whole div when settings link isn't visible
2014-04-15 08:31:12 +02:00
fred-fri
836e557436
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 15:31:06 +09:00
fred-fri
4c28e31766
added info about reports being visible to authors
2014-04-15 15:30:41 +09:00
Emil Siverhall
ef450c0bfc
removed bottom space
2014-04-15 08:29:31 +02:00
Emil Siverhall
aed9041558
switched sides
2014-04-15 08:28:49 +02:00
Emil Siverhall
820a1744e0
moved filter up a row
2014-04-15 08:16:13 +02:00
Golrokh Moattar
81c63c377a
Merge remote-tracking branch 'origin/develop' into develop
2014-04-14 17:13:11 +02:00
Golrokh Moattar
2c6c20c389
GenericDataPanel used in Admin->Statistics->Peers (Peer requests)
2014-04-14 17:12:59 +02:00
Emil Siverhall
017031c656
yep
2014-04-14 16:47:18 +02:00
Golrokh Moattar
26694ffc30
GenericDataPanel used in Admin->Statistics->Peers (Peer reviews)
2014-04-14 16:39:49 +02:00
Emil Siverhall
e4a2d60aeb
yep yep
2014-04-14 16:38:55 +02:00
Emil Siverhall
d00629be98
supervisor change mail to specified addresses if head supervisor changed on a project
2014-04-14 16:29:43 +02:00
Golrokh Moattar
2ba0245d72
All data tables use class="table table-striped table-hover"
2014-04-14 16:13:46 +02:00
Golrokh Moattar
0a3cd75a53
Merge remote-tracking branch 'origin/develop' into develop
2014-04-14 15:45:58 +02:00
Golrokh Moattar
af6ac3e77b
GenericDataPanel used in Admin->Statistics->Supervisors ideas and projects
2014-04-14 15:45:48 +02:00
Emil Siverhall
aa6289de28
Merge remote-tracking branch 'origin/develop' into develop
2014-04-14 15:39:34 +02:00
Emil Siverhall
7ace73c133
minor styling changes to perform review
2014-04-14 15:39:21 +02:00
Golrokh Moattar
069b59c38e
Merge remote-tracking branch 'origin/develop' into develop
2014-04-14 15:30:06 +02:00
Golrokh Moattar
8df93bcb67
GenericDataPanel used in Admin->Statistics->Units
2014-04-14 15:29:55 +02:00
Emil Siverhall
0c5748177d
Merge remote-tracking branch 'origin/develop' into develop
2014-04-14 14:54:56 +02:00
Golrokh Moattar
bf88eb934b
GenericDataPanel used in Admin->Users->Roles
2014-04-14 14:49:08 +02:00
Emil Siverhall
6c8e782234
added auto complete filter for "from"
2014-04-14 14:41:35 +02:00
Emil Siverhall
0f9151bb03
replaced generic data panel on notifications tab
2014-04-14 14:19:00 +02:00
Richard
9e53116c3d
Removed "type" from Idea Type on admin -> match.
2014-04-14 12:27:43 +02:00
Richard
e32bd35006
Bootstrap help icon (questionmark) are now blue.
...
Added blue border around the help box.
Help box background is now white.
2014-04-14 12:26:33 +02:00
75f62448d3
Fixed so that multiple submissions are possible without reloading the page.
2014-04-11 14:55:31 +02:00
Richard
81b8099054
Header cleanup.
2014-04-11 11:11:06 +02:00
Richard
5dd7da2854
Header cleanup.
...
Moved role to the right.
2014-04-11 11:03:11 +02:00
Richard
c219e57541
Updated help text about language in peer requests and reviews.
2014-04-11 10:00:40 +02:00
fred-fri
35ab1b0248
fixes
2014-04-11 13:47:06 +09:00
ccf0e1fe9c
Some Wicket touch-ups.
2014-04-10 15:13:39 +02:00
3c30091775
Bootstrap styled the form for adding new transactions.
...
Changed bean property to Integer to render the placeholder instead of 0.
2014-04-10 15:04:47 +02:00
7622d4b9d0
Changed delete link to red cross.
...
Minor HTML fixes.
2014-04-10 14:48:07 +02:00
c8bcf178e1
It is decided by module.
2014-04-10 14:41:50 +02:00
dfa983a23f
Everyone is allowed to delete.
2014-04-10 14:39:08 +02:00
7e5e22fe32
Changed default per/page count to 100 on the supervisor project overview panel.
2014-04-10 14:37:14 +02:00
b030ce04e6
Only peer checklists with the correct project type are displayed for selection when submitting a peer request.
2014-04-10 14:32:02 +02:00
0f6e73d368
Deleted test since icons have been removed.
2014-04-10 13:58:22 +02:00
68638c873a
Updated delete link path since two columns got removed.
2014-04-10 13:57:45 +02:00
c28ac42c02
Merge remote-tracking branch 'origin/develop' into develop
2014-04-10 13:55:58 +02:00
3930774d34
Added spacing
2014-04-10 13:55:52 +02:00
Richard
70e8562116
CSS-cleanup.
2014-04-10 13:54:41 +02:00
9407561136
Removed invalid test.
2014-04-10 13:49:13 +02:00
f3d87f1b45
Removed reference to the download icon.
2014-04-10 13:47:56 +02:00
7364e7e05f
Removed icon download icon.
2014-04-10 13:47:21 +02:00
f715530ff0
Removed icons for download/open.
2014-04-10 13:45:36 +02:00
7bc897e9e9
Removed icons for download/open.
2014-04-10 13:44:55 +02:00
b9ac7af315
Sonar.
2014-04-10 13:25:25 +02:00
151e740497
All projects can now be (in)activated in SciPro.
2014-04-10 13:25:09 +02:00
355c0cc776
Seriously...
2014-04-10 13:19:53 +02:00
845abdb838
These tests are stupid and just hinder change. Tests should test functionality not implementation details.
2014-04-10 13:14:42 +02:00
9bb0c0f8e1
Fixed styling of external links.
2014-04-10 13:05:34 +02:00
388ab5d3e4
Fixed warnings.
2014-04-10 11:40:09 +02:00
b275d2cff6
Styled submit button to be consistent with the other submit buttons on the overview page.
2014-04-10 11:39:25 +02:00
f645c9b4b3
Added toggling of the info-text.
2014-04-10 11:37:56 +02:00
835f6a3dca
Fixed info text.
2014-04-10 11:10:41 +02:00
867525b56a
Added reviewer resources to the footer.
2014-04-10 11:08:21 +02:00
9b11d6e5ab
Changed from button to link and changed the text.
2014-04-10 11:06:36 +02:00
32bbd56ed2
Fixed Wicket XML namespace.
2014-04-10 10:57:29 +02:00
611b64a2e3
Removed unused constructor and inlined the commonInit method.
2014-04-10 10:56:31 +02:00
3bb6fbaafe
Inlined the panel.
2014-04-10 10:56:06 +02:00
f6e7e6f95e
Fixed warnings.
2014-04-10 10:50:53 +02:00
7aa53717d8
Merge remote-tracking branch 'origin/develop' into develop
2014-04-10 10:48:22 +02:00
61f67f70f1
Changed how the system notice is stored from a field in SciProApplication to using Wickets metadata functionality.
2014-04-10 10:48:16 +02:00
Richard
a11216cf91
Merge remote-tracking branch 'origin/develop' into develop
2014-04-10 10:43:47 +02:00
Richard
b1e16453d3
Added table and table-striped classes on EconomyPanel.
...
Moved Date to the left.
2014-04-10 10:43:41 +02:00
71b4a51d22
Removed stupid stuff that eventually did nothing.
2014-04-10 10:43:20 +02:00
fred-fri
fa52873b0d
Merge remote-tracking branch 'origin/develop' into develop
2014-04-10 17:43:17 +09:00
fred-fri
432ecfc0e1
moved my settings link
2014-04-10 17:33:00 +09:00
Richard
4b843dfaa3
Width on DepartmentService table columns.
2014-04-10 10:30:30 +02:00
Richard
dae2557f9f
Merge remote-tracking branch 'origin/develop' into develop
2014-04-10 10:24:01 +02:00
Richard
79e54aed5d
Added new help-box div.
...
Added the help-box div to DepartmentServicePanel.
2014-04-10 10:23:53 +02:00
fred-fri
9e779f30be
missing stuff
2014-04-10 17:04:30 +09:00
fred-fri
b761a789b0
added budget module and annotated relevant components
2014-04-10 16:50:40 +09:00
fred-fri
84567189c5
Merge remote-tracking branch 'origin/develop' into develop
2014-04-10 16:45:47 +09:00
fred-fri
e02e877bd7
date fix
2014-04-10 16:45:29 +09:00
85c5375d11
Merge remote-tracking branch 'origin/develop' into develop
2014-04-10 09:35:31 +02:00
9b77dac996
Fixed critical security exploit. No longer possible to create sys-admin users at any point by going to the url leading to the FirstTimeRegistrationPage.
2014-04-10 09:35:12 +02:00
Richard
b70ac8da83
Added overview-box to DepartmentServicePanel.
...
Moved DepartmentService below upcoming activities.
2014-04-10 09:30:15 +02:00
fred-fri
5f29c69867
date fix
2014-04-10 15:29:08 +09:00
fred-fri
87a28205a4
us visa style info
2014-04-10 14:31:48 +09:00
fred-fri
2d44f5d979
sonar
2014-04-10 12:16:51 +09:00
fred-fri
d0d67b2401
sonar
2014-04-10 12:15:59 +09:00
fred-fri
fbbe65770f
sonar
2014-04-10 12:13:38 +09:00
fred-fri
d5f733757c
sonar
2014-04-10 12:06:26 +09:00
fred-fri
931e12d07a
sonar
2014-04-10 11:54:22 +09:00
fred-fri
0942a2bce4
title change
2014-04-10 11:10:21 +09:00
Golrokh Moattar
99064df9c3
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 17:33:21 +02:00
Golrokh Moattar
05b64bc3fb
GenericDataPanel used in Admin->Match->Keywords & research areas
2014-04-09 17:33:16 +02:00
36326acc66
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 17:28:37 +02:00
fc7449f064
Pushed deprecated annotation.
2014-04-09 17:28:32 +02:00
83ae64ebbf
Changed DateFormatter to DateLabel.
2014-04-09 17:24:44 +02:00
5e44d178aa
Changed DateFormatter to DateLabel.
2014-04-09 17:21:42 +02:00
abf9f6e989
Changed DateFormatter to DateLabel.
2014-04-09 17:21:23 +02:00
7a191589dc
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 17:20:55 +02:00
9c2d368308
Changed DateFormatter to DateLabel.
2014-04-09 17:20:24 +02:00
5087be5f5e
Changed DateFormatter to DateLabel and other minor things.
...
Also wtf? Holy null-check-batman
2014-04-09 17:20:05 +02:00
Golrokh Moattar
f86f346291
GenericDataPanel used in Admin->Match->Keywords & research areas
2014-04-09 17:13:45 +02:00
Golrokh Moattar
31438beb6e
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 16:56:48 +02:00
Golrokh Moattar
a73a554274
There no export link in the AdminIdeaOverviewPanel, the export should be done by dataTable's export link
2014-04-09 16:56:40 +02:00
c5ce649ef0
Changed DateFormatter to DateLabel and other minor things.
2014-04-09 16:54:58 +02:00
8b0b881c9c
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 16:43:31 +02:00
52a6f4eb63
Removed unused stuff.
2014-04-09 16:40:41 +02:00
Golrokh Moattar
f3d6ca9281
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 16:36:45 +02:00
Golrokh Moattar
20dce4e35f
GenericDataPanel used in Admin->Match->Ideas
2014-04-09 16:36:40 +02:00
Emil Siverhall
2004dac050
working links in forum without threads
2014-04-09 16:26:51 +02:00
Emil Siverhall
a9bfdeaaed
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 16:22:51 +02:00
Emil Siverhall
d68bbc79bc
test fix
2014-04-09 16:20:14 +02:00
10ba7e17c3
Changed DateFormatter to DateLabel.
2014-04-09 16:09:45 +02:00
Emil Siverhall
bae56a0ef5
don't show attachment panel before report is submitted
2014-04-09 16:09:08 +02:00
d026b2aea8
Changed DateFormatter to DateLabel.
2014-04-09 16:08:14 +02:00
ac0fe74323
Removed unused class.
2014-04-09 16:06:22 +02:00
92034c1954
Changed DateFormatter to DateLabel.
...
Other minor refactorings.
2014-04-09 16:05:29 +02:00
5d595486a0
Added constructor only taking id to enable model inheritance.
2014-04-09 16:04:28 +02:00
Emil Siverhall
e2d62ed668
file attachment on save instead of submit when handling opposition- and preliminary grading reports
2014-04-09 16:02:05 +02:00
41fbe2f1d0
Changed DateFormatter to DateLabel.
2014-04-09 16:00:32 +02:00
085dc38d00
Changed DateFormatter to DateLabel.
2014-04-09 15:59:59 +02:00
f1ef48ab21
Changed DateFormatter to DateLabel.
2014-04-09 15:59:30 +02:00
cb338c975b
Changed DateFormatter to DateLabel.
2014-04-09 15:58:42 +02:00
f5130583a2
Changed DateFormatter to DateLabel.
2014-04-09 15:56:48 +02:00
6e950bf792
Changed DateFormatter to DateLabel.
2014-04-09 15:56:41 +02:00
9c04d8c846
Changed DateFormatter to DateLabel.
2014-04-09 15:55:23 +02:00
a024448e1a
Changed DateFormatter to DateLabel.
2014-04-09 15:54:19 +02:00
90712a1e0d
Changed DateFormatter to DateLabel.
2014-04-09 15:52:24 +02:00
c5393f6a9f
Changed DateFormatter to DateLabel.
2014-04-09 15:51:57 +02:00
9cd86e2dad
Changed DateFormatter to DateLabel.
2014-04-09 15:50:29 +02:00
ac1c422cfa
Changed DateFormatter to DateLabel.
2014-04-09 15:49:48 +02:00
9c8b7b65ac
Changed DateFormatter to DateLabel.
2014-04-09 15:48:54 +02:00
6c06584cdb
Changed DateFormatter to DateLabel.
2014-04-09 15:48:18 +02:00
4a7ce99a79
Changed DateFormatter to DateLabel.
2014-04-09 15:47:24 +02:00
895e84b241
Changed DateFormatter to DateLabel.
2014-04-09 15:46:44 +02:00
1339c5ab04
Changed DateFormatter to DateLabel.
2014-04-09 15:46:08 +02:00
768bbf16e6
Changed DateFormatter to DateLabel.
2014-04-09 15:45:19 +02:00
3bccec1984
Changed DateFormatter to DateLabel.
2014-04-09 15:44:34 +02:00
ffdbd0e0c5
Changed DateFormatter to DateLabel.
2014-04-09 15:43:53 +02:00
b9f39aac80
Changed DateFormatter to DateLabel.
2014-04-09 15:43:26 +02:00
763fdde1ee
Changed DateFormatter to DateLabel.
2014-04-09 15:41:25 +02:00
Golrokh Moattar
e51d36d1a3
GenericDataPanel used in Admin->Project management-> Projects
2014-04-09 15:40:57 +02:00
9e30e8ecbc
Changed DateFormatter to DateLabel.
2014-04-09 15:40:23 +02:00
fbe014f88c
Changed DateFormatter to DateLabel.
2014-04-09 15:37:37 +02:00
Golrokh Moattar
951f7c575a
Test class added for ProjectMyIdeaPanel
2014-04-09 15:24:21 +02:00
Golrokh Moattar
5f86d22aa8
GenericDataPanel used in Admin->Project management-> Final seminars
2014-04-09 15:18:44 +02:00
Golrokh Moattar
7f71526ea7
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 14:54:57 +02:00
Emil Siverhall
204fa6a59f
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 14:13:45 +02:00
Emil Siverhall
4f5f4a9a4d
info dialog in department service header, explaning gru need to approve
2014-04-09 14:13:34 +02:00
Golrokh Moattar
dd0a2d3434
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 14:06:41 +02:00
Golrokh Moattar
c3b3269f1a
removed property file since we get warnings: Tried to retrieve a localized string for a component that has not yet been added to the page. This can sometimes lead to an invalid or no localized resource returned. Make sure you are not calling Component#getString() inside your Component's constructor.
2014-04-09 14:06:30 +02:00
Golrokh Moattar
30442f4719
GenericDataPanel used in Author->Ideas->My idea
2014-04-09 13:58:19 +02:00
fred-fri
e326d14b20
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 20:56:01 +09:00
fred-fri
9583543767
working on transactions
2014-04-09 20:54:47 +09:00
fred-fri
8b11facb6d
working on transactions
2014-04-09 20:37:58 +09:00
0845bd9bf4
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 13:35:19 +02:00
ca904c5705
Changed DateFormatter to DateLabel.
2014-04-09 13:34:47 +02:00
Emil Siverhall
43c8ec7d30
property for hours.required
2014-04-09 13:23:57 +02:00
4f9247d2c9
Changed Worker interface to fit our actual worker needs. Used the Worker interface instead of AbstractWorker everywhere.
2014-04-09 13:20:54 +02:00
Emil Siverhall
ec5aec9e73
make sure submission form is visible when form validation fails
2014-04-09 13:19:39 +02:00
f5a1dec19f
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 13:03:19 +02:00
Emil Siverhall
d0b0d12ae6
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 13:00:29 +02:00
fred-fri
c8caab2e64
working on transactions
2014-04-09 19:45:06 +09:00
Emil Siverhall
968e7c533d
hide/show all link only visible if previous exists
2014-04-09 12:34:16 +02:00
85c2751e43
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 12:30:27 +02:00
fred-fri
d1cc8ab1c7
working on transactions
2014-04-09 19:25:26 +09:00
7f0eabbccb
Removed the generic parameter from Task.
2014-04-09 12:22:47 +02:00
Golrokh Moattar
92263a1817
test problem fixed
2014-04-09 11:41:51 +02:00
Golrokh Moattar
f976d14527
test problem fixed
2014-04-09 11:34:24 +02:00
Emil Siverhall
45728452b6
deletion of service objects implemented
2014-04-09 11:06:55 +02:00
Emil Siverhall
79b857bfb2
cleanup
2014-04-09 10:47:41 +02:00
Emil Siverhall
bc5f165207
feedback fix
2014-04-09 10:35:31 +02:00
d3e3c20a7f
Refactored so that Scheduler exposes Tasks, not AbstractWorker.
2014-04-09 10:13:49 +02:00
400ea78dcc
Manually starting tasks is now done via the scheduler.
2014-04-09 09:55:10 +02:00
275ae7afab
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 09:51:31 +02:00
Emil Siverhall
d22696ee77
buttons now work fine with more than one participant
2014-04-09 09:46:42 +02:00
Richard
0ac513c65a
Merge remote-tracking branch 'origin/develop' into develop
2014-04-09 09:37:13 +02:00
Richard
b161aa0674
Added new SciPro Projects header.
...
Changed title to SciPro Projects, DSV
2014-04-09 09:35:55 +02:00
c184fcb464
Renamed WorkerSchedule to Task
2014-04-09 09:30:23 +02:00
Emil Siverhall
02a6b86449
added department service panel to supervisor view as well
2014-04-09 08:59:16 +02:00
fred-fri
e1fe56abf0
creating transaction entity
2014-04-09 13:00:11 +09:00
Emil Siverhall
84f37d9181
Merge remote-tracking branch 'origin/develop' into develop
2014-04-08 19:53:14 +02:00
Emil Siverhall
458be4486a
local feedback in study plan panel
2014-04-08 19:53:04 +02:00
Golrokh Moattar
dc00210260
Merge remote-tracking branch 'origin/develop' into develop
2014-04-08 17:45:21 +02:00
Golrokh Moattar
5d471999f5
GenericDataPanel used in Supervisor->Reviewing->Final seminar preliminary grading report and Examiner->Examining->Final seminar preliminary grading report
2014-04-08 17:45:14 +02:00
Emil Siverhall
1be4924511
fixed test
2014-04-08 17:44:58 +02:00
Emil Siverhall
0ce0143630
Merge remote-tracking branch 'origin/develop' into develop
2014-04-08 17:17:10 +02:00
Emil Siverhall
40a4813a69
feedback on correct place in research plan panel
2014-04-08 17:10:38 +02:00
Golrokh Moattar
524f046d80
Merge remote-tracking branch 'origin/develop' into develop
2014-04-08 17:09:16 +02:00
Golrokh Moattar
e9bd729fae
GenericDataPanel used in Supervisor->Reviewing->Final seminar preliminary grading report and Examiner->Examining->Final seminar preliminary grading report
2014-04-08 17:08:45 +02:00
Emil Siverhall
b00a5ee696
Merge remote-tracking branch 'origin/develop' into develop
2014-04-08 17:03:05 +02:00
Emil Siverhall
f6975e68fa
display
2014-04-08 17:02:30 +02:00
Emil Siverhall
cfe6257664
test
2014-04-08 16:59:33 +02:00
Emil Siverhall
d78de35209
2 x department service panels
2014-04-08 16:50:20 +02:00
b0625753e9
Merge remote-tracking branch 'origin/develop' into develop
2014-04-08 16:46:11 +02:00
eb6fe5f62a
Renamed class to reflect its new purpose.
2014-04-08 16:46:01 +02:00
caae63a700
Minor cleaning.
2014-04-08 16:45:36 +02:00
f0e097ba64
Scheduler/GuiceWebApplication is no longer responsible for scheduling workers. It is now done by the temporary (yeah right) TemporaryWorkerScheduler.
2014-04-08 16:44:35 +02:00
Emil Siverhall
6c794a1425
obladi oblada
2014-04-08 16:33:18 +02:00
Golrokh Moattar
0a68951c27
GenericDataPanel2 to GenericDataPanel & GenericDataPanel to GenericDataPanel_
2014-04-08 16:32:08 +02:00
Golrokh Moattar
88e677413f
Merge remote-tracking branch 'origin/develop' into develop
2014-04-08 16:27:54 +02:00
Golrokh Moattar
bd4f3ce970
GenericDataPanel used in Supervisor->MyProject-> Opposition & Active participations
2014-04-08 16:27:35 +02:00
737dd6026b
Merge remote-tracking branch 'origin/develop' into develop
2014-04-08 15:50:12 +02:00
7310ff6b59
Moved the project exporter and user bulk import to the daisy-integration module.
2014-04-08 15:38:43 +02:00
33a5096ce9
Removed all the static stuff that was left in the Scheduler and hid the implementation behind an interface.
2014-04-08 15:26:53 +02:00
Golrokh Moattar
be5b87a1e1
GenericDataPanel used in Supervisor->MyProject-> Files
2014-04-08 15:02:08 +02:00
Golrokh Moattar
760964291a
Merge remote-tracking branch 'origin/develop' into develop
2014-04-08 14:51:15 +02:00
Golrokh Moattar
c801597c4a
bootstrap styling on navigations
2014-04-08 14:51:07 +02:00
5a4c8b8dfc
Moved worker-related stuff to core.
2014-04-08 14:16:41 +02:00
Emil Siverhall
b065de67e2
removed feedback from page and added department service panel (visibility based on module settings)
2014-04-08 13:58:40 +02:00
Emil Siverhall
31a6da8e90
feedback for department service panel
2014-04-08 13:57:13 +02:00
63bf727ece
Cleaning.
2014-04-08 13:50:17 +02:00
38acd2b571
Made it possible for outside components to schedule workers.
...
It should not be the schedulers responsibility to schedule them all, just running them on schedule.
2014-04-08 13:43:33 +02:00
Emil Siverhall
68e1aa612b
list all department services
2014-04-08 13:17:01 +02:00
0d8fb19459
Removed unused field.
2014-04-08 12:30:06 +02:00
2cabfada93
Fixed Wicket to use DEPLOYMENT when in production mode.
2014-04-08 12:29:15 +02:00
c9f02ead54
Merge remote-tracking branch 'origin/develop' into develop
2014-04-08 12:06:40 +02:00
04556971e3
Fixed Wicket to use DEPLOYMENT when in production mode.
2014-04-08 12:06:28 +02:00
Emil Siverhall
75bf466ee1
department_service module added
2014-04-08 10:05:21 +02:00
Golrokh Moattar
5fe83f890e
in SupervisorMyProjectsPanel, GenericDataPanel changed to GenericDataPanel2
2014-04-07 17:19:19 +02:00
Golrokh Moattar
bfd9830ffa
In DataTable: Rows per page should be always visible but pagination should be visible only if there is more than one page
2014-04-07 16:57:20 +02:00
Emil Siverhall
a8d37dc63f
feedback when saving department service
2014-04-07 16:44:13 +02:00
Emil Siverhall
b67adefaea
no current label visibility
2014-04-07 16:34:24 +02:00
Emil Siverhall
3424ecc56a
basic styling
2014-04-07 16:27:18 +02:00
Emil Siverhall
73f6bfd2b6
DateTimeField -> DateField
2014-04-07 15:24:30 +02:00
Golrokh Moattar
300aae4e48
In DataTable: Rows per page should be always visible but pagination should be visible only if there is more than one page
2014-04-07 15:16:47 +02:00
Emil Siverhall
55cc94d702
implemented service method
2014-04-07 14:34:54 +02:00
Golrokh Moattar
c18b6bfc99
Added Download as Excel to the dataTable - bottom toolbar
2014-04-07 13:48:42 +02:00
1a878ceccb
Uses GuiceWebApplicationFactory to create the wicket application to enable transparent injection.
2014-04-07 13:02:25 +02:00
Emil Siverhall
a9866c1661
basic form implementations
2014-04-07 13:00:29 +02:00
Golrokh Moattar
e3f44bfa3b
Merge remote-tracking branch 'origin/develop' into develop
2014-04-07 12:42:12 +02:00
d11e2023ed
Renamed class to better reflect what it does.
2014-04-07 12:23:53 +02:00
93c05a7e78
Removed some unnecessary mocks.
2014-04-07 11:28:56 +02:00
d00fb9718b
Added the concept of life-cycles to the Guice components.
2014-04-07 11:27:01 +02:00
546f05ea4b
Merge remote-tracking branch 'origin/develop' into develop
2014-04-07 10:27:00 +02:00
49cce736ba
Clean up.
2014-04-07 10:26:50 +02:00
fred-fri
47a259232a
fixed remove bug
2014-04-06 14:40:21 +09:00
df3713d31d
Test fixes.
2014-04-05 23:47:00 +02:00
89c1627332
Fixed stuff.
2014-04-05 13:14:38 +02:00
33469cd866
Refactored AbstractWorker to work with providers instead of classes and an injector reference.
2014-04-04 16:31:44 +02:00
3c83bb9bad
Removed unnecessary class WorkerTimerTask.
2014-04-04 16:17:11 +02:00
d563db2e2c
Merge remote-tracking branch 'origin/develop' into develop
2014-04-04 15:53:51 +02:00
d1f70f215e
Made Scheduler a Guice-managed singleton.
2014-04-04 15:53:08 +02:00
Emil Siverhall
3eb6858d74
DisplayQuestionPanel simplified
2014-04-04 15:45:44 +02:00
Emil Siverhall
789bf2b0b6
ExpandableMultiLineLabel, thank you, goodbye
2014-04-04 14:33:37 +02:00
Emil Siverhall
4a10f579fb
added sso setting to Admin -> General settings
2014-04-04 14:20:26 +02:00
Emil Siverhall
1ef7c64e70
sso part of loginpage now displayed based on setting
2014-04-04 14:17:03 +02:00
Emil Siverhall
bf4b3bd55c
removed code that should display logged in users named based on Shibb header. Never worked..
2014-04-04 13:39:52 +02:00
Emil Siverhall
96ff5d20ef
bachelorCountDate and masterCountDate in GeneralSystemSettings haven't been used for years..
2014-04-04 13:20:21 +02:00
38e904e0d0
Added line-break.
2014-04-04 12:56:24 +02:00
Emil Siverhall
bd581ccd91
style changes
2014-04-04 12:55:09 +02:00
Emil Siverhall
c3661d1375
detach on deletion to update properly
2014-04-04 12:12:40 +02:00
Emil Siverhall
c6b1bee117
ViewAttachmentPanel shows date if datestyle is provided
2014-04-04 11:47:06 +02:00
Emil Siverhall
a551b9ea5b
deletion of current research plan implemented
2014-04-04 10:42:47 +02:00
40b8ade56a
Merge remote-tracking branch 'origin/develop' into develop
2014-04-04 09:49:38 +02:00
e18a3f9750
Fixed some Sonar issues.
2014-04-04 09:42:38 +02:00
c62f906ae4
Naming fix for package (part 2/2)
2014-04-04 09:39:31 +02:00
e91222b624
Naming fix for package (part 1/2)
2014-04-04 09:39:20 +02:00
Emil Siverhall
1c5c9d3b13
Merge remote-tracking branch 'origin/develop' into develop
2014-04-04 09:38:16 +02:00
577e353d7d
Merge remote-tracking branch 'origin/develop' into develop
2014-04-04 09:32:49 +02:00
6828005c37
The form to add an external link is now hidden by default. Can be toggled with a button.
2014-04-04 09:32:31 +02:00
6217329cde
Moved external link back to the right column.
2014-04-04 09:29:07 +02:00
a46283daa0
Bootstrapified the add new form.
2014-04-04 09:26:09 +02:00
6358c9b231
Refactoring.
2014-04-04 09:16:50 +02:00
db8792ee41
Minor HTML fixes.
2014-04-04 09:15:36 +02:00
Emil Siverhall
f5ae2e0ffc
removed all thesis link entities
2014-04-04 09:12:17 +02:00
Emil Siverhall
51b2c8b209
delete of research plans
2014-04-04 09:06:50 +02:00
3d641af075
Revert: Navigation toolbar can only be seen if there is more than one page in data table ( 9dfdeca2c0)
2014-04-04 09:03:24 +02:00
Emil Siverhall
adf13ea1a1
fixed upload of more than one research plan without refreshing the page
2014-04-04 08:27:32 +02:00
Emil Siverhall
761718c27b
proper properties for range validator
2014-04-03 15:17:08 +02:00
Emil Siverhall
d6de5de274
add a new study panel on upload of basic contract instead of when creating project.
2014-04-03 15:04:13 +02:00
Emil Siverhall
65c17f4c5b
removed phdservice since this should be part of study plan service
2014-04-03 14:25:45 +02:00
Emil Siverhall
79196bc8a7
test fix
2014-04-03 14:08:24 +02:00
Emil Siverhall
cba7aec7fd
added research plan panel to supervisor view as well..
2014-04-03 13:56:15 +02:00
Emil Siverhall
6fbc67c69c
Merge remote-tracking branch 'origin/develop' into develop
2014-04-03 13:41:06 +02:00
Emil Siverhall
151bd1c387
view attachment panels dateVisible changed to use a Setter
2014-04-03 13:40:40 +02:00
Emil Siverhall
963c911c74
research plan module + feedback
2014-04-03 13:22:12 +02:00
85b9211dbd
Switched Timer to a ScheduledExecutorService.
2014-04-03 13:04:38 +02:00
Emil Siverhall
e7ca75c3c5
show history
2014-04-03 13:02:30 +02:00
fred-fri
be14398160
externalfile
2014-04-03 19:38:14 +09:00
fred-fri
a0f971386e
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java
2014-04-03 19:35:08 +09:00
fred-fri
cd63c9f656
externalfile
2014-04-03 19:32:43 +09:00
Emil Siverhall
1cc8adb8b2
display current research plan, if existing
2014-04-03 11:14:49 +02:00
3f3a960fbb
Bleh
2014-04-03 10:55:34 +02:00
eb35196f44
Removed isIdeaExportable(Idea) method and merged the conditions into the database fetch.
2014-04-03 10:01:37 +02:00
dc65c600d6
Merge remote-tracking branch 'origin/develop' into develop
2014-04-03 09:28:16 +02:00
e27dc6238a
Cleaning in the test.
2014-04-03 09:27:33 +02:00
0aa4f2f1f7
Removed explicit setting of default values.
2014-04-03 09:25:37 +02:00
fe3119eec4
Removed unused dependencies.
2014-04-03 09:25:06 +02:00
e35c987edf
Starting a project from an idea now adds a completed match to the idea.
2014-04-03 09:23:59 +02:00
Emil Siverhall
e87aa92d83
Merge remote-tracking branch 'origin/develop' into develop
2014-04-03 08:25:28 +02:00
Emil Siverhall
966a9a9569
Project -> Title on final theses listing
2014-04-03 08:25:07 +02:00
Emil Siverhall
a736228cc9
module and beta annotation
2014-04-03 08:14:51 +02:00
Emil Siverhall
31a81ef2ce
basic upload for research plan implemented in panel
2014-04-02 15:38:49 +02:00
Golrokh Moattar
cc11a6486f
change in stylesheet for data table navigation bar
2014-04-02 14:55:37 +02:00
Golrokh Moattar
9dfdeca2c0
Navigation toolbar can only be seen if there is more than one page in data table
2014-04-02 14:12:38 +02:00
Golrokh Moattar
24fa0d0212
Added norwegian grade link to phd links
2014-04-02 14:11:42 +02:00
Emil Siverhall
fc4fcafed9
removed check to see if study plan exists in onConfigure for the PhDLinkPanel. visibility based on module only.
2014-04-02 13:25:30 +02:00
Emil Siverhall
945cea40b4
only display approved final theses
2014-04-02 12:15:07 +02:00
Emil Siverhall
87d7f404df
Merge remote-tracking branch 'origin/develop' into develop
2014-04-02 10:41:56 +02:00
Emil Siverhall
00cc8a8b0d
all final theses displayed
2014-04-02 10:36:26 +02:00
Golrokh Moattar
7a4cc9e528
Changed important links to phd links
2014-04-02 10:20:52 +02:00
Emil Siverhall
cc037e0da8
base page for final theses listing added
2014-04-02 09:36:38 +02:00
Emil Siverhall
b5ab6fab26
make sure master may select ideas..
2014-04-02 09:27:04 +02:00
Emil Siverhall
a07d59c0fc
make sure checkbox in accept idea dialog panel actually do something..
2014-04-02 09:13:19 +02:00
fred-fri
695e6065bf
in progress
2014-04-02 13:11:44 +09:00
fred-fri
0fa7c1d397
happy tests
2014-04-02 12:34:34 +09:00
fred-fri
396cdc659c
im a fucking genious. savebutton editable and feedback only when appropriate
2014-04-02 12:17:01 +09:00
cc897ccf8c
Notifications are now sent when a project is started from an idea.
2014-04-01 17:40:57 +02:00
Golrokh Moattar
d72779fe48
Merge remote-tracking branch 'origin/develop' into develop
2014-04-01 17:21:25 +02:00
Golrokh Moattar
0da12b597e
Just 5 latest events can be shown up in the project overview
2014-04-01 17:21:17 +02:00
5e5d68a371
Rewrote IdeaExportWorker so that it no longer is dependent on Daisy to function.
2014-04-01 16:37:24 +02:00
82a69d0652
Merge remote-tracking branch 'origin/develop' into develop
2014-04-01 15:24:13 +02:00
Emil Siverhall
739eb2b1b2
clickable titles on opposition/prel grading reports
2014-04-01 14:44:49 +02:00
Emil Siverhall
2294b75294
make sure to hide everything associated with the "old" opposition report panel if no file exists..
2014-04-01 14:28:52 +02:00
fred-fri
a33979b47a
fixed bug
2014-04-01 15:35:59 +09:00
Emil Siverhall
8434890bb1
removed isSupervisor from project service
2014-03-31 16:11:32 +02:00
Emil Siverhall
61b57fe2dd
tests...
2014-03-31 15:45:54 +02:00
4dd7461d60
Removed stupid boolean.
...
Removed export button.
2014-03-31 15:39:14 +02:00
Emil Siverhall
3ad4d56b13
Merge remote-tracking branch 'origin/develop' into develop
2014-03-31 15:35:02 +02:00
Emil Siverhall
f1ebbe2571
removed isAuthor and isReviewer from project service since this is handled by the project
2014-03-31 15:34:49 +02:00
577f581576
Fixed badly defined constant.
2014-03-31 15:23:39 +02:00
Golrokh Moattar
2f8686065b
Merge remote-tracking branch 'origin/develop' into develop
2014-03-31 14:51:34 +02:00
Golrokh Moattar
a7dd85be6b
Sorting in latest events done
2014-03-31 14:51:12 +02:00
c5b0161559
Merge remote-tracking branch 'origin/develop' into develop
2014-03-31 14:38:40 +02:00
c09a2e265d
Fixed CurrentUser in tests.
2014-03-31 14:38:30 +02:00
fred-fri
3d9e2cce36
Merge remote-tracking branch 'origin/develop' into develop
2014-03-31 21:28:26 +09:00
fred-fri
48ab7eb0ef
fixed save
2014-03-31 21:27:42 +09:00
a89663a7e8
Merge remote-tracking branch 'origin/develop' into develop
2014-03-31 14:13:33 +02:00
01961db472
Clean up old authentication code.
2014-03-31 14:13:29 +02:00
Emil Siverhall
6e6d1681b1
Merge remote-tracking branch 'origin/develop' into develop
2014-03-31 14:08:55 +02:00
Emil Siverhall
4fb77bb7dc
change reviewer and save project instead of trying to set reviewer in daisy
2014-03-31 13:57:51 +02:00
b389365379
SSO login is now provided with the daisy-integration module.
2014-03-31 13:55:04 +02:00
b5eebddc1b
Cleaning after rewriting authentication.
2014-03-31 11:18:31 +02:00
b55fef7665
Changed switching to setUser.
2014-03-31 11:15:03 +02:00
34bb0a1257
Redid the authentication.
2014-03-31 11:13:35 +02:00
e8c6d56869
Removed remember me from LoginPanel.
2014-03-31 10:37:53 +02:00
76cf06acb2
Changed around roles to only work with the same enum everywhere.
2014-03-31 10:31:11 +02:00
66a62d85af
Bootstraps is now done with Modules loaded via ServiceLoader to enable easy plugins.
2014-03-31 10:16:23 +02:00
3414d69682
Merge remote-tracking branch 'origin/develop' into develop
2014-03-31 09:23:44 +02:00
fred-fri
6551bb3fa0
sortorder and some fixes
2014-03-31 15:23:24 +09:00
fred-fri
dfaf951c85
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-03-31 13:09:26 +09:00
fred-fri
903f109964
file size calculation fixes
2014-03-31 13:08:34 +09:00
Golrokh Moattar
e11616a4b9
Merge remote-tracking branch 'origin/develop' into develop
2014-03-28 16:47:02 +01:00
Golrokh Moattar
97e5d626be
Working on latest events panel- almost finished but sorting by date needed
2014-03-28 16:46:50 +01:00
Emil Siverhall
563e2a6889
onError when reviewer press submit with invalid points
2014-03-28 15:23:54 +01:00
5982151fab
Moved final seminar related events to, well, the final seminar package.
2014-03-28 14:44:57 +01:00
77ab246cc2
Merge remote-tracking branch 'origin/develop' into develop
2014-03-28 14:32:05 +01:00
5f61e920ed
Changed RequestDetailsPanel to use ViewAttachmentPanel.
2014-03-28 14:30:19 +01:00
b578c5b05d
Fixed final thesis panels to use ViewAttachmentPanel.
2014-03-28 14:25:31 +01:00
6ca947f5aa
FileDescriptionPanel uses ViewAttachmentPanel to view file details.
2014-03-28 14:17:14 +01:00
54588d8078
Argh die divs!
2014-03-28 14:11:59 +01:00
31ca27ae66
Changed so that file can be downloaded by clicking on the name in addition to the icons.
2014-03-28 14:10:36 +01:00
Emil Siverhall
4036140799
Merge remote-tracking branch 'origin/develop' into develop
2014-03-28 13:27:43 +01:00
Emil Siverhall
85217996aa
superb styling.
2014-03-28 13:21:37 +01:00
Emil Siverhall
e5f403fd5e
report attachment download available for preliminary grading reports as well
2014-03-28 13:19:32 +01:00
Emil Siverhall
6be930030f
renamed method
2014-03-28 13:11:45 +01:00
Emil Siverhall
3bb0ff0ef1
added link to download attachments to opposition reports
2014-03-28 13:06:31 +01:00
c7ed065099
Added a provider for the current user to the system so that it does not have to be passed around.
2014-03-28 11:27:12 +01:00
fb24dd3f06
Changed so that file can be downloaded by clicking on the name in addition to the icons.
2014-03-28 10:25:08 +01:00
Emil Siverhall
58067f4f2d
no need to complicate things
2014-03-28 10:10:43 +01:00
693f387ae3
Formatting.
2014-03-28 10:10:00 +01:00
fred-fri
3b671bfd6e
notification fixes
2014-03-28 18:07:38 +09:00
Emil Siverhall
d69c11ddda
happy days
2014-03-28 10:00:08 +01:00
fred-fri
3c4e832033
fixes
2014-03-28 16:56:11 +09:00
198ac1ca3c
Merge remote-tracking branch 'origin/develop' into develop
2014-03-28 08:40:03 +01:00
Emil Siverhall
82545c0fa2
moved attachment to mapped superclass to use with both opposition reports and preliminary grading report.
2014-03-28 08:32:28 +01:00
fred-fri
4020eb3b6b
renaming the non template entities and some of their attributes
2014-03-28 16:32:25 +09:00
fred-fri
30fdc5d358
renaming projecteventtemplate to activitytemplate, and renaming some atttributes in activityplantemplate
2014-03-28 13:45:31 +09:00
fred-fri
7cf39cd83f
renaming everything named scheduletemplate in view to activityplantemplate
2014-03-28 12:58:55 +09:00
fred-fri
adcae9e287
renaming everything named scheduletemplate in core to activityplantemplate
2014-03-28 12:55:37 +09:00
fred-fri
a7b7ea8b89
renamed scheduletemplate attribute in other entities to activityplantemplate
2014-03-28 12:48:26 +09:00
fred-fri
38a0b5ae15
renamed scheduletemplate entity to activityplantemplate
2014-03-28 12:08:01 +09:00
Emil Siverhall
6e55302172
Merge remote-tracking branch 'origin/develop' into develop
2014-03-27 17:18:01 +01:00
Emil Siverhall
bf18e41a5b
different feedback when approving opponents if points could be transferred or not
2014-03-27 17:14:14 +01:00
e20efc80ae
Merge remote-tracking branch 'origin/develop' into develop
2014-03-27 16:59:16 +01:00
Golrokh Moattar
740c917978
Working on latest events panel- to be continued
2014-03-27 16:52:00 +01:00
6cd1a7267f
Removed a bunch of Spring-related annotations.
2014-03-27 16:42:28 +01:00
80765225be
Removed stupid if IE comments that are no longer used.
2014-03-27 16:09:30 +01:00
30afe6afb6
Removed stupid if IE comments that are no longer used.
2014-03-27 16:06:46 +01:00
ccfc925363
Merge remote-tracking branch 'origin/develop' into develop
2014-03-27 16:05:07 +01:00
57872e5905
Removed outputting of wicketpath since fitnesse is no longer used.
2014-03-27 16:05:00 +01:00
Richard
3104983869
Added class table and table-striped.
...
Removed div around button.
2014-03-27 16:00:30 +01:00
0e9a7b775e
Attempt at fixing test.
2014-03-27 15:43:45 +01:00
b3fd10e6fa
Merge remote-tracking branch 'origin/develop' into develop
2014-03-27 15:29:28 +01:00
Golrokh Moattar
3e805aceae
...
2014-03-27 15:28:12 +01:00
Golrokh Moattar
7ac3f36623
...
2014-03-27 15:26:15 +01:00
Golrokh Moattar
b130a26671
just for showing richard
2014-03-27 15:21:03 +01:00
Golrokh Moattar
ac8d045e2c
Merge remote-tracking branch 'origin/develop' into develop
2014-03-27 15:16:46 +01:00
572ee3b4ff
DateColumn now uses DateLabel.
2014-03-27 15:15:18 +01:00
9deef03521
Merge remote-tracking branch 'origin/develop' into develop
2014-03-27 15:08:57 +01:00
9efe947819
Minor HTML fixes.
2014-03-27 15:08:43 +01:00
70d108f919
Switched to a property module. Sorting one (sometimes two) items just is not that important.
...
If sorting really is demanded create LoadableDetachableModel that sorts in load().
2014-03-27 15:08:31 +01:00
Golrokh Moattar
c6b2ff2f10
Revert: removing label, using body instead ( a058027f0a)
2014-03-27 15:00:54 +01:00
Golrokh Moattar
7ba3799457
Merge remote-tracking branch 'origin/develop' into develop
2014-03-27 14:57:38 +01:00
Golrokh Moattar
a66cb0ad22
Added resource bundles
2014-03-27 14:57:33 +01:00
44cef318ac
No point being proper with detachable models when they do not get detached :)
2014-03-27 14:52:34 +01:00
Richard
da2b97c655
Merge remote-tracking branch 'origin/develop' into develop
2014-03-27 14:47:31 +01:00
Richard
7148311fb6
Styling of all projects -> Activity plan templates
2014-03-27 14:47:20 +01:00
e129b96c5f
Fixed AdminEditTargetsPage to use proper detachable models.
2014-03-27 14:44:32 +01:00
7afd962a4d
Fixed EditTargetPanel to not unpack models earlier than it has to.
2014-03-27 14:44:14 +01:00
Golrokh Moattar
435f93c14c
Used EnumPropertyColumn in PeerRequestListPasnel for "Request status"
2014-03-27 14:43:37 +01:00
Golrokh Moattar
df78233bfd
Created EnumPropertyColumn, and used in ProjectFilePanel
2014-03-27 14:36:32 +01:00
Richard
7efe38cd98
Styling of all projects -> peers
...
Replaced excel button with link
2014-03-27 14:35:34 +01:00
486501ce59
Added test for AdminApplicationPeriodsPanel.
2014-03-27 14:34:04 +01:00
c550a01274
Formatting.
2014-03-27 14:24:33 +01:00
fc41c4ea09
Changed application period admin page to use the new GenericDataPanel2.
2014-03-27 14:24:00 +01:00
3289d5db65
Removed useless local variable.
2014-03-27 14:11:57 +01:00
d9b1d54666
Changed to PropertyModel.
2014-03-27 14:09:39 +01:00
1e6fc2fd8e
Updated web.xml to servlet 3.0.
2014-03-27 14:06:58 +01:00
Golrokh Moattar
0d5847681d
Moved DateColumn in the Component package
2014-03-27 13:56:12 +01:00
Richard
6e4de25f9c
Changed last updated date.
2014-03-27 13:44:55 +01:00
Richard
e228364e0f
Changed "Tell me about milestones" to "About milestones".
2014-03-27 13:44:17 +01:00
Richard
a555bf6ee0
Moved glyphicon-user outside of the link so the irritating underline between the icon and link got removed.
2014-03-27 13:40:38 +01:00
Richard
acdd5782e0
Removed info about peer under project management since it's been moved to statistics.
2014-03-27 13:33:56 +01:00
211c07f989
SCIPRO-7224: Now uses the model instead of stale object.
2014-03-27 11:23:51 +01:00
5d5ddd329e
SCIPRO-7186: The hidden field with events now start with an empty array instead of null.
2014-03-27 11:04:03 +01:00
Golrokh Moattar
5fb0992e01
Merge remote-tracking branch 'origin/develop' into develop
2014-03-27 11:00:05 +01:00
90169653a0
Removed Authorization.Failure enum as it was never used.
2014-03-26 20:43:48 +01:00
Golrokh Moattar
77495d46c0
Working on "LatestEventPanel"
2014-03-26 17:09:21 +01:00
c258b28780
Made project partner a sub-page of Ideas.
2014-03-26 15:45:28 +01:00
960027de2b
Removed the text when selecting keywords.
2014-03-26 15:18:15 +01:00
Richard
37335b1dd5
Removed anchor link from PeerPortalHeader and PeerRequestSubmissionPanel
2014-03-26 15:07:17 +01:00
0db8d731a1
Moved the missing HTML.
2014-03-26 14:46:42 +01:00
dbcf60344b
Removed icons from MenuItem.
2014-03-26 14:35:44 +01:00
cc611ba913
Removed unused constructors.
2014-03-26 14:22:49 +01:00
2ceafb95e0
Moved DeactivatableDatePickerPanel to reduce cycles.
2014-03-26 14:22:31 +01:00
de49274254
Moved PageParameterKeys to reduce cycles.
2014-03-26 14:17:24 +01:00
Richard
0394cf4a93
Merge remote-tracking branch 'origin/develop' into develop
2014-03-26 13:42:50 +01:00
Richard
95941a1450
Styling of the pagination.
2014-03-26 13:40:31 +01:00
Golrokh Moattar
757d8bba02
Merge remote-tracking branch 'origin/develop' into develop
2014-03-26 13:33:42 +01:00
Golrokh Moattar
e3add3bff3
Fixed test problem
2014-03-26 13:29:50 +01:00
Golrokh Moattar
de442b1918
Added FileSource to the list in the Files tap
2014-03-26 13:24:10 +01:00
Emil Siverhall
0589de8cec
test fix
2014-03-26 13:23:15 +01:00
Emil Siverhall
d9f37b3b1e
Merge remote-tracking branch 'origin/develop' into develop
2014-03-26 13:08:19 +01:00
Emil Siverhall
dfe58b0314
listadaptermodel at seminar opposition panel
2014-03-26 13:04:54 +01:00
bc0e7aff4e
Wrapped the Set in a ListAdapterModel.
2014-03-26 13:03:28 +01:00
Golrokh Moattar
5988abf561
Added FileSource to the storeFile service to show where the file comes from
2014-03-26 11:34:19 +01:00
337b9f8ece
Merge remote-tracking branch 'origin/develop' into develop
2014-03-26 11:08:16 +01:00
8cb0a9de13
Removed FinalSeminarActiveParticipationRepo.
2014-03-26 11:07:53 +01:00
fred-fri
5b3667169d
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-03-26 19:06:54 +09:00
fred-fri
aa701d439d
test
2014-03-26 19:06:24 +09:00
Emil Siverhall
a8d9f3593e
activated/inactivate projects fix
2014-03-26 10:58:05 +01:00
Emil Siverhall
7005c8ea7b
hide perform review when finished
2014-03-26 10:48:18 +01:00
Richard
7817ad0469
Added bootstrap styling to radio buttons and checkbox on FinalSeminarDataPanel.
2014-03-26 10:36:38 +01:00
fred-fri
b6893d08f1
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-03-26 18:15:56 +09:00
Emil Siverhall
bfb96d3681
Merge remote-tracking branch 'origin/develop' into develop
2014-03-26 10:07:12 +01:00
Emil Siverhall
72c738b756
ajax, yay
2014-03-26 10:06:55 +01:00
b9d5c5545c
Disabled "perform a review" link if you are already on that page.
2014-03-26 09:44:07 +01:00
693f0beee4
Remove isThesisFile from FileDescription.
2014-03-26 09:39:38 +01:00
fred-fri
aec0017b24
bleh
2014-03-26 16:48:44 +09:00
Emil Siverhall
c00362e1e6
peers
2014-03-26 08:26:10 +01:00
fred-fri
6c11df307c
fixed hierarchy
2014-03-26 15:18:40 +09:00
fred-fri
0f66c3864d
changed to ajaxconfirmationlink for deletion
2014-03-26 13:43:02 +09:00
fred-fri
91618b29df
added confirmation
2014-03-26 12:33:47 +09:00
fred-fri
a058027f0a
removing label, using body instead
2014-03-26 11:53:34 +09:00
fred-fri
d85f708bc7
adding linkpanel, just link doesnt render as link
2014-03-26 11:30:10 +09:00
Emil Siverhall
f06407fdf2
Merge remote-tracking branch 'origin/develop' into develop
2014-03-25 20:45:52 +01:00
Emil Siverhall
d62d19fe99
editing of internal users research areas fixed
2014-03-25 20:45:18 +01:00
Emil Siverhall
81804b0e15
editing of internal users fixed
2014-03-25 20:41:30 +01:00
Golrokh Moattar
a8ff2d2552
Merge remote-tracking branch 'origin/develop' into develop
2014-03-25 16:57:43 +01:00
Golrokh Moattar
cda2b0d0b7
On Admin milestone statistic, milestones can be filtered by projectTypes
2014-03-25 16:57:37 +01:00
Emil Siverhall
ae01a6f896
supervisor peer menu highlighting
2014-03-25 15:56:53 +01:00
Emil Siverhall
5279a06fb3
admin peer page extending the wrong base page
2014-03-25 15:55:03 +01:00
Emil Siverhall
42212dd2ff
menu highlighting not working when being used in abstract parent page
2014-03-25 15:54:22 +01:00
Emil Siverhall
e92e9db0d5
cleanup
2014-03-25 15:53:57 +01:00
Emil Siverhall
0ea13e982b
Merge remote-tracking branch 'origin/develop' into develop
2014-03-25 15:38:50 +01:00
Emil Siverhall
be8a18c36a
de-ajaxified tests
2014-03-25 15:33:50 +01:00
Emil Siverhall
dd8f4eae82
removed useless webmarkupcontainer from comment thread panel
2014-03-25 15:26:52 +01:00
6a5fa5118e
Now only try to export co-supervisors and reviewers who have a Daisy ID.
2014-03-25 15:10:07 +01:00
Emil Siverhall
f25c1c8670
some de-ajaxification on comment thread panel
2014-03-25 15:08:50 +01:00
0808fe3540
Removed stupid boolean that basically told the submit method not to submit.
2014-03-25 14:33:40 +01:00
Emil Siverhall
994d2cb6cb
AbstractProjectPeerPage, bye
2014-03-25 13:09:36 +01:00
c95a75e89d
Merge remote-tracking branch 'origin/develop' into develop
2014-03-25 11:39:19 +01:00
c73a5fdb32
Editing checklist template questions is now done using event-based javascript. Nobody will ever be able to maintain it :)
2014-03-25 11:39:14 +01:00
Golrokh Moattar
54f7a50b6c
Fixed styling
2014-03-25 10:46:21 +01:00
Emil Siverhall
7bcee1b269
Merge remote-tracking branch 'origin/develop' into develop
2014-03-25 10:37:41 +01:00
Golrokh Moattar
0be50800f3
Added ProjectType filter to Peer Requests Statistic
2014-03-25 10:36:22 +01:00
Emil Siverhall
0242aed828
only get project types where logged in user is supervisor
2014-03-25 10:07:52 +01:00
Emil Siverhall
ee50e5ab30
removed inner class MySupervisorMyProjectsPanel since it was the only one overriding SupervisorMyProjectsPanel..
2014-03-25 08:51:40 +01:00
0b4db492a9
Merge remote-tracking branch 'origin/develop' into develop
2014-03-25 08:42:42 +01:00
fred-fri
a2ead31d40
filter fix
2014-03-25 11:39:50 +09:00
fred-fri
35b6329e36
typo
2014-03-25 11:14:23 +09:00
Emil Siverhall
b649d650f2
review completed by label to authors view review page
2014-03-24 20:11:51 +01:00
Emil Siverhall
a6e6edbf5c
unused methods/services
2014-03-24 16:42:20 +01:00
Golrokh Moattar
d3dab29ed6
Merge remote-tracking branch 'origin/develop' into develop
2014-03-24 16:30:23 +01:00
Golrokh Moattar
1cc1ff4252
Replace Statistic-Peer with ProjectManagement-Peers
2014-03-24 16:29:53 +01:00
Emil Siverhall
cb4b272db8
different text if review in progress..
2014-03-24 16:28:15 +01:00
Emil Siverhall
0cdc88ea3f
allow request submission even when review in progress..
2014-03-24 15:55:17 +01:00
47c5ed827a
Minor HTML changes.
2014-03-24 15:32:45 +01:00
Golrokh Moattar
8bda47bc5b
Merge remote-tracking branch 'origin/develop' into develop
2014-03-24 15:31:29 +01:00
Emil Siverhall
2ca6e445f8
add/remove methods for active participations
2014-03-24 15:27:30 +01:00
ae374a1e48
Removed test that did nothing.
2014-03-24 15:16:39 +01:00
Golrokh Moattar
d2d91b321e
Merge remote-tracking branch 'origin/develop' into develop
2014-03-24 15:01:23 +01:00
Golrokh Moattar
4fa412c4bc
Added ProjectType to Admin>Peers filtering
2014-03-24 15:01:05 +01:00
Emil Siverhall
51c2313399
removed peer priority from settings
2014-03-24 14:53:01 +01:00
Emil Siverhall
2a9c377e14
feedback when selection fails
2014-03-24 14:30:53 +01:00
Emil Siverhall
bc749f3542
count reviews doesn't count expired
2014-03-24 14:19:44 +01:00
Emil Siverhall
81a7d6098b
peer level settings only available for project types with peer module
2014-03-24 14:17:51 +01:00
Richard
f607e03a30
Removed help icon from ProjectIdeaStartPage.
...
Moved help info from modal to the page.
2014-03-24 13:14:14 +01:00
Richard
da0d186733
Merge remote-tracking branch 'origin/develop' into develop
2014-03-24 13:06:45 +01:00
Emil Siverhall
bd0a54425c
Hide button on request submission panel always visible..
2014-03-24 12:58:01 +01:00
fred-fri
fa684b3783
peer request visibility fix
2014-03-24 16:51:16 +09:00
fred-fri
61ecbfce90
final seminar pages fixes
2014-03-24 16:15:45 +09:00
fred-fri
05f9c7a9b7
final seminar pages fixes
2014-03-24 15:53:46 +09:00
Richard
d39609d5f5
Merge remote-tracking branch 'origin/develop' into develop
2014-03-24 07:05:50 +01:00
fred-fri
21b72b0f4a
keys misc
2014-03-24 12:53:44 +09:00
fred-fri
3f6b4d4be1
forum thread key
2014-03-24 11:47:00 +09:00
fred-fri
4d222bb435
forum post key
2014-03-24 11:43:47 +09:00
fred-fri
8ffe6f1a70
finalseminar keys
2014-03-24 11:40:31 +09:00
fred-fri
339a1f8b84
checklisttemplate keys
2014-03-24 11:39:02 +09:00
fred-fri
80068a5b6d
checklist keys
2014-03-24 11:37:43 +09:00
fred-fri
804a7f03ac
application period keys
2014-03-24 11:33:42 +09:00
fred-fri
85ef5d9dd4
schedule template keys
2014-03-24 11:32:15 +09:00
fred-fri
623b89caf0
peerreviewkeys
2014-03-24 11:29:47 +09:00
fred-fri
37db113ade
tests
2014-03-24 11:03:23 +09:00
fred-fri
ae723a5ef5
Merge remote-tracking branch 'origin/develop' into develop
2014-03-24 10:37:08 +09:00
fred-fri
5fe7bee78e
edit
2014-03-24 10:36:40 +09:00
Richard
856721f835
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 15:45:39 +01:00
Emil Siverhall
525864f5c1
peer review panel is gone, supervisor peer review page is gone..
2014-03-21 15:02:06 +01:00
Emil Siverhall
55847eebc9
and admins wants to look at peers as well..
2014-03-21 15:00:22 +01:00
Emil Siverhall
c4455d61f8
removed Peer tab from Supervisor project overview
2014-03-21 14:52:41 +01:00
Emil Siverhall
4554c758ee
review page request details panel simplified
2014-03-21 14:40:42 +01:00
Richard
d856dd551c
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 14:24:40 +01:00
Emil Siverhall
1654a8ebb7
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 14:13:24 +01:00
Emil Siverhall
aa8f9dc3bf
review details panel even more simplified (deleted)
2014-03-21 14:13:03 +01:00
Emil Siverhall
267b00a34a
review details panel simplified
2014-03-21 13:58:42 +01:00
Richard
9e5309625d
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 13:49:29 +01:00
3be9dd9a4a
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 13:48:54 +01:00
92fe5ccd9f
Created a peer portal header panel instead of trying to have PeerRequestSubmissionPanel do everything.
2014-03-21 13:48:51 +01:00
Emil Siverhall
348f274d96
removed unused pages
2014-03-21 13:45:36 +01:00
Emil Siverhall
73a7ab7fcb
peer summary panel needs to point to correct view review page
2014-03-21 13:43:57 +01:00
Richard
f9a923c1ba
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 13:40:46 +01:00
fred-fri
a3db231b46
container move
2014-03-21 21:35:37 +09:00
Emil Siverhall
2e4d245c38
view review from all peers..
2014-03-21 13:32:14 +01:00
fred-fri
be7a4986da
detachable
2014-03-21 21:26:59 +09:00
Emil Siverhall
808196df77
test update
2014-03-21 12:57:51 +01:00
Emil Siverhall
3d5d03f038
supervisor peer summary panel takes supervisor to view peer review page within the current project hierarchy
2014-03-21 12:56:49 +01:00
Richard
5f97a3c916
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 12:53:13 +01:00
cfdd685d23
Renamed method to match the rest of the world.
2014-03-21 12:38:30 +01:00
5df7913f8e
Replaced bad text with information that you can perform a review.
2014-03-21 12:17:18 +01:00
Richard
ea8e8eaf64
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 11:49:20 +01:00
Richard
f6f6d6ddc0
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 11:40:49 +01:00
Richard
2ad0665f72
No reviews available now displays on a new row.
2014-03-21 11:39:56 +01:00
9f0a8e7dd7
Re-added back markupId.
2014-03-21 11:37:08 +01:00
30755410ff
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 11:35:00 +01:00
6cad002703
Refactoring.
2014-03-21 11:34:55 +01:00
Richard
2c9c2c4683
Fixed spelling on currentlyAwaiting
2014-03-21 11:30:59 +01:00
14b79119c3
Changed isVisible to onConfigure.
2014-03-21 11:28:30 +01:00
7963dd8956
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestSubmissionPanel.html
view/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestSubmissionPanel.java
view/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestSubmissionPanel.properties
2014-03-21 11:27:01 +01:00
Richard
24d0b5f117
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 11:26:22 +01:00
Richard
0e42954bc6
Removed information about Priority.
2014-03-21 11:26:16 +01:00
fred-fri
e52047077e
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-03-21 19:19:48 +09:00
592bb596aa
Some cleaning.
2014-03-21 11:19:10 +01:00
Richard
0e4e11f566
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 11:18:59 +01:00
fred-fri
e9c1857793
editing works, swapping bugs
2014-03-21 19:18:35 +09:00
Richard
772a6a9bd4
Increased column size on available reviews.
2014-03-21 11:10:19 +01:00
Richard
8029190d73
Removed well around available requests.
2014-03-21 11:02:02 +01:00
Emil Siverhall
e4035b91a7
changed review page link in latest review panel
2014-03-21 10:58:00 +01:00
85b5d6bf18
Removed AbstractUploadForm.
2014-03-21 10:54:48 +01:00
Emil Siverhall
cc15f3856a
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 10:38:52 +01:00
Emil Siverhall
c5c081711c
test fix
2014-03-21 10:38:15 +01:00
Emil Siverhall
ec9d955283
only find requests where reviewer is not part of project
2014-03-21 10:36:33 +01:00
20ad41c12b
Test to submit a peer request.
2014-03-21 10:35:47 +01:00
Richard
52c56803f9
Fixed issue with div visible when it wasn't supposed to.
2014-03-21 10:31:13 +01:00
Richard
dd397d27f1
Fixed issue with div visible when it wasn't supposed to.
2014-03-21 10:30:52 +01:00
fred-fri
eae6a8a0ec
model stuff
2014-03-21 18:27:49 +09:00
fred-fri
55d743810d
model stuff
2014-03-21 18:26:37 +09:00
Richard
b6ab9cd208
Changed the text for submitting a new request.
2014-03-21 10:22:23 +01:00
Emil Siverhall
5a87d5e290
renamed service method
2014-03-21 10:16:40 +01:00
Richard
fdbf3fd75c
Minor design changes to the PeerRequestSubmissionPanel.
2014-03-21 10:14:33 +01:00
a54afcb978
That is the default.
2014-03-21 10:13:27 +01:00
b73fc9d192
Removed useless component.
2014-03-21 09:59:45 +01:00
362e9aea02
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 09:56:24 +01:00
90fe8a4737
Removed unused class.
2014-03-21 09:48:14 +01:00
41b33fae1a
Removed empty statement.
2014-03-21 09:47:24 +01:00
5adef4a133
Removed redundant throws declaration
2014-03-21 09:46:43 +01:00
Richard
206d05853a
Removed questions column on PeerRequestSubmissionPanel.
2014-03-21 09:43:08 +01:00
Richard
ae327be3bd
Merge remote-tracking branch 'origin/develop' into develop
2014-03-21 09:33:28 +01:00
Richard
5453b87f05
Changed 'Latest reviewers' to 'Latest reviews'.
...
Put date in front of reviewer.
2014-03-21 09:33:17 +01:00
fred-fri
0e5e104cf3
adding new pageparameterskeyfile
2014-03-21 17:24:13 +09:00
fred-fri
598be1c169
adding new pageparameterskeyfile
2014-03-21 16:24:50 +09:00
Emil Siverhall
56043d9f34
property model fix for old role.nameAsString
2014-03-21 08:11:22 +01:00
fred-fri
5f35bb113a
add remove methods plus list getters and setters so propertymodel can be used for exemptions
2014-03-21 13:02:34 +09:00
951736a6a5
Made sure the project data update is sent to the correct endpoint.
2014-03-20 19:32:14 +01:00
Emil Siverhall
65da9cd477
Merge remote-tracking branch 'origin/develop' into develop
2014-03-20 17:43:21 +01:00
Emil Siverhall
ba7ee09c31
removed notreviewablereason
2014-03-20 17:42:34 +01:00
Richard
d9c097cb54
Added bootstrap styling to the textarea on PerformReviewPanel.
2014-03-20 17:18:05 +01:00
Emil Siverhall
e744351ac7
replaced peer portal panel with PeerRequestSelectionPanel
2014-03-20 16:12:14 +01:00
Emil Siverhall
adf12edad9
paging navigator to request list
2014-03-20 16:10:05 +01:00
Emil Siverhall
ba60591200
notify accepted review
2014-03-20 16:01:01 +01:00
Emil Siverhall
e39d12dabe
handling other types of validation errors when trying to accept review
2014-03-20 15:37:29 +01:00
Emil Siverhall
36aaa92094
part of project exception when trying to accept your own peer
2014-03-20 15:14:19 +01:00
Emil Siverhall
c8dba2a70b
moved requester info to RequestDetailsPanel where it belongs
2014-03-20 14:02:01 +01:00
Emil Siverhall
99a126d500
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/pages/PeerPortalPage.html
view/src/main/java/se/su/dsv/scipro/peer/pages/PeerPortalPage.java
2014-03-20 13:52:55 +01:00
Emil Siverhall
6a90a02e34
added request details
2014-03-20 13:52:00 +01:00
af2d85a369
Checked access to view peer review.
2014-03-20 13:48:50 +01:00
83cbcfc1aa
Checked access to view peer review.
2014-03-20 13:46:09 +01:00
Emil Siverhall
d832578bf0
request dataview with project titles
2014-03-20 13:44:15 +01:00
7a7c63b716
Merge remote-tracking branch 'origin/develop' into develop
2014-03-20 13:30:29 +01:00
f21f1d7ca9
Removed setting for peer review rating.
2014-03-20 13:30:24 +01:00
Emil Siverhall
075043b6c8
review info box added
2014-03-20 13:26:27 +01:00
775c3fb7f8
Changed request details to use the new ViewPeerReview page.
2014-03-20 13:25:16 +01:00
b85438f784
View peer review page now shows request details.
2014-03-20 13:22:43 +01:00
ddf39b572a
Peer request submission panel is collapsed by default if looking at a peer review.
2014-03-20 13:09:02 +01:00
Emil Siverhall
9973a9acaf
header with awaiting requests count
2014-03-20 13:08:47 +01:00
4c9f6a2311
Changed getInProgressReview to also take a project parameter.
2014-03-20 13:02:59 +01:00
Emil Siverhall
d20b2199d7
starting to replace PeerPortalPanel with PeerRequestSelectionPanel
2014-03-20 12:53:53 +01:00
54b6b167b5
Clicking on reviews in my reviews and requests shows the proper page.
2014-03-20 12:49:34 +01:00
e929345623
Created ViewPeerReviewPage
2014-03-20 12:40:25 +01:00
Emil Siverhall
097d81908a
request submission/review acceptance should be aware of the current project
2014-03-20 12:29:46 +01:00
cd08666329
Moved request submission panel to the base page.
2014-03-20 12:18:41 +01:00
Emil Siverhall
5470450ff4
Merge remote-tracking branch 'origin/develop' into develop
2014-03-20 12:14:20 +01:00
Emil Siverhall
e8d9f6dfba
outdated test
2014-03-20 12:13:38 +01:00
fred-fri
9ed3716a7a
move
2014-03-20 19:53:09 +09:00
fd483d5235
Refactored out a base peer portal page class to prepare for view/perform page split.
2014-03-20 11:17:08 +01:00
9ecea60c51
Removed unused stuff.
2014-03-20 11:06:34 +01:00
Emil Siverhall
c7b3ffe3cb
Merge remote-tracking branch 'origin/develop' into develop
2014-03-20 10:57:27 +01:00
Emil Siverhall
1aa4af8c1d
count requests on current project
2014-03-20 10:40:34 +01:00
fred-fri
6339b477d7
Merge remote-tracking branch 'origin/develop' into develop
2014-03-20 18:22:48 +09:00
fred-fri
b3364e5d6c
fixing critical issue
2014-03-20 18:22:25 +09:00
3ae8d69c86
Merge remote-tracking branch 'origin/develop' into develop
2014-03-20 10:21:36 +01:00
1cc3b39356
PerformReviewPanel now includes request details.
2014-03-20 10:21:25 +01:00
Richard
4171b50158
Merge remote-tracking branch 'origin/develop' into develop
2014-03-20 10:18:30 +01:00
Richard
6fcfce0ee4
Removed padding from system notice.
2014-03-20 10:18:22 +01:00
b57f9def16
Changed ReviewPageRequestDetailsPanel to be just that, request details.
2014-03-20 10:06:14 +01:00
Emil Siverhall
5a51058402
zzz
2014-03-20 10:00:33 +01:00
dcf9bb18b6
Broke out a UserLabel from UserLinkPanel so you do not have to use the bigger panel with dialogs and stuff only to override a method to disable all its functionality.
2014-03-20 09:57:46 +01:00
Emil Siverhall
44fd19d3ad
Merge remote-tracking branch 'origin/develop' into develop
2014-03-20 09:52:46 +01:00
Emil Siverhall
cbb5dbd466
MostFrequentReviewersPanel rewritten, bye bye invisible panel
2014-03-20 09:52:04 +01:00
618014012d
Added deadline to perform review panel.
2014-03-20 09:22:53 +01:00
fred-fri
b6954fd195
Merge remote-tracking branch 'origin/develop' into develop
2014-03-20 17:13:48 +09:00
fred-fri
30edef7070
fixed page
2014-03-20 17:13:28 +09:00
57ab1567a0
Added getDeadline() and removed getNumDaysToSubmitPeerReview() since that is what is really wanted.
2014-03-20 09:12:14 +01:00
b89c579e9b
A SciPro date label. No more annoying model unpacks and calls to DateService.
2014-03-20 08:59:39 +01:00
f1ac344f31
Minor fixes.
2014-03-20 08:59:39 +01:00
Emil Siverhall
118e83ce94
Merge remote-tracking branch 'origin/develop' into develop
2014-03-20 08:21:51 +01:00
Emil Siverhall
de6c9c0f94
latest review panel changes
2014-03-20 08:19:29 +01:00
Richard
8baab2cf98
Changes to the system notice div:
...
- White text.
- Smaller font.
- Added padding.
- Removed Georgia font.
2014-03-20 08:04:19 +01:00
Richard
bfc4014294
Merge remote-tracking branch 'origin/develop' into develop
2014-03-20 07:57:43 +01:00
Emil Siverhall
681f785d00
enclosure tags for latest and most frequent reviewers so the headers doesn't stay when these are inactivated
2014-03-20 07:33:52 +01:00
Emil Siverhall
e97d987975
illegal getStrings..
2014-03-20 07:29:32 +01:00
Emil Siverhall
1c5dc70caf
PeerPortalPage should menu highlight Author -> My Project(s)
2014-03-19 22:38:08 +01:00
Emil Siverhall
d3dc108bb8
MyPeerPanel always visible..
2014-03-19 22:17:02 +01:00
Richard
f97d09f97a
Merge remote-tracking branch 'origin/develop' into develop
2014-03-19 17:18:01 +01:00
Emil Siverhall
68eb67f478
Merge remote-tracking branch 'origin/develop' into develop
2014-03-19 16:56:52 +01:00
Emil Siverhall
46f473712a
deletion of awaiting peer requests if for the authors
2014-03-19 16:56:35 +01:00
Emil Siverhall
32d24fb4bd
added project column to excel export
2014-03-19 16:40:56 +01:00
Golrokh Moattar
3ab2565111
Merge remote-tracking branch 'origin/develop' into develop
2014-03-19 16:38:04 +01:00
Golrokh Moattar
7ab42f0f59
Added a message for Author to inform him if he needs to perform a request before doing a review
2014-03-19 16:37:59 +01:00
leosu
5d94acc787
Merge remote-tracking branch 'origin/develop' into develop
2014-03-19 16:22:50 +01:00
leosu
1ca0dbda4d
fixed string
2014-03-19 16:22:44 +01:00
leosu
b97fa6ecea
pleasing sonar
2014-03-19 15:56:47 +01:00
Golrokh Moattar
b3c1d9825e
Merge remote-tracking branch 'origin/develop' into develop
2014-03-19 15:41:40 +01:00
Golrokh Moattar
68b8ba4489
Removed unused Repo and fixed related Service
2014-03-19 15:26:32 +01:00
leosu
d7c8e396a1
Merge remote-tracking branch 'origin/develop' into develop
2014-03-19 15:26:28 +01:00
