golrokh
4494d48e22
Fixed the problem with not including projects with no reviewer approval in the admin/final seminar/statistic page
2015-05-07 13:11:43 +02:00
32d1e33982
[SCIPRO-27100] Fixed by adding text fields for first and last name and populating email with the existing username.
2015-04-23 11:07:44 +02:00
7e41ad90de
[SCIPRO-33934] Fixed problem with bad parameters viewing a project related page
2015-04-22 16:51:55 +02:00
83e48a4209
[SCIPRO-26796] Fixed problem with bad parameters when viewing a peer review
2015-04-22 16:45:40 +02:00
4df64455b4
[SCIPRO-26801] Removed the dependency on the currently logged in user from the error pages.
2015-04-22 15:15:15 +02:00
f5cbbdb034
Removed DSV log in.
2015-04-20 12:18:52 +02:00
golrokh
9e7d8c9f21
Fixed the format
2015-04-07 16:49:25 +02:00
b7af067cc3
Remove date settings
2015-04-07 15:45:31 +02:00
b44eebf310
Fix notification when reviewer changed
2015-04-07 11:30:00 +02:00
de8fde58a1
[2825] Stopped keeping all the page parameters around in the project menu so the forum link actually takes you to the forum index for supervisors.
2015-04-01 13:17:29 +02:00
4cc262c04e
Change link text
2015-04-01 11:52:22 +02:00
1b81ffec8f
Pointless tests
2015-03-31 16:59:35 +02:00
c80f67359b
[2825] Changed some breadcrumbs.
2015-03-31 15:51:26 +02:00
abab752878
[2825] Stopped keeping all the page parameters around in the project menu so the forum link actually takes you to the forum index.
2015-03-31 12:59:47 +02:00
686651fbfa
Made it so the Bootstrap date picker js resource depends on jQuery.
2015-03-31 12:56:12 +02:00
766ae651fd
Hid tables when they have no data to show.
2015-03-31 12:46:37 +02:00
1a05c96071
Fixed some texts.
2015-03-31 12:39:11 +02:00
7bada5174d
[SCIPRO-26795] The entire system requires JavaScript, why use fallback here? Not like the nullability is considered anyway.
2015-03-30 16:11:24 +02:00
1041d42ced
Under Admin / Statistics / Supervisors ideas and projects, added a table showing all the supervisors targets, if greater than zero, on all upcoming (course start after today) application periods.
2015-03-30 13:57:35 +02:00
b0d34475cd
Updated Admin / Start
2015-03-30 12:41:00 +02:00
8031c757a3
Made Admin / Match / Units available to admins instead of only sysadmins.
2015-03-30 12:21:50 +02:00
1b15874644
Send out notifications about rough draft and final seminar approval requests when a reviewer gets assigned to a project if there is an undecided request.
2015-03-30 11:22:15 +02:00
2175aa0ae9
Replaced forum panel with timeline panel in the reviewers interact with supervisor page.
2015-03-30 10:31:49 +02:00
e465b4318e
Replaced forum panel with timeline panel in the reviewers grading page.
2015-03-30 10:26:51 +02:00
723b2feb94
Added some cropping JS plugin to the profile picture upload.
2015-03-27 14:07:15 +01:00
nikos
248d881de2
[2799] Show non user recipients in Mail > Log.
...
Fixed bug in exporting to Excel
2015-03-27 11:32:02 +01:00
golrokh
f878867d5a
Merge remote-tracking branch 'origin/develop' into develop
2015-03-27 09:35:54 +01:00
golrokh
233027b926
Removed unnecessary constants
2015-03-27 09:35:48 +01:00
nikos
d9106cd331
[2814 & 2791] Removed google analytics and pingdom
2015-03-27 09:23:14 +01:00
nikos
dc0fcdd17a
[2796] Show date and time in Admin > Mail > Log
2015-03-27 09:08:34 +01:00
golrokh
f944ec81ab
Changed the whole sentence to a link in more info about ideas
2015-03-27 09:01:00 +01:00
nikos
898b673ae8
[2783] Moved Match responsible mail from Match Settings to General settings and removed Match settings tab completely (even from Start). Changed database to allow nulls to fix NPE bug.
2015-03-26 17:39:30 +01:00
nikos
b1f0c75bc8
[2798] Removed "Show filer" / "Hide filter" from Supervisor > My Projects
2015-03-26 16:59:29 +01:00
nikos
1eda2f7a44
Removed unused code and useless comments
2015-03-26 14:55:21 +01:00
nikos
2661436aca
Merge remote-tracking branch 'origin/develop' into develop
2015-03-26 14:37:25 +01:00
nikos
701eea8ad0
Removed panel and setting relating to number of peer reviews performed.
...
other minor improvements
2015-03-26 14:37:06 +01:00
b2cb4b2433
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2015-03-26 12:22:40 +01:00
1eeb6c33ff
notify on missed approvals
2015-03-26 12:22:28 +01:00
golrokh
da344b417e
Fixed thech-problems for external link for ideas
2015-03-26 11:08:20 +01:00
golrokh
e5ac82b996
Merge remote-tracking branch 'origin/develop' into develop
2015-03-26 10:54:43 +01:00
golrokh
59bd513228
Removed everything related to the preliminary grading report- removed thesis review as well
2015-03-26 10:54:37 +01:00
90baa18cd9
Limited profile picture size to 1 MB.
2015-03-26 10:12:36 +01:00
fe82f4858c
Merge remote-tracking branch 'origin/develop' into develop
2015-03-26 10:02:53 +01:00
98da8d1db4
Made the text different for rough draft/final seminar decisions/requests.
2015-03-26 10:02:44 +01:00
720ddfecad
Restyled the approved panel in the reviewing process timeline.
2015-03-26 09:55:47 +01:00
aa5b39d40c
Restyled the denied panel in the reviewing process timeline.
2015-03-26 09:54:07 +01:00
8e0231c749
Restyled the requested panel in the reviewing process timeline.
2015-03-26 09:46:59 +01:00
golrokh
885868df3b
Removed everything related to the preliminary grading report- fixed tests and removed more
2015-03-26 09:43:29 +01:00
golrokh
5b015edfec
Removed everything related to the preliminary grading report- fixed problem with not rendering examiner page
2015-03-26 09:30:40 +01:00
golrokh
0735d78cec
Removed everything related to the preliminary grading report
2015-03-26 09:02:04 +01:00
golrokh
258e07ad34
Merge branch 'removePreliminaryGradingReport' into develop
2015-03-26 08:36:12 +01:00
golrokh
58ae7d9eb8
Removed everything related to the preliminary grading report
2015-03-25 18:40:03 +01:00
golrokh
8d42894fa9
Removed external idea url from project partner
2015-03-25 17:31:30 +01:00
golrokh
83a96ea3aa
Added external link for getting started with idea for author
2015-03-25 16:41:27 +01:00
3b53ad81ff
Revert "Removed listing of the current profile picture and the delete functionality."
...
This reverts commit a76759c023
2015-03-25 13:47:22 +01:00
golrokh
a19d073459
Fixed the size of the numbers in peer statistics
2015-03-25 09:44:26 +01:00
golrokh
284a884e77
Merge remote-tracking branch 'origin/develop' into develop
2015-03-24 17:27:50 +01:00
golrokh
2823244614
Removed the possibility for creating any further preliminary grading reports for both Supervisor and Reviewer, those which have already created show be viewable for now!
2015-03-24 17:23:51 +01:00
213cad7a93
Removed research plan.
2015-03-24 16:56:41 +01:00
cb43f0c7ad
Hid the upload field for supervisors in the activity plan.
2015-03-24 16:43:52 +01:00
a76759c023
Removed listing of the current profile picture and the delete functionality.
2015-03-24 16:08:25 +01:00
afdc9d3ade
Added a "hash" of the picture files id to the URL for user profile images so that we can aggressively cache the images but also notice changes. The hash is ignored and only there so the browser knows to retrieve the new one.
2015-03-24 16:07:28 +01:00
0ffcc9d396
Made it so a fallback profile picture is displayed if a user selected file but did not upload one.
2015-03-24 16:01:40 +01:00
f3e1aa3a57
Fixed test.
2015-03-24 15:50:30 +01:00
a9a46afd5c
Fixed problem with refreshing the timeline when posting new messages by removing the AJAX crap.
2015-03-24 15:38:25 +01:00
636d8f0041
Removed useless HTML.
2015-03-24 15:30:57 +01:00
9d01b014a4
Simple panel for displaying a timeline of reviewer related events for a given project.
2015-03-24 15:29:36 +01:00
61fc197c64
Removed useless stuff.
2015-03-24 10:15:00 +01:00
golrokh
19f42ae3bb
Fixed the numbers in peer review statistics
2015-03-24 10:15:23 +01:00
f3e60de813
Changed text.
2015-03-23 15:54:38 +01:00
37c1cf7392
Made it possible to delete your profile image.
2015-03-23 15:51:55 +01:00
23aedf64fd
Handled the case when a user selected uploaded file as profile picture but did not actually upload one.
2015-03-23 15:50:31 +01:00
31b5b1c696
Renamed GravatarImage to UserProfileImage.
2015-03-23 15:35:54 +01:00
b448534004
Refactored a bit.
2015-03-23 15:33:37 +01:00
3a8f737352
Made the uploaded profile picture show.
2015-03-23 15:08:51 +01:00
5a31c84ba4
Merge branch 'develop' into user_profile
2015-03-23 14:01:37 +01:00
b0937e1f6d
Start of selecting user profile picture.
2015-03-23 13:18:05 +01:00
nikos
7de24e5b8f
Change "peer portal" to something without "portal"
2015-03-23 12:38:34 +01:00
4f08e89915
Added more choices for profile image.
2015-03-23 10:16:26 +01:00
8efbbfd2d1
Added title to the author idea details page.
...
Hid the program stuff when there are no programs for the current user.
2015-03-20 16:58:47 +01:00
37896cbcae
More cleaning up.
2015-03-20 15:15:59 +01:00
1a25028658
More cleaning up.
2015-03-20 15:15:54 +01:00
99e8b1bfe3
More cleaning up.
2015-03-20 15:10:21 +01:00
b877a9b54d
More cleaning up.
2015-03-20 15:07:51 +01:00
718d8066a6
Fixed proper Bootstrap HTML.
2015-03-20 15:04:21 +01:00
af6ddad4d8
Changed project details dialog for authors to a separate page.
2015-03-20 12:53:19 +01:00
0dfd7aadcf
Suspect stuff.
2015-03-20 10:28:25 +01:00
a20983c984
Bootstrapped HTML.
2015-03-20 10:24:00 +01:00
ad44edae5a
Simplified.
2015-03-20 10:10:02 +01:00
0355d0af62
Minor HTML touches.
2015-03-20 10:03:23 +01:00
4c178b4946
Simplified.
2015-03-20 09:56:59 +01:00
5bd010f387
Simplified.
2015-03-20 09:54:18 +01:00
8674594f02
Merge remote-tracking branch 'origin/develop' into develop
2015-03-20 09:34:08 +01:00
0f15c91689
Simplified.
2015-03-20 09:25:18 +01:00
golrokh
a424efca9b
Added Research area to Project, now supervisor may specify the research area in sending request approvals to reviewer
2015-03-19 17:59:28 +01:00
golrokh
e51c4cfb7f
Better text
2015-03-19 16:46:41 +01:00
a2ecf9d370
Removed stupid boolean parameter that just hide the entire panel.
2015-03-19 14:08:40 +01:00
5450e6acad
Fixed double title problem
2015-03-19 14:06:32 +01:00
f75e68ddcd
Removed "Mark all read" from the project and group forums.
2015-03-19 10:49:41 +01:00
af72116811
Removed partner confirmation from the match system.
2015-03-19 10:33:39 +01:00
golrokh
0ea5e5655d
Changed time to 08:00 when creating an activity plan from template
2015-03-19 09:31:24 +01:00
golrokh
656c262b71
Merge remote-tracking branch 'origin/develop' into develop
2015-03-19 09:06:24 +01:00
golrokh
590db5eea6
Added info text for activity plan
2015-03-19 09:06:12 +01:00
fb8a1cf1b2
Removed a bunch of useless tests.
2015-03-19 08:45:48 +01:00
31d60b2191
Fixed tests.
2015-03-19 08:44:31 +01:00
85f3d4e9d2
Fixed tests.
2015-03-19 08:41:43 +01:00
3353c0f8ca
Fixed tests.
2015-03-19 08:39:50 +01:00
60747fc1c1
Merge remote-tracking branch 'origin/develop' into develop
2015-03-19 08:32:12 +01:00
37b76915c0
Removed toggling of project/group details.
2015-03-19 08:32:06 +01:00
golrokh
0921116fdb
Merge remote-tracking branch 'origin/develop' into develop
2015-03-19 08:23:58 +01:00
golrokh
db42061735
Changed reviewer support mail address to optional
2015-03-19 08:23:52 +01:00
6262af7fe0
Removed edit icons from project and group details/header panels.
2015-03-19 08:15:20 +01:00
58e1b7ee91
Added match responsible column to unit table in admin interface.
2015-03-18 16:55:35 +01:00
1588a015b5
Moved "Non work days" under "Project Management" from "System".
2015-03-18 16:35:20 +01:00
c40a818aa1
Merge remote-tracking branch 'origin/develop' into develop
2015-03-18 16:17:06 +01:00
4d9d56e97e
Added better feedback when a reviewer tries to move the final grading report to the next step and some criteria have not been assessed.
2015-03-18 16:17:02 +01:00
golrokh
bd46caa0c2
Fixed tests
2015-03-18 14:55:09 +01:00
golrokh
65cbd8312b
Added validator to the reviewer mail address
2015-03-18 14:48:54 +01:00
golrokh
909466ba72
Merge remote-tracking branch 'origin/develop' into develop
2015-03-18 14:42:43 +01:00
golrokh
c4b89863b6
Added a feature for sending email to ReviewerSupport after requesting for reviewer approval for both rough draft and final seminar.
2015-03-18 14:42:37 +01:00
a48137646e
Added a general system setting for thesis support e-mail address.
2015-03-18 13:34:46 +01:00
golrokh
fc0e5c310c
Added "reviewer-support" email to the General settings
2015-03-18 13:20:17 +01:00
b6338f2eeb
Merge remote-tracking branch 'origin/develop' into develop
2015-03-18 13:20:01 +01:00
35f4fd2c14
Cleaning.
2015-03-18 12:57:06 +01:00
969209f545
Added a "mail recipient" abstraction so we can combine user and non-user recipients in Admin / Mail / Compose.
2015-03-18 12:53:57 +01:00
golrokh
4c8f4b48b6
Merge branch 'AdminPeerStatistics' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/AdminPeerListPage.java
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.html
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.java
2015-03-18 11:02:36 +01:00
golrokh
ee9586f58a
Better detail on statistic , showing filter area, adding checklists and answers in statistics
2015-03-18 11:00:19 +01:00
golrokh
4b43d856e6
Merge conflicts
2015-03-17 15:53:12 +01:00
golrokh
db0f722083
Merge remote-tracking branch 'origin/AdminPeerStatistics' into AdminPeerStatistics
...
Conflicts:
core/src/main/java/se/su/dsv/scipro/peer/PeerReviewService.java
core/src/main/java/se/su/dsv/scipro/peer/PeerReviewServiceImpl.java
view/src/main/java/se/su/dsv/scipro/peer/AdminPeersPage.java
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewListPanel.html
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewListPanel.java
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticPanel.html
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticPanel.java
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticPanel.properties
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.html
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.java
view/src/main/java/se/su/dsv/scipro/peer/SupervisorPeersPage.java
view/src/test/java/se/su/dsv/scipro/peer/PeerReviewStatisticPanelTest.java
2015-03-17 15:37:15 +01:00
golrokh
e5f1130717
Added statistics and statistic detail for both supervisor and admin peer review statistics
2015-03-17 15:10:53 +01:00
7a01f8b40d
Fixed tests.
2015-03-17 13:28:55 +01:00
1af23db49f
Project types now have a flag to indicate whether the projects are reviewed or not.
...
Interact with reviewer tab is now shown/hidden based on the reviewed flag for the projects type.
2015-03-17 12:57:35 +01:00
874326e718
Merge remote-tracking branch 'origin/develop' into develop
2015-03-17 11:18:39 +01:00
9055542138
Added match responsible e-mail to units.
2015-03-17 11:18:33 +01:00
62c001379c
Fix reviewer deadlines page
2015-03-17 11:12:05 +01:00
d9444bee71
Added a table to Admin / System / Notification settings / General settings describing all non-notification mails that are sent by the system.
2015-03-17 09:56:00 +01:00
d4310967f5
Fixed JavaScript problems when the Wicket object is not defined (because there are no Wicket AJAX components).
2015-03-16 17:01:36 +01:00
f610684612
Fixed problem with viewing project partners and due to using User#toString.
2015-03-16 16:43:43 +01:00
336c8b784a
Create new idea move checkbox to right
2015-03-16 15:38:05 +01:00
86feaa01ab
[SCIPRO-26909] Fixed crash when adding application period exemptions.
2015-03-05 11:16:01 +01:00
ffb644dd0b
Shitty Wicket that doesn't work.
2015-03-05 10:37:40 +01:00
00ca319dea
Stop using toString for display purposes.
2015-03-05 09:31:12 +01:00
golrokh
f5440cc079
Deleted COP files
2015-03-02 14:13:23 +01:00
4e83721923
Fixed error in notification compilation mail.
2015-03-02 13:04:44 +01:00
golrokh
ed6b0eb0cb
Revert "Deleted statistics over the admin/statistic/peer review page"
...
This reverts commit e5be9171a8
2015-02-27 16:18:25 +01:00
golrokh
4c6d3684a4
Revert "Removed unnecessary form and Fixed the code to work without Form. Removed Status filter. Change Language filter label. Set default filter. The last 6 months as default for the Date duration & Master/Bachelor as default for the project type filter."
...
This reverts commit da09f9a6ee
2015-02-27 16:18:11 +01:00
golrokh
99cafdc272
Change texts
2015-02-27 15:44:41 +01:00
golrokh
2df3aa312e
Changed UI s
2015-02-27 14:59:22 +01:00
golrokh
b5565b31c6
Changed UI s
2015-02-27 14:56:26 +01:00
golrokh
75463c08a7
Merge branch 'develop' into AdminPeerStatistics
2015-02-27 11:15:48 +01:00
golrokh
bf7e3fa4d2
Merge remote-tracking branch 'origin/develop' into develop
2015-02-27 11:15:19 +01:00
golrokh
bcfece9fa2
Fixed problem with project title in Admin, Statistics, PeerRequests
2015-02-27 11:15:14 +01:00
golrokh
dd2782205d
Merge remote-tracking branch 'origin/develop' into AdminPeerStatistics
2015-02-27 11:03:19 +01:00
golrokh
44507e3c89
Made Status clickable and lead to List page in Admin PeerReview Statistic
2015-02-27 11:02:23 +01:00
a146400527
Preview now updates when adding a new activity.
2015-02-27 09:33:09 +01:00
golrokh
6c629d680e
Flipped green & red buttons in reviewer approval decision page.
2015-02-27 09:23:14 +01:00
golrokh
e2d0529341
using info-text and well class to have the page as same as files & activity plan
2015-02-27 09:15:56 +01:00
golrokh
5d630bf50b
Merge remote-tracking branch 'origin/develop' into develop
2015-02-26 15:52:16 +01:00
golrokh
9ab30c5bb1
Added Statistic Area that shows number of peer reviews in total and also for every peerReviewStatus
2015-02-26 15:51:00 +01:00
d68d2bd3f4
Fixed cyclic dependency by making the notifications for expired peer requests event based.
2015-02-26 15:00:45 +01:00
6478c8dd36
Fixed some styling problems.
2015-02-26 14:43:39 +01:00
golrokh
da09f9a6ee
Removed unnecessary form and Fixed the code to work without Form. Removed Status filter. Change Language filter label. Set default filter. The last 6 months as default for the Date duration & Master/Bachelor as default for the project type filter.
2015-02-26 14:02:55 +01:00
golrokh
e5be9171a8
Deleted statistics over the admin/statistic/peer review page
2015-02-26 12:32:01 +01:00
golrokh
8bc6772dd1
fixed tests
2015-02-26 12:06:28 +01:00
golrokh
a8ec091357
Changed _ to .
2015-02-26 11:32:58 +01:00
7dfe568fbd
Changed text in reviewer approvals.
...
EnumLabel galore.
2015-02-26 11:21:11 +01:00
golrokh
4b78574bd1
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2015-02-26 10:54:26 +01:00
golrokh
ec85ea0b0b
Added info text above supervisor and student forums
2015-02-26 10:37:01 +01:00
b1fdd00496
Fixed test.
2015-02-26 10:36:50 +01:00
0df2052242
Fixed so that admins can change local users password.
2015-02-26 10:31:42 +01:00
97b97ecdb1
Merge remote-tracking branch 'origin/develop' into develop
2015-02-26 10:28:03 +01:00
bf1249c03d
Added the ability to change start date in the activity plan template preview.
2015-02-26 10:16:48 +01:00
dfac8847dc
Of course a stateful copy of the activity templates are kept in memory so we can't preview an activity plan, only a List<ActivityTemplates>.
2015-02-26 10:08:01 +01:00
cd1d11fac7
Improved HTML.
2015-02-26 09:57:33 +01:00
8e399008b5
Created a panel to preview an activity plan template.
2015-02-26 09:54:25 +01:00
golrokh
bff292efe5
minor changes for better code
2015-02-26 09:45:01 +01:00
cf5efcb54b
Seriously stop using toString for presentation purposes.
2015-02-25 15:32:18 +01:00
af4a8a7ac5
Only admin role (instead of sysadmin) is required to edit users.
2015-02-25 10:59:41 +01:00
42b0a8bba6
Re-arranged supervisor notification settings.
2015-02-24 15:00:04 +01:00
golrokh
a4b5822181
Removed unused code for activity dialog
2015-02-24 14:44:44 +01:00
golrokh
47f1edbf3e
Fixed the problem with menu hierarchy in supervisor my ideas
2015-02-24 14:38:02 +01:00
golrokh
406850138d
Better page for viewing idea details
2015-02-24 14:19:20 +01:00
d7093803f5
It is now possible (with modern browsers) to attach multiple files to forum posts. How-to depends on browser.
2015-02-24 14:12:19 +01:00
4cce8c6927
Added confirmation dialog when toggling notification settings.
2015-02-24 13:57:25 +01:00
527647ab37
Added the users own profile image to the basic profile page so they can see it while editing.
2015-02-24 13:53:22 +01:00
df23fda4cb
Bootstrapped HTML.
2015-02-24 13:48:05 +01:00
b19cb9ef62
Reshuffled the permissions for the Users part of the admin interface. Admin role can now edit local users and give/remove all roles that their own roles are authorized for.
2015-02-24 13:27:12 +01:00
47e6ff5dd3
Added confirmation dialog when giving/removing roles.
2015-02-24 13:17:20 +01:00
6a15850939
It is now possible to add projects to your group where you are only co-supervisor.
2015-02-24 12:54:50 +01:00
golrokh
e508fb922b
Implemented showing Idea detail in a new page not in a popup
2015-02-24 11:06:30 +01:00
golrokh
7fb33bc658
Merge remote-tracking branch 'origin/develop' into develop
2015-02-24 11:01:59 +01:00
golrokh
fdab5fc760
Implemented showing Idea detail in a new page not in a popup
2015-02-24 11:01:48 +01:00
704d426938
Added breadcrumbs for rough draft and final seminar approvals.
2015-02-24 10:28:14 +01:00
25f3e8cd94
Tiny HTML changes.
2015-02-24 10:28:14 +01:00
golrokh
b5ff16c64c
Removed the links for popup in activities
2015-02-24 08:35:37 +01:00
f464b4d0b2
Breadcrumbs for preliminary grading reports, final grading reports and interact with supervisors.
2015-02-23 15:55:51 +01:00
d1cb25a7ab
Merge remote-tracking branch 'origin/develop' into develop
2015-02-23 15:07:06 +01:00
22d4921140
Fixed a bug from previous implementation of marking notifications read that caused the entire forum to be read when reading a single thread.
2015-02-23 15:06:57 +01:00
cfb5bd744f
Merge remote-tracking branch 'origin/develop' into develop
2015-02-23 15:01:39 +01:00
48f6ed982b
Made it so reading a forum post now always mark the related notification(s) as read.
2015-02-23 15:01:34 +01:00
golrokh
a11156b648
Moved the idea download link up
2015-02-23 14:59:35 +01:00
golrokh
587b214565
In Activity plan, show description for activities if there is any
2015-02-23 14:45:34 +01:00
eaeb11a140
Updated the notification settings to use Bootstrap tabs rather than Wickets AjaxTabbedPanel.
2015-02-23 09:30:42 +01:00
c5bbb2a06d
[2644] Changed text "Seminar notifications" to "Final seminar notifications"
2015-02-23 09:29:58 +01:00
d1d9ebc79c
[2649] Latest group on top
2015-02-23 09:22:07 +01:00
f4146015a9
Added logging when changing roles.
2015-02-23 09:16:08 +01:00
Andreas Svanberg
435ab45fc2
Fixed condition coverage.
2015-02-20 22:41:23 +01:00
Andreas Svanberg
6211e9cf3a
Removed unused private fields.
2015-02-20 22:35:03 +01:00
Andreas Svanberg
46d5751ff9
Removed unused method.
2015-02-20 21:57:19 +01:00
Andreas Svanberg
482d2d060b
Calculating unread posts now compose existing functions rather then re-implement the logic side-by-side.
2015-02-20 21:55:52 +01:00
Andreas Svanberg
ca73f3452e
Removed stupid Pageable parameter since it was never used for paging and always had the same sort. Now always fetches every post and sorting is done where it should be, in presentation layer.
2015-02-20 21:21:26 +01:00
Andreas Svanberg
e257f49d7f
Removed the un-threaded forum.
...
Victory at last!
Time for simplification.
2015-02-20 20:53:51 +01:00
Andreas Svanberg
59c64369d9
Removed the possibility to sort the forum messages, they are now always in descending order (newest on top).
2015-02-20 19:50:37 +01:00
7d6acf1a67
Fixed usage of toString for display purposes.
2015-02-20 12:30:58 +01:00
e189acac60
Fixed usage of toString for display purposes.
2015-02-20 12:27:03 +01:00
38ac0dc286
Fixed drop downs for iPad.
2015-02-20 11:06:35 +01:00
d93d332767
Changed description of project completed notification.
2015-02-20 09:32:42 +01:00
83d2dbb90d
Added some space for final thesis.
2015-02-20 08:30:44 +01:00
06f38bbeb0
Switched from repository to service.
2015-02-19 14:59:24 +01:00
53b5c1df97
Made it possible to re-arrange footer links.
2015-02-19 14:16:39 +01:00
42bddbd79a
add reminders for First meating
2015-02-19 11:03:02 +01:00
a40b05d44b
Changed so that requested and deadline for reviewers final grading reports only include date and not time.
2015-02-19 10:09:51 +01:00
37d6ab4892
Added simple logging when creating/updating/deleting a local user.
2015-02-18 16:38:19 +01:00
d6a5044dd8
Added simple logging when changing notification settings.
2015-02-18 16:31:19 +01:00
aea7f3f528
Changed so that only active projects count for stuff to do for the reviewers.
2015-02-18 13:57:50 +01:00
80879bb114
Added business method for completing a project. Notifications are now sent when projects are completed.
2015-02-18 13:16:37 +01:00
3a215bf59a
Added "Grading in daisy" link to the reviewers grading report (yay standalone system).
2015-02-18 11:23:32 +01:00
86f44b7339
Added date when final thesis was uploaded.
2015-02-18 11:19:00 +01:00
41dd7ed6e3
Removed extra "Final thesis" file from the grading page and the "Go to grading" link since the supervisor is already there. The date of approval is shown instead of file upload date.
2015-02-18 11:17:08 +01:00
633132558c
Moved final thesis panel to the grading tab for supervisors.
2015-02-18 10:57:31 +01:00
golrokh
2a530f8066
Fixed showing motivations in multi-line format, in peer review
2015-02-17 14:06:09 +01:00
golrokh
1031f159bd
Fixed model for language
2015-02-17 11:41:28 +01:00
9943f32576
Fixed requested date in reviewer final grading tab.
2015-02-17 09:52:35 +01:00
f0fa51f91d
Merge remote-tracking branch 'origin/develop' into develop
2015-02-16 13:34:36 +01:00
7457b8f855
Peer review language statistics
2015-02-16 13:34:08 +01:00
0009d7d457
Changed reviewers deadline for final grading report to be based on the approval date of the final thesis rather than the supervisors hand-in date of their grading report. Also fixed so the number of days now uses the system setting rather than hardcoded five days.
2015-02-16 11:34:00 +01:00
d620567169
Fixed individual criteria appearing twice on the supervisors downloaded grading report.
2015-02-16 11:12:10 +01:00
7112a003a5
Removed unused service.
2015-02-16 10:44:47 +01:00
d788cd5e32
Removed unused parameter.
2015-02-16 10:43:34 +01:00
ab419d8256
Removed useless code.
2015-02-16 10:42:39 +01:00
d58d16eeed
Removed useless code.
2015-02-16 10:20:52 +01:00
597c2fea28
Fixed problem when answering a checklist question for the first time.
2015-02-16 10:14:02 +01:00
golrokh
94e51fbf07
Merge remote-tracking branch 'origin/develop' into develop
2015-02-12 11:35:51 +01:00
golrokh
97caa5c991
Fixed txt extension in downloading idea
2015-02-12 11:35:42 +01:00
f13d7e1226
Clean up around creating/editing activities.
2015-02-12 11:27:36 +01:00
077451e823
Fixed authorization check.
2015-02-12 11:19:39 +01:00
038997eef0
Removed unnecessary authorization check since the exact same one is performed in the superclass.
2015-02-12 11:09:11 +01:00
decff829bb
Removed unnecessary authorization check since the exact same one is performed in the superclass.
2015-02-12 11:06:30 +01:00
golrokh
27e9c02a2f
Merge remote-tracking branch 'origin/develop' into develop
2015-02-12 10:41:19 +01:00
golrokh
c9e3b554a6
Fixed Sonar stuff
2015-02-12 10:41:10 +01:00
45e9432287
Text changes.
2015-02-12 10:14:38 +01:00
golrokh
56fc6b0a44
Fixed test
2015-02-11 17:00:20 +01:00
golrokh
96634301fe
Fixed test
2015-02-11 16:58:16 +01:00
golrokh
fedc5c98e7
Merge remote-tracking branch 'origin/develop' into develop
2015-02-11 16:55:11 +01:00
golrokh
796882b8c0
Fixed Sonar stuff
2015-02-11 16:55:05 +01:00
1e3170eb0f
Sonar.
2015-02-11 16:49:18 +01:00
2e0f207388
Add language to peer request part 2
2015-02-11 16:41:34 +01:00
e27b63d19e
Add language to peer request part 1 fex test
2015-02-11 16:16:49 +01:00
8a1647ffe1
Merge remote-tracking branch 'origin/develop' into develop
2015-02-11 16:20:54 +01:00
f6742fb4aa
Changed so the panel now uses the new service method for moving final seminars.
2015-02-11 16:09:29 +01:00
golrokh
d768015270
Fixed Sonar stuff
2015-02-11 15:07:34 +01:00
golrokh
5ecbe1c1bd
Merge remote-tracking branch 'origin/develop' into develop
2015-02-11 14:51:01 +01:00
golrokh
c1d0a00cc5
Fixed Sonar stuff
2015-02-11 14:50:19 +01:00
golrokh
0fccf62f5f
Fixed Sonar stuff
2015-02-11 14:47:34 +01:00
5d322e7907
Merge remote-tracking branch 'origin/develop' into develop
2015-02-11 14:45:57 +01:00
cbbfd3f3fa
Add language to peer request part 1
2015-02-11 14:45:21 +01:00
golrokh
ab4574e775
Fixed test
2015-02-11 14:45:14 +01:00
golrokh
bc00f6291f
"Created between" to "project created between" in admin, statistic, final seminars
2015-02-11 14:05:23 +01:00
golrokh
c4fa1e3c6b
Changed color to green for edit in Group forum
2015-02-11 14:02:18 +01:00
golrokh
9b7ed4115c
Implemented a better way for downloading ideas as a file, to prevent having temporally files on the server
2015-02-11 13:57:36 +01:00
golrokh
4b2abcba94
Merge remote-tracking branch 'origin/develop' into develop
2015-02-11 13:56:01 +01:00
golrokh
0d4a344f16
Implemented a better way for downloading ideas as a file, to prevent having temporally files on the server
2015-02-11 13:55:41 +01:00
e7ab7c9382
Changed the peer link for supervisors in the activity plan.
2015-02-11 13:10:25 +01:00
75e9b622e0
Formatting.
2015-02-11 13:04:51 +01:00
ad63a34bf1
[SCIPRO-26692] Clicking on failed export notification crashes due to lazy model on the idea
2015-02-10 16:18:38 +01:00
golrokh
27a1721b8e
Made Forum notifications "read" when Reviewer go to the "Iteract with supervisor" forum via ReviewPage
2015-02-10 13:41:27 +01:00
11e90cd42f
Active participant can delete themselves
2015-02-10 12:35:04 +01:00
c7de6d9bff
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2015-02-10 12:29:29 +01:00
golrokh
61847aa8de
Fixed the problem with exporting idea when application period is null
2015-02-10 10:28:05 +01:00
28d34eaac5
Minor formatting
2015-02-10 10:10:27 +01:00
golrokh
50a13a93c3
using bootstrap class instead of my own class for the green color :P
2015-02-09 11:04:16 +01:00
golrokh
354c9f0a0c
using class instead of style for the green color
2015-02-09 10:55:11 +01:00
golrokh
92123d7429
Merge remote-tracking branch 'origin/develop' into develop
2015-02-09 10:41:07 +01:00
golrokh
da7673de61
Fixed the requested date for reviewer final grading report
2015-02-09 10:40:29 +01:00
933f915f21
Changed "Final seminar created before" filter to a between filter in Admin / Statistics / FInal seminars.
2015-02-09 10:18:06 +01:00
49703389b4
Added "Completed" project status to the default filter in Admin / Statistics / Final seminars.
2015-02-09 09:55:15 +01:00
db6bb55445
Made the "current user" link in the main menu a drop down with alternatives to edit your profile and, if possible, log out.
...
The edit profile link and log out button have been removed from the profile dialog/panel.
2015-02-06 17:28:34 +01:00
7c57af5b27
Made the role button dropdown in the main menu into a normal dropdown so it doesn't stick out like a sore thumb.
2015-02-06 16:46:10 +01:00
ec388e347d
Removed more HTML.
2015-02-06 16:24:11 +01:00
1c7e5ddbf5
Merge remote-tracking branch 'origin/develop' into develop
2015-02-06 12:44:20 +01:00
905ed612ef
Removed more stupid HTML.
2015-02-06 12:44:13 +01:00
6905cadf03
Removed some newlines and spaces that could cause the user links to have an added space after and/or before.
2015-02-06 12:33:29 +01:00
97513ba94f
Removed useless HTML.
2015-02-06 12:25:33 +01:00
golrokh
49d5691214
Merge remote-tracking branch 'origin/develop' into develop
2015-02-06 12:07:04 +01:00
golrokh
afcf2d21cd
Download Idea as a txt file
2015-02-06 12:06:51 +01:00
cf28a9cdfc
Changed color of project edit button and icon to green
2015-02-06 11:17:35 +01:00
ec2de6518e
Add logout button for local users fixed
2015-02-06 11:04:00 +01:00
2a858c6447
Removed more useless code.
2015-02-06 11:02:14 +01:00
f5f78d5f9d
Fixed test.
2015-02-06 11:01:35 +01:00
b0813a97b9
Removed some useless code.
2015-02-06 10:50:49 +01:00
64fc7351f5
Improved feedback when saving notes.
2015-02-06 10:44:25 +01:00
302c134b19
Add logout button for local users
2015-02-05 16:09:48 +01:00
golrokh
9d21068737
Merge remote-tracking branch 'origin/develop' into develop
2015-02-05 12:27:33 +01:00
golrokh
23c70e6a3b
Requested column added to the reviewer panels
2015-02-05 12:27:23 +01:00
55a02d9c02
Sigh.
2015-02-05 11:03:24 +01:00
20ee5982b9
[SCIPRO-26519] Fixed problem opening student profile from supervisors project overview of active participants.
...
(Note to self: detach models correctly)
2015-02-05 10:19:00 +01:00
golrokh
6a82ba3a93
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
core/src/main/java/se/su/dsv/scipro/notifications/notifications.properties
2015-02-05 10:12:23 +01:00
295d815f80
[SCIPRO-26332] Fixed problem when trying to download a file with invalid id.
...
There was a reason PublicFileDescriptionService#findOne returned an Option and that was not so you could call #get on it.
2015-02-05 10:08:18 +01:00
62a725aeb3
Fixed test.
2015-02-04 10:28:02 +01:00
73d3916461
Made the tabs for the supervisors grading reports in the reviewers grading report view super-explicit.
2015-02-04 10:07:40 +01:00
675724ddd9
Added stupid title explaining what the "Interact with supervisor" is.
2015-02-04 10:04:30 +01:00
779bf391da
Cleaning.
2015-02-04 09:56:22 +01:00
7e95f9ce4e
Fixed problem when trying to update a user without changing email (it is not unique but it belongs to the current user.)
2015-02-04 09:54:40 +01:00
e1cb343cd1
Minor clean up.
2015-02-04 09:51:07 +01:00
a09a707465
Fixed test.
2015-02-04 09:47:51 +01:00
bfaa242c9c
Changed the contents and title of the first meeting mail.
2015-02-04 09:37:23 +01:00
ee075edeeb
Bleh stupid frameworks.
2015-02-04 09:32:13 +01:00
9f23850618
Removed title truncation for reviewers.
2015-02-04 09:20:13 +01:00
18859b4010
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2015-02-03 17:45:22 +01:00
a419e010e1
Add supervisor comment to decision
2015-02-03 17:23:23 +01:00
golrokh
8552ab4e39
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
core/src/main/java/se/su/dsv/scipro/notifications/notifications.properties
2015-02-02 16:26:46 +01:00
golrokh
17885157ad
Show idea modal when click on a idea-notification
2015-02-02 16:25:28 +01:00
f0d114b485
Improved the contents of the first meeting notification. Now includes date, room and description. (Bit of a hack to fit in three values).
2015-02-02 15:33:53 +01:00
76fd29d43f
Made the supervisor description for first meeting show as a multi line label to preserve the formatting and not be a stupid wall of text.
2015-02-02 14:44:47 +01:00
b2db9db928
Changed "EXPORT_SUCCESS" notification to be project based and link to the overview.
2015-02-02 14:13:12 +01:00
ee37ff2321
Truncated title in the reviewers approval tabs (because we like empty space).
2015-02-02 10:25:56 +01:00
8e006880a8
Truncated title in the reviewers final grading report tab (because we like empty space).
2015-02-02 10:22:17 +01:00
golrokh
2b8d3bf059
the text fixed as janne said!
2015-02-02 09:50:04 +01:00
9e3670cc58
Fixed test after column reordering.
2015-01-30 16:13:34 +01:00
aada364c0b
Changed link to bookmarkable from ajax.
2015-01-30 16:09:04 +01:00
e38153eb78
Changed columns in reviewers table for final grading reports. Now similar to the approvals; Title, Deadline, Authors, Supervisor.
2015-01-30 15:53:19 +01:00
1a9b0ff193
Changed title of profile dialogs to "Profile for <person>" from "Profile for user <person>".
2015-01-30 15:49:12 +01:00
9f2d5a722b
Merge remote-tracking branch 'origin/develop' into develop
2015-01-30 15:06:37 +01:00
57b816aa47
Refactored so more parts of the system use the new MultipleUsersColumn.
2015-01-30 15:06:32 +01:00
b4eb6c086a
Removed inferior duplicate version of display multiple users column.
2015-01-30 14:58:12 +01:00
bd7e3a8498
Improved method name.
2015-01-30 14:57:35 +01:00
golrokh
2083fa22af
Merge remote-tracking branch 'origin/develop' into develop
2015-01-30 14:57:19 +01:00
golrokh
1c6d8ec94c
Changed the title of interact with supervisor and added an info panel for extra info
2015-01-30 14:57:14 +01:00
e1eba8eb12
Merge remote-tracking branch 'origin/develop' into develop
2015-01-30 14:56:20 +01:00
3c50cda848
Added columns to display authors and head supervisor to rough draft and final seminar approvals.
2015-01-30 14:56:16 +01:00
golrokh
d6a947a7fa
Merge remote-tracking branch 'origin/develop' into develop
2015-01-30 14:41:45 +01:00
golrokh
229e353e77
Added confirmation message before delete an activity template
2015-01-30 14:41:40 +01:00
e937a5c567
Tightened the class constraints a bit.
2015-01-30 14:12:03 +01:00
6439bd2281
Merge remote-tracking branch 'origin/develop' into develop
2015-01-30 14:10:27 +01:00
7a0d9ba284
Added new activity action "final seminar thesis".
2015-01-30 14:10:22 +01:00
golrokh
a1bed485a5
Merge remote-tracking branch 'origin/develop' into develop
2015-01-30 14:04:35 +01:00
golrokh
10af8cdc2f
Changed Activity's description to Nullable
2015-01-30 14:02:22 +01:00
65291e70b6
Added new activity action "final thesis".
2015-01-30 13:57:22 +01:00
2c0ff56fa8
Added test to make sure the activity plan panel can handle all types of actions.
2015-01-30 13:29:17 +01:00
0a1b400a5c
Removed stupid test.
2015-01-30 12:37:46 +01:00
a9decef4d1
Migrated activity plan templates to support new actions.
2015-01-30 10:57:21 +01:00
bfec3d7a5a
Removed old uploadRequired attribute.
2015-01-30 10:43:18 +01:00
ef98964cfa
Migrated activity plan panel to handle the new actions.
2015-01-30 10:19:20 +01:00
2d797d133a
[SCIPRO-26427] Fixed updating of checklist answers.
...
Also fixed a few stale models.
2015-01-23 12:44:55 +01:00
13dd441e45
[SCIPRO-26424] Fixed problem when trying to add opponents at the same time as creating the final seminar.
2015-01-20 11:32:18 +01:00
1df06ae81c
Improved AddUsersPanel to not copy/replace the model and instead reflect changes in it.
2015-01-20 11:31:00 +01:00
86a54668aa
Changed ListAdapterModel to be derived from AbstractReadOnlyModel so it does not cache invalid data if the underlying model is changed.
2015-01-20 11:29:43 +01:00
21958609fa
Removed useless page parameter variables.
2015-01-20 09:56:07 +01:00
0365e74f2e
[SCIPRO-26412] Fixed exporting notifications to Excel.
2015-01-19 09:38:17 +01:00
c7dab120db
[SCIPRO-26410] Fixed lazy exception when opening the supervisor profile in interact with supervisor.
2015-01-19 09:26:37 +01:00
8d6c13bb7a
Minor HTML fixes.
2015-01-16 14:05:21 +01:00
dc6b2b9767
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2015-01-16 13:29:16 +01:00
6dfe9dc596
Prepare for project delete phase 1 rollback
2015-01-16 13:28:57 +01:00
04b668b43b
Minor CSS cleaning.
2015-01-15 16:08:18 +01:00
a2d9433893
Fixed font on supervisor project details page.
2015-01-15 16:05:21 +01:00
832f6ccccf
Can't mix matchers and non-matchers.
2015-01-14 16:16:14 +01:00
f2d20d4b2f
Merge remote-tracking branch 'origin/develop' into develop
2015-01-14 16:09:00 +01:00
985f716660
Made the grading report form hide itself when the checkbox is not checked.
2015-01-14 16:08:54 +01:00
137b2606e6
Display grading reports in the reviewer approval process panel.
2015-01-14 16:05:12 +01:00
71f9a01c77
Prepare for project delete phase 1fix
2015-01-14 15:49:31 +01:00
6a0f7185d2
Made it possible to attach a snapshot of the grading report when denying a request.
2015-01-14 15:36:23 +01:00
37c59cb60e
Made it possible to attach a snapshot of the grading report when approving a request.
2015-01-14 15:27:43 +01:00
f830cb61d0
Prepare for project delete phase 1
2015-01-14 14:30:41 +01:00
71858369c2
Moved Scala files to src/main/scala from src/main/java
2015-01-14 11:07:58 +01:00
c0adfdba3a
Fixed CSS warnings.
2015-01-13 16:33:50 +01:00
9f02c1931b
Added descriptive texts in the final seminar approval form.
2015-01-13 16:33:10 +01:00
269a470568
Removed unnecessary unit return value since the warning is turned off now.
2015-01-13 15:56:35 +01:00
34af437d2e
Move HTML file to resources directory. No point keeping it in the Java hierarchy when the code version is Scala.
2015-01-13 15:44:31 +01:00
b4ba8da169
Move Scala file to the src/main/scala hierarchy.
2015-01-13 15:43:04 +01:00
dcfc1b535d
Fixed problem with trying to re-initialize a DataTable when the old one already existing on completed AJAX calls. Now checks that one isn't already present.
2015-01-13 14:55:10 +01:00
48dd3661e9
Fixed placement of the grading in Daisy link on the supervisor grading page.
2015-01-13 12:56:15 +01:00
Andreas Svanberg
9786b10384
Fixed bug that caused the individual criteria to appear twice in the downloaded grading template.
2015-01-12 14:59:51 +01:00
Andreas Svanberg
29a3a2c137
Added status and type filter to interact with supervisors page.
2015-01-12 08:14:08 +01:00
Andreas Svanberg
0770d526cf
Made HTML more readable.
2015-01-12 07:20:13 +01:00
Andreas Svanberg
40417699a6
Pulled the "Interact with supervisor" tab to the right to indicate that it is separate from the rest.
2015-01-12 07:18:16 +01:00
Andreas Svanberg
9079c51009
Made links to Daisy grading and TurnItIn analysis open in new windows.
2015-01-12 07:16:23 +01:00
Andreas Svanberg
cec1ac5a1d
Converted interact with supervisor to javascript-based sorting to enable sorting on "unread posts".
2015-01-12 07:11:11 +01:00
bdaf1ff990
Changed link text on the link to Daisy grading.
2015-01-09 15:23:06 +01:00
fddf51db4b
Changed to JavaConversions when doing the conversion on the Java side of things.
2015-01-07 07:04:43 +01:00
191469ce0f
Merge remote-tracking branch 'origin/develop' into develop
2014-12-19 21:46:50 +01:00
aa3715d9ab
Removed unused private field.
2014-12-19 10:34:36 +01:00
01e493265d
IntelliJ 14 highlighting bug.
2014-12-19 10:03:41 +01:00
93c147dd57
Use passed in wicket id parameter instead of referencing some constant.
2014-12-19 10:03:04 +01:00
3f512b10f7
Changed from DisplayMultiplesPanel to simple ListView.
2014-12-19 09:57:58 +01:00
1b88382c1d
Changed from DisplayMultiplesPanel to simple ListView.
2014-12-19 09:55:04 +01:00
bc28922b6f
Removed sub-package to peer containing the two workers.
2014-12-18 15:27:00 +01:00
159f26ae9a
Added start date column.
...
I wonder how many tweaks we're going to have to add before Janne realizes this is a stupid way to do it and we should have gone the API route instead.
2014-12-18 14:36:42 +01:00
362c0176d6
Added SciPro header to the public projects page.
2014-12-18 14:34:44 +01:00
6d251b66fc
Fixed circular dependency between peer and workerthreads.
2014-12-18 13:04:08 +01:00
6ced389243
Migrated final reference to google.Optional
2014-12-18 12:13:15 +01:00
00db12b7e1
Removed fromOptional smart constructor in WicketFileUpload.
2014-12-18 12:10:46 +01:00
a0ef8d5b7b
Migrated thesis reviews to scala.Option from google.Optional
2014-12-18 11:56:34 +01:00
14f2acbd43
Added smart constructor to WicketFileUpload.
2014-12-18 11:46:36 +01:00
3e69974f0f
Migrated report related functions to scala.Option from google.Optional
2014-12-18 11:39:14 +01:00
80b03d5c97
Migrated peer related functions to scala.Option from google.Optional
2014-12-18 10:59:59 +01:00
cb5f5057a6
Removed duplicate class.
2014-12-18 10:45:51 +01:00
0f09bd9315
Fixed some tests.
2014-12-18 10:00:19 +01:00
4c09e9908d
Migrated more parts of reviewer approvals to scala.Option from google.Optional
2014-12-17 16:29:27 +01:00
2e87840b70
Migrated some missing parts of reviewer approvals to scala.Option from google.Optional
2014-12-17 16:01:33 +01:00
a4d5eacd20
Migrated reviewer approvals to scala.Option from google.Optional
2014-12-17 15:46:52 +01:00
c942e2f3d2
Removed unused peer notification REVIEW_ABORTED.
2014-12-17 15:19:57 +01:00
d49ea8ed83
Removed unused idea notification SUPERVISOR_CHANGE.
2014-12-17 15:16:49 +01:00
b306ab39e4
Removed unused idea notification PARTNER_TIMEOUT.
2014-12-17 15:13:36 +01:00
dd02ff3970
Removed unused idea-related notification events.
2014-12-17 15:09:56 +01:00
e791172c0a
Removed old ForumMailPage, there are now two separate ones used instead.
2014-12-17 14:54:33 +01:00
dfd2826f6c
Removed unused seminar notification event.
2014-12-17 14:48:02 +01:00
golrokh
868cc4432a
link to daisy in the grading tab should be visible all the time
2014-12-16 14:39:11 +01:00
golrokh
306c79d78d
link to daisy in the grading tab should be visible all the time
2014-12-16 11:50:11 +01:00
fc581f1723
Used the proper method instead of the stupid one.
2014-12-12 11:23:57 +01:00
5e7544ea1b
Merge remote-tracking branch 'origin/develop' into develop
2014-12-11 13:35:31 +01:00
afc0b5d46e
Removed no longer used combined date and time field.
2014-12-11 13:34:26 +01:00
2fd541c44c
The separate date and time field now only update their respective parts if a date is already set. This enables you to have both components reference the same date and they will not overwrite each other.
2014-12-11 13:33:39 +01:00
418d093a2d
Admin edit application period now uses separate date and time pickers.
2014-12-11 13:16:11 +01:00
1fecb1f4fd
Edit activity now uses the separate date and time pickers.
2014-12-11 12:59:31 +01:00
e5dc610253
Fixed some required problems in BootstrapDateTimeComponent
2014-12-11 12:59:00 +01:00
fd639924ed
Add activities from template now uses the separate date and time pickers.
2014-12-11 12:48:57 +01:00
a9f4bf5200
First meeting panel now uses the separate date and time pickers.
2014-12-11 11:40:08 +01:00
b80fe9d7e7
Changed display of help text and removed DSV specific information.
2014-12-11 11:30:53 +01:00
61ee8a5c5d
Changed MoveFinalSeminarPanel to use the new separate date and time picker.
2014-12-11 11:21:42 +01:00
7c98d372fb
Changed SeminarCRUDPanel to use the new separate date and time picker.
2014-12-11 10:45:57 +01:00
f495bde7fa
Created a BootstrapTimeField for inputting time and a combined date and time picker using the existing BootstrapDateField.
2014-12-11 10:35:27 +01:00
golrokh
d98f6bcaed
Changed that "Choose one" would be always an option in Application period in Admin-Match-Idea
2014-12-11 10:26:11 +01:00
9beb2ef7e1
Properly populated the model to fix a broken test.
2014-12-10 13:33:32 +01:00
424a1f4d16
Removed the possibility to render an approval without going via query parameters.
2014-12-10 13:17:05 +01:00
d4894ecec8
Made it possible to use the reviewer decision page using query parameters to specify which decision to rule on.
2014-12-10 13:00:58 +01:00
843b5b02b5
Converted to Scala.
2014-12-10 11:36:08 +01:00
golrokh
7c36238de6
Show Reviewer Decision date instead of Requested date in FinalSeminarApproval
2014-12-09 14:51:03 +01:00
golrokh
a6b56d7d6d
changed sorting to DSC but in dateCreated in public project page
2014-12-09 14:04:32 +01:00
golrokh
1e4e67de35
change sorting to Ascending in public project page
2014-12-09 13:15:35 +01:00
golrokh
f26b46e6a7
used our default data table for viewing public projects
2014-12-09 12:06:30 +01:00
golrokh
92ea49e62d
public page for listing active projects
2014-12-08 15:18:55 +01:00
golrokh
2e80f41c25
Merge remote-tracking branch 'origin/develop' into develop
2014-12-08 14:19:34 +01:00
93a885e4d8
Fixed so that forum mails fetch the correct entity and redirects the user correctly.
2014-12-08 14:12:59 +01:00
1334cd8202
Changed some texts.
2014-12-08 14:00:16 +01:00
golrokh
a204d1fb0b
Merge remote-tracking branch 'origin/develop' into develop
2014-12-08 13:45:25 +01:00
golrokh
4f6c87fb3c
Final Seminar Opposition: Point and Motivation should be visible even if not approved
2014-12-08 13:44:46 +01:00
f27e7e1760
Removed reference to deleted NotificationUtils
2014-12-08 13:20:55 +01:00
f142f87be6
Merge branch 'notification_cleaning_after_landing_page' into develop
...
Conflicts:
core/src/main/java/se/su/dsv/scipro/forum/GroupForumService.java
core/src/main/java/se/su/dsv/scipro/forum/GroupForumServiceImpl.java
core/src/main/java/se/su/dsv/scipro/forum/ProjectForumService.java
core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java
core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java
view/src/main/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanel.java
view/src/main/java/se/su/dsv/scipro/forum/ProjectForum.java
view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ProjectForumThread.java
view/src/main/java/se/su/dsv/scipro/forum/panels/unthreaded/CreateForumThreadPanel.java
view/src/main/java/se/su/dsv/scipro/forum/panels/unthreaded/GradingCreateForumThreadPanel.java
view/src/main/java/se/su/dsv/scipro/group/GroupForum.java
view/src/main/java/se/su/dsv/scipro/group/GroupForumThread.java
view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java
view/src/test/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanelTest.java
view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumReplyPanelTest.java
view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumThreadPanelTest.java
2014-12-08 13:19:10 +01:00
db0c5279b0
Merge remote-tracking branch 'origin/develop' into user_events
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ProjectForumThread.java
view/src/main/java/se/su/dsv/scipro/group/GroupForumThread.java
2014-12-08 13:06:35 +01:00
03b1b95e3a
Removed old notification landing pages.
2014-12-08 13:00:17 +01:00
f21ad0f4ed
Fixed grade calculation on the reviewer grading report PDF.
...
It used to display the supervisors grade and ignore the reviewers assessment.
2014-12-08 09:48:57 +01:00
a1c63dcf2e
Renamed field so it does not get shadowed.
2014-12-05 09:26:20 +01:00
fred-fri
f5d8b85f86
public file page
2014-12-05 10:05:18 +09:00
3bcaf67baa
So tired of this shit...
2014-12-04 18:20:53 +01:00
golrokh
3c324cfe4c
better code for showing number of unread supervisor interaction posts in reviewer page
2014-12-04 12:54:29 +01:00
57122c3245
Show the date the grade was reported in the supervisor overview.
2014-12-04 10:58:24 +01:00
golrokh
b0b97bd7f4
Merge remote-tracking branch 'origin/develop' into develop
2014-12-03 15:33:23 +01:00
golrokh
f19298fbbd
Added a new column to see number of unread posts for every individual project in reviewPage
2014-12-03 15:32:52 +01:00
golrokh
34d4abce66
test method for viewing number of unread supervisor posts
2014-12-03 14:55:47 +01:00
golrokh
c957466292
1- Set ForumPosts read when user views the thread.
...
2- Added a badge with total number of unread interaction with posts on reviewPage
2014-12-03 14:46:12 +01:00
59742d37f5
Sonar.
2014-12-03 10:09:25 +01:00
92b620ce69
Fixed lazy exception when opening user profile dialogs in the group details dialog.
2014-12-03 10:00:44 +01:00
fred-fri
84a9b260bb
fenced feedback panel
2014-12-03 09:58:52 +09:00
golrokh
364ce4a075
public var. converted to local var.
2014-12-02 15:06:51 +01:00
golrokh
ad24796255
Deleted the word "Rwanda" from related class names
2014-12-02 14:53:36 +01:00
golrokh
13ba34cb2f
Merge remote-tracking branch 'origin/develop' into develop
2014-12-02 13:44:24 +01:00
f75e40ccd7
Fixed lazy exception when opening user profile dialogs in the add multiple user panel.
...
This class sucks and is the embodiment of evil stateful yuck.
2014-12-02 13:44:05 +01:00
golrokh
697cca2849
added number of unread posts' badge in interact with supervisor tab
2014-12-02 13:31:22 +01:00
563cbc3780
Fixed potential lazy exception (could not reproduce myself).
2014-12-02 13:18:32 +01:00
fred-fri
884322dd46
Merge branch 'grade' into develop
2014-12-02 19:13:09 +09:00
fred-fri
a0b59657ec
Merge remote-tracking branch 'origin/develop' into grade
2014-12-02 19:12:19 +09:00
fred-fri
01c64a57f7
grade statistics
2014-12-02 19:11:57 +09:00
golrokh
a2bdb1a4c1
Set cancel = false when move final seminar
2014-12-02 11:03:56 +01:00
fred-fri
41724dca56
points instead of radios
2014-12-02 17:30:17 +09:00
fred-fri
ff27c4672b
clarifying
2014-12-02 16:01:08 +09:00
fred-fri
41b5b3f172
dont know how to implement provider
2014-12-02 15:56:00 +09:00
ba884932ca
Mocks ftw...
2014-12-01 16:01:12 +01:00
bdd87f098b
Merge branch 'develop' into notification_cleaning_after_landing_page
2014-12-01 15:33:09 +01:00
golrokh
aa0cab0841
Merge remote-tracking branch 'origin/develop' into develop
2014-12-01 15:08:23 +01:00
golrokh
eca6773042
Generalizing FinalSeminar DateValidator and adding tests
2014-12-01 15:08:12 +01:00
b8662f13d6
Reporting grade now saves the date it was reported and also who reported it.
2014-12-01 13:51:08 +01:00
fred-fri
b4eb3e513b
lazy
2014-12-01 11:33:38 +09:00
fred-fri
b78bdde93b
Merge remote-tracking branch 'origin/develop' into develop
2014-12-01 09:24:24 +09:00
fred-fri
99afef9ec8
this is in the wrong place
2014-12-01 09:23:11 +09:00
golrokh
a36da0f60b
Merge remote-tracking branch 'origin/develop' into develop
2014-11-28 16:00:20 +01:00
golrokh
3d05607150
Fixed the problem with error in final seminar date when update room
2014-11-28 16:00:10 +01:00
0236ef4a0e
IntelliJ cant find classes in the same package if they use reserved Scala keywords, using an alias to get around it.
2014-11-28 10:44:06 +01:00
db64781ffe
Removed stupid "unused" presentation logic method from Idea and created appropriate and reusable IColumn and IModel implementations instead.
2014-11-28 10:30:49 +01:00
79c99ecbab
Fixed excel export of Admin/Match
2014-11-28 10:16:05 +01:00
4eced66f30
Fixed so that the models get properly detached.
2014-11-28 09:58:42 +01:00
fred-fri
fe34c5ae2e
lazy
2014-11-28 12:35:57 +09:00
fred-fri
28030d0659
lazy
2014-11-28 12:31:40 +09:00
fred-fri
72e18fab41
custom css for idea panel
2014-11-28 11:47:08 +09:00
52805e3125
Removed a bunch of unnecessary NotificationSource parameters.
2014-11-27 16:50:30 +01:00
c59de3467e
Removed user notifications, they are now sent as straight e-mails.
2014-11-27 15:54:19 +01:00
d0735d0116
Removed sending of user event notifications.
2014-11-27 15:48:51 +01:00
6869ef85a9
Fixed problem when saving and adding more projects that input fields retained their values.
...
Changed AdminEditProjectPage to use a page parameter instead of newing the page which forces wicket to do a redirect and the input parameters get cleared.
2014-11-27 14:42:34 +01:00
fred-fri
494e13cbbc
admin
2014-11-27 16:39:47 +09:00
fred-fri
525548a09c
using anchors instead of ajax
2014-11-27 15:05:33 +09:00
golrokh
68e440dba2
Fixed problem with exportable data table in admin ideas
2014-11-26 14:07:32 +01:00
fred-fri
eb4f10bd9c
Merge remote-tracking branch 'origin/develop' into develop
2014-11-26 10:47:42 +09:00
fred-fri
3a1300f8ac
moving change username
2014-11-26 10:43:00 +09:00
golrokh
0d7741757e
Started instead of created for projects
2014-11-25 14:31:56 +01:00
fred-fri
8b75deb7b9
change username
2014-11-25 17:09:10 +09:00
fred-fri
2750710c08
change username
2014-11-25 16:36:48 +09:00
fred-fri
5f194b9bc4
delete user
2014-11-25 14:56:45 +09:00
fred-fri
aaa79711ec
default content
2014-11-25 14:07:45 +09:00
fred-fri
12b752bb10
wrong boolean
2014-11-25 09:06:37 +09:00
f8fc5cee66
HTML fixes.
2014-11-24 16:38:01 +01:00
a27fc58cc1
Stop unpacking models.
2014-11-24 15:38:48 +01:00
af7714fcfc
Changed administrator to admin.
...
(cherry picked from commit 550d58b)
2014-11-24 15:28:40 +01:00
4af51b32c3
Removed unused field.
2014-11-24 11:12:43 +01:00
b31fdbfb07
Merge branch 'develop' into landing_page
...
Conflicts:
core/src/main/java/modules/CoreModule.java
2014-11-24 10:38:53 +01:00
fred-fri
e53fda6a8b
expand checklist overview
2014-11-24 16:41:06 +09:00
c181a72567
Moved group forum notifications to event based.
2014-11-21 15:29:21 +01:00
738f1f6403
Moved project forum notifications to event based.
2014-11-21 15:25:34 +01:00
d53dd6dbce
Moved ProjectFinalSeminarStatisticsService to the proper package and created its own filter instead of re-using the same one from ProjectService.
2014-11-21 11:13:29 +01:00
36e5e7090b
Merge remote-tracking branch 'origin/develop' into develop
2014-11-21 11:00:36 +01:00
14c29dab16
Removed reference to checklist from project.
2014-11-21 11:00:31 +01:00
golrokh
747fe9cbc1
Merge remote-tracking branch 'origin/develop' into develop
2014-11-21 10:45:09 +01:00
golrokh
ebb723c39f
start added for application period exemption
2014-11-21 10:43:19 +01:00
fred-fri
6aaebcdda8
Merge branch 'plugins' into develop
2014-11-21 18:09:54 +09:00
fred-fri
e3be8a3776
refactoring
2014-11-21 18:09:01 +09:00
golrokh
5f36ea6ddf
Merge remote-tracking branch 'origin/develop' into develop
2014-11-21 09:59:12 +01:00
7139658037
Changed to a property model.
2014-11-21 09:24:12 +01:00
fred-fri
64fd784ea1
complete refactoring of language page
2014-11-21 11:34:29 +09:00
fred-fri
da3341e884
this accomplishes nothing
2014-11-21 10:58:53 +09:00
fred-fri
479bbd4b82
refactoring
2014-11-21 10:34:35 +09:00
fred-fri
485d47b6f7
refactoring
2014-11-21 10:32:56 +09:00
golrokh
2dad663c1e
start added for application period exemption
2014-11-20 15:49:19 +01:00
af27641c9e
Fixed sorting of forum threads.
2014-11-20 15:41:43 +01:00
golrokh
3b74b60968
Project started between instead of created between
2014-11-20 14:06:12 +01:00
golrokh
dd9ef738ab
Project started instead of created
2014-11-20 14:01:55 +01:00
ec2f67a5c3
Merge branch 'develop' into landing_page
2014-11-20 12:40:28 +01:00
94f24ff173
Moved NotificationModule to the Notification package.
2014-11-20 12:09:28 +01:00
74f63f86e9
Notifications now use the new landing page.
2014-11-20 11:22:35 +01:00
golrokh
3b2dbd1e80
Total questions in Checklist overview
2014-11-20 10:48:23 +01:00
4f2858352f
Notifications are now marked read when using the landing page.
2014-11-20 10:42:33 +01:00
76fb28118f
Changed notification data panel to use the new notification landing page.
2014-11-20 10:32:46 +01:00
bff9e1f0ca
Implemented idea notification redirection.
2014-11-20 10:13:38 +01:00
d6470ebcdb
Implemented milestone notification redirection.
2014-11-20 10:03:26 +01:00
8823664086
Changed project forum notifications to only redirect to the project forum overview page instead of specific threads since there is no way to do that at the moment.
2014-11-20 09:58:05 +01:00
af53b60af0
Changed group notifications to only redirect to the group overview page instead of specific thread since there is no way to do that at the moment.
2014-11-20 09:56:11 +01:00
a4a7558c22
Implemented final seminar redirection.
2014-11-20 09:53:55 +01:00
fred-fri
8db9a3f345
clean
2014-11-20 16:49:57 +09:00
fred-fri
c5901ec58d
moving and iffing stuff related to reports in order for final seminars not to crash when grading module is off
2014-11-20 16:46:26 +09:00
fred-fri
6d5f2b0e2e
we dont need to know a user deletion attempt failed, all it does is spam the log
2014-11-20 11:29:28 +09:00
fred-fri
00617a0e42
stahp letting users try to remove languages
2014-11-20 11:25:53 +09:00
fred-fri
70407fc936
stahp letting users try to remove languages
2014-11-20 11:25:26 +09:00
golrokh
4e779b6ebe
Show question in checklist popup
2014-11-19 15:35:50 +01:00
e55fe786ad
Moved hasSupervisingRole to package object and made into an extension method on Project.
2014-11-19 15:35:23 +01:00
838018ea5d
"User redirection"... Why was this implemented as notifications?
2014-11-19 15:30:01 +01:00
02fd749ffe
Implemented project forum redirection.
2014-11-19 15:25:52 +01:00
558a4e362e
Implemented peer review redirection.
2014-11-19 14:47:01 +01:00
5629fc1cd2
Implemented peer request redirection.
...
Missed a lot of cases but they make no sense what-so-ever.
2014-11-19 14:39:15 +01:00
e9f1206a6c
Implemented project redirection.
2014-11-19 13:32:40 +01:00
f1f67e95a1
Renamed UserLocation to UserBasedLocation and changed its contract slightly so that it is required to pass PageParameters.
2014-11-19 11:26:09 +01:00
9731966d7d
Use existing StringValue extension methods.
2014-11-19 11:04:36 +01:00
8e444a4e54
Merge branch 'develop' into landing_page
2014-11-19 10:59:51 +01:00
822fa07809
Merge remote-tracking branch 'origin/develop' into develop
2014-11-19 10:11:50 +01:00
c488a3291c
Sonar.
2014-11-19 10:11:42 +01:00
85b7af9ccb
Removed unused method.
2014-11-19 10:08:23 +01:00
fred-fri
95e13d164d
ok less chaosy markup now
2014-11-19 15:05:04 +09:00
fred-fri
b5404860a3
more markup. the markup is a bit all over the place and doesnt gracefully tolerate small screen sizes, but its tricky to do much better because of the hierarchy of the components.
...
also removing old tests.
2014-11-19 14:22:26 +09:00
fred-fri
65047a6c63
markup
2014-11-19 13:50:19 +09:00
fred-fri
1e3b09aee1
markup
2014-11-19 13:45:56 +09:00
fred-fri
4e7d984222
markup
2014-11-19 13:09:32 +09:00
fred-fri
3fe66b9979
refactoring edit checklist template
2014-11-19 11:18:01 +09:00
b7e67b7b6e
Fixed so that the proper detached model is used instead of unpacking it.
2014-11-17 16:10:41 +01:00
fred-fri
c8d2731788
ajax on checklist answer
2014-11-17 17:08:05 +09:00
fred-fri
4612527026
loadable checklist
2014-11-17 16:04:06 +09:00
fred-fri
c3ffa3a58b
sending to mail page
2014-11-17 12:49:10 +09:00
fred-fri
aec56295a2
merge and remove page
2014-11-17 11:07:58 +09:00
fred-fri
67eaae9345
merge
2014-11-17 10:50:04 +09:00
fred-fri
85ce083c4a
user profile notifications setting whether to receive forum mails
2014-11-14 16:18:51 +09:00
fred-fri
c03ae07a92
larger popup, info
2014-11-14 13:10:15 +09:00
fred-fri
c95ee802e2
lazy stuff
2014-11-14 12:08:26 +09:00
fred-fri
da47bba25f
prevent crash on exempt already exempted user
2014-11-14 11:33:00 +09:00
fred-fri
54a6495fc4
multiline
2014-11-14 10:33:32 +09:00
fred-fri
eb748d9a8b
refactoring
2014-11-13 14:38:07 +09:00
fred-fri
ac9c4ce547
system template
2014-11-13 12:54:50 +09:00
fred-fri
927f063169
more cleaning
2014-11-12 15:34:07 +09:00
fred-fri
e6cc63b188
cleaning
2014-11-12 15:13:27 +09:00
fred-fri
6e62cdfdd0
moving form
2014-11-12 14:53:01 +09:00
fred-fri
c78d26c573
copy to clipboard
2014-11-12 14:26:23 +09:00
fred-fri
11f30a73f5
refactor mail panel, selection of recipients more granular
2014-11-12 12:07:31 +09:00
7b57c9a023
Yuck un-threaded forum.
2014-11-11 16:39:51 +01:00
golrokh
e52cd97e5c
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
2014-11-11 14:08:32 +01:00
golrokh
5db9a34418
sql for updating old thesis event
2014-11-11 13:55:59 +01:00
51334357c5
Merge remote-tracking branch 'origin/develop' into develop
2014-11-11 13:26:44 +01:00
714e19b0ea
Converted unnecessary DataView to simpler ListView (there was no paging and Long.MAX_VALUE threads per page).
2014-11-11 13:26:39 +01:00
d793ce1596
Renamed ForumThreadProvider to ProjectThreadProvider since that is what it is.
2014-11-11 12:36:38 +01:00
golrokh
1a78389145
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
...
Conflicts:
core/src/main/java/se/su/dsv/scipro/crosscutting/ReviewingNotifications.java
core/src/test/java/se/su/dsv/scipro/crosscutting/ReviewingNotificationsTest.java
view/src/main/java/se/su/dsv/scipro/landingpages/ProjectLandingPage.java
2014-11-11 11:31:49 +01:00
fred-fri
f90e1865fd
Merge remote-tracking branch 'origin/develop' into develop
2014-11-11 17:40:49 +09:00
fred-fri
c5279f93aa
removed default "chart title"
2014-11-11 17:40:35 +09:00
6758d3ad63
Merge remote-tracking branch 'origin/develop' into develop
2014-11-11 09:14:05 +01:00
fred-fri
8988d9273d
markup fixes
2014-11-11 17:07:59 +09:00
b5ef548834
Merge branch 'develop' into forum
2014-11-11 09:04:18 +01:00
fred-fri
7e1ae65c8f
mail page fixes
2014-11-11 16:41:25 +09:00
fred-fri
f792677817
reset sorting
2014-11-11 16:27:18 +09:00
fred-fri
33f486095d
not always sys admin for users who have the role, but only when template is created in the admin interface
2014-11-11 16:18:23 +09:00
fred-fri
10c82390df
book a room
2014-11-11 16:06:50 +09:00
fred-fri
7f8f923ff4
removing plugins
2014-11-11 16:04:00 +09:00
fred-fri
0db682c32e
date fix
2014-11-11 15:13:29 +09:00
fred-fri
91a6e36748
visibility fix
2014-11-11 14:19:34 +09:00
fred-fri
65a423c09f
chart improvements
2014-11-11 11:33:53 +09:00
02ad3dcb0c
Yeah
2014-11-10 16:53:51 +01:00
8b44380efa
Refactored.
...
Notifications when (de-)activating projects now use landing page (overview of said project).
2014-11-10 13:07:03 +01:00
47d900883f
Removed outwards dependencies from system package by adding foreign key cascading instead.
2014-11-10 12:58:22 +01:00
bbafd42b91
Removed unused field.
2014-11-10 11:44:55 +01:00
fred-fri
c451654b52
checklist overview
2014-11-10 19:32:09 +09:00
d0ff8510c3
Merge remote-tracking branch 'origin/develop' into develop
2014-11-10 10:57:35 +01:00
b74688da38
Merge remote-tracking branch 'origin/develop' into forum
...
Conflicts:
core/src/main/java/se/su/dsv/scipro/forummail/ForumMailFormatterImpl.java
2014-11-10 10:54:06 +01:00
fred-fri
8b2d88dd2f
shorter feedback
2014-11-10 15:40:20 +09:00
fred-fri
48d9ae92bf
removing logging
2014-11-10 14:44:20 +09:00
fred-fri
0988263cdd
removing logging
2014-11-10 14:25:56 +09:00
951ffa4253
Fixed "Supervisor" in role filter for supervisors "My projects" page.
2014-11-07 17:01:30 +01:00
7dc6cf25dc
Renamed Thread to ForumThread.
2014-11-07 16:49:31 +01:00
e40a2fd3c4
Moved reviewer interaction service to reviewer package.
2014-11-07 16:19:45 +01:00
c0386598c4
Merge remote-tracking branch 'origin/develop' into forum
2014-11-07 16:12:33 +01:00
e16de6f026
Landing pages for forum mail.
2014-11-07 15:39:56 +01:00
golrokh
eb6abfaf11
Merge remote-tracking branch 'origin/develop' into separateFinalSeminarAndRoughDraftEvents
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/HomePage.java
2014-11-07 14:03:05 +01:00
golrokh
676852577f
Janne says not delete them
2014-11-07 13:27:10 +01:00
fred-fri
3844f4f43e
sonar
2014-11-07 17:58:01 +09:00
fred-fri
61f846a746
sonar
2014-11-07 17:57:02 +09:00
fred-fri
7ec270fae8
checklistdetails breaks something, commenting out temporarily
2014-11-07 16:59:09 +09:00
bb73d38a2f
Merge remote-tracking branch 'origin/develop' into forum
2014-11-07 08:44:04 +01:00
fred-fri
ad1f0fc721
sonar
2014-11-07 14:46:13 +09:00
fred-fri
1287f2a340
checklist overview panel
2014-11-07 14:46:02 +09:00
e4d43c04d6
Removed defunct test.
2014-11-06 17:02:50 +01:00
35ab6d3b35
Added notifications when messages are posted in reviewer interaction.
2014-11-06 17:02:28 +01:00
446398359c
Fixed missing id in test.
2014-11-06 15:25:30 +01:00
52996c9622
Merge remote-tracking branch 'origin/develop' into forum
...
Conflicts:
view/src/test/java/se/su/dsv/scipro/ForumMailPageTest.java
2014-11-06 15:14:42 +01:00
1b3c6e2b93
Added back surrogate key to ProjectThread.
2014-11-06 15:08:24 +01:00
604c4dc154
Renamed ForumThread to ProjectThread
2014-11-06 14:29:15 +01:00
99743d7f38
ForumThread uses composition over inheritance.
2014-11-06 14:07:13 +01:00
golrokh
f3cc57079d
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
2014-11-06 13:59:25 +01:00
golrokh
86308ed2d0
Fixed tests
2014-11-06 13:58:45 +01:00
golrokh
14b76a39c6
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
2014-11-06 11:30:48 +01:00
golrokh
8607f7127d
fixed ul li style in header
2014-11-06 11:29:29 +01:00
golrokh
826e318fc2
The last selected role saved and returned and the next login
2014-11-06 11:23:40 +01:00
golrokh
49fb7b61ac
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
2014-11-06 10:40:05 +01:00
f2f017886b
Reviewer thread uses composition over inheritance.
2014-11-05 16:22:02 +01:00
golrokh
d712ae09e5
The latest selected role will be saved in db + roles menu changed to DDL
2014-11-05 16:06:05 +01:00
fd5e712e7c
GroupThread no longer inherits from Thread.
...
Freeeeeeeeeeeeeeeeedoooooooooooooooom.
2014-11-05 15:39:56 +01:00
2d37a0ea78
Removed the set/mark thread read method from the two specific interfaces.
2014-11-05 12:37:56 +01:00
cec2e8c6da
GroupForumService no longer inherits from BasicForumService but instead calls it in its implementation.
2014-11-05 12:18:38 +01:00
golrokh
dda36f9c4a
Removed everything related to notification panel form abstract panel
2014-11-05 11:20:11 +01:00
golrokh
07a185e26f
Merge remote-tracking branch 'origin/develop' into develop
2014-11-05 11:15:24 +01:00
golrokh
c6f0872a65
Separate notificationMenuPanel from AbstractMenuPanel
2014-11-05 11:15:18 +01:00
b6cb674e87
ProjectForumService no longer inherits from BasicForumService but instead calls it in its implementation.
2014-11-05 11:05:58 +01:00
fred-fri
68b5852c38
refactoring checklist gui
2014-11-05 18:49:23 +09:00
2afc20e451
Removed dependency on CreateForumThreadPanel, what is that disaster?
2014-11-04 16:10:12 +01:00
d4488b8549
Fixed missing dependency/argument.
2014-11-04 15:11:44 +01:00
7d30126a34
OMG I HATE FUCKING INHERITANCE.
...
Had such a perfect clean abstraction and then ProjectFile...
2014-11-04 14:30:49 +01:00
2f20d7fbcd
Submitting threads is now done via the Forum type class.
...
Old WicketForumService has been retired.
2014-11-04 14:17:30 +01:00
d0b1e3172a
Fixed subject on project forum threads.
2014-11-04 13:42:59 +01:00
988a8ce990
Fixed warning.
2014-11-04 13:37:40 +01:00
f7be2d9578
Converted ViewForumThreadPanel to the new ForumThread type class.
2014-11-04 13:34:26 +01:00
golrokh
b149aaad0e
Devided Thesis related events to Rough draft events and final seminar events
2014-11-04 12:02:26 +01:00
8e84b480e2
Start of migrating forum to proper structure with composition instead of inheritance.
...
Supervisor approvals has been migrated.
2014-11-04 11:08:55 +01:00
golrokh
b2a6e77529
Merge remote-tracking branch 'origin/develop' into develop
2014-11-04 10:07:26 +01:00
golrokh
e891aab4ed
Notification for final seminar approvals redirects the reviewer to the right tab
2014-11-04 10:07:18 +01:00
bdabe6ffb3
Removed unused constructor.
2014-11-04 09:59:44 +01:00
4084a735bc
Sonar.
2014-11-04 09:30:51 +01:00
fred-fri
95f73240b2
Merge remote-tracking branch 'origin/develop' into develop
2014-11-04 17:30:10 +09:00
fred-fri
0cdf91e0b3
final seminar no longer crashes on creation
2014-11-04 17:29:53 +09:00
b056ade1d5
Formatting and minor fixes.
2014-11-04 09:03:50 +01:00
36086cfef2
Fixed checkbox.
2014-11-04 08:22:15 +01:00
fred-fri
b210db08d0
this text sucks
2014-11-04 10:56:15 +09:00
aa6250436c
Removed unused panel.
2014-11-03 16:19:38 +01:00
aac1a78e50
Removed checkboxes for completing milestones from supervisors overview.
2014-11-03 15:43:54 +01:00
df416e2f91
Added missing mock service to SciProTest
2014-11-03 13:31:08 +01:00
3df00ccd9e
Warnings and using implementation classes is usually a good indication that you're doing it wrong.
2014-11-03 13:30:14 +01:00
16f24309b8
Warnings and using implementation classes is usually a good indication that you're doing it wrong.
2014-11-03 13:05:19 +01:00
golrokh
1ada080050
Merge branch 'radioGroupForPointsInGrading' into develop
2014-11-03 13:01:33 +01:00
golrokh
96c53d8d23
Merge remote-tracking branch 'origin/develop' into develop
2014-11-03 13:00:53 +01:00
golrokh
6fc396d765
in create final seminar, show language as selected only if one language exists
2014-11-03 13:00:45 +01:00
5ab92ea9af
...
2014-11-03 11:24:35 +01:00
fred-fri
9e42aaf4ed
Merge remote-tracking branch 'origin/develop' into develop
2014-11-03 19:22:05 +09:00
fred-fri
7aa7c14200
refactoring services
2014-11-03 19:21:51 +09:00
a0383e17e3
Fixed CSS class for checkboxes.
2014-11-03 11:20:53 +01:00
fred-fri
e9dbe975dc
table rows per page position fix
2014-11-03 18:45:31 +09:00
fred-fri
4fe2d17167
no notification from supervisorapprovalpanel
2014-11-03 18:06:23 +09:00
fred-fri
42a34e4585
this is better
2014-11-03 17:49:24 +09:00
fred-fri
46a70d3df2
adding languages when creating supervisor
2014-11-03 17:47:25 +09:00
b2da968c10
Start of proper landing page.
2014-11-03 09:44:21 +01:00
fred-fri
082d3f69b8
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-11-03 17:17:10 +09:00
fred-fri
532a484700
final seminar statistics
2014-11-03 17:09:27 +09:00
fred-fri
b07e8db34f
final seminar statistics prep
2014-11-03 16:07:42 +09:00
88e9c03ffa
Fixed label position for all checkboxes as well.
2014-11-01 20:24:47 +01:00
0ce5e9be8f
Set label position in AjaxRadioChoice instead of every individual call site.
2014-11-01 20:16:52 +01:00
62d8ba348f
More fixes for RadioChoices after Bootstrap 3.3
2014-11-01 20:14:04 +01:00
1e06a1311e
Fixed some radio and checkbox groups after upgrading to Bootstrap 3.3
2014-11-01 16:51:12 +01:00
ced7bf6a58
Removed faulty CSS rules since the introduction of Bootstrap theme.
2014-10-31 12:16:22 +01:00
golrokh
f7243288ae
fix styling and description
2014-10-31 12:10:59 +01:00
golrokh
22544bccfe
Merge branch 'develop' into radioGroupForPointsInGrading
2014-10-31 11:25:12 +01:00
golrokh
05bb43a3cd
Removed Description from GradingCriterion but kept it in Criterion because we need to keep history of descriptions we used in the opposition reports
2014-10-31 11:23:26 +01:00
656ea430ec
Removed footer from the log in/log out pages.
2014-10-31 10:23:33 +01:00
9bddae6644
Reviewers final seminar notifications now always end up on the preliminary grading report tab if they use the landing page.
2014-10-31 09:54:47 +01:00
302b70febb
Refactored.
2014-10-31 09:43:38 +01:00
48a7492526
Removed old unused files.
2014-10-30 16:08:19 +01:00
a1d2d7fd1b
Switched to proper bootstrap-theme with simple overrides for .well
2014-10-30 16:04:34 +01:00
golrokh
b952229a0b
changed after technical review
2014-10-30 16:02:24 +01:00
4cdec2c8a9
Upgraded to jQuery 2 for modern browsers.
...
Deleted some old local copies of jQuery 1.
2014-10-30 15:32:09 +01:00
b7a33ea5db
Upgraded to Bootstrap 3.3.0 (from 3.1.1) and switched to a CDN instead of local copies.
2014-10-30 15:31:04 +01:00
e88e66ba38
Fixed proper Bootstrap HTML for the filter form on Admin / Project management / Projects.
2014-10-30 15:11:30 +01:00
golrokh
b8e2d28b8b
Merge branch 'develop' into radioGroupForPointsInGrading
2014-10-30 14:58:33 +01:00
1831e10fb4
Added default sorting by template number, it looked really weird without it.
2014-10-30 14:34:05 +01:00
ee70f090bd
Added external room booking setting and it is shown on final seminar crud panel if it is set.
2014-10-30 12:51:26 +01:00
fred-fri
0d5e38dd04
added comment to approval requests
2014-10-30 14:02:34 +09:00
fred-fri
ad1022fbcb
adding daisy link
2014-10-30 11:51:18 +09:00
fred-fri
a69417cca1
clarification
2014-10-30 10:56:28 +09:00
fred-fri
b92741c640
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-10-29 19:39:51 +09:00
fred-fri
644e09cc5e
refactor
2014-10-29 19:35:21 +09:00
35cb692cf9
If it is a list, treat it as a list. get(int) should never ever be called.
2014-10-29 10:01:38 +01:00
fred-fri
92778160d3
test
2014-10-29 17:48:21 +09:00
fred-fri
5a874b7ef1
removed br
2014-10-29 17:18:04 +09:00
fred-fri
bd78e10e01
pdf validation
2014-10-29 17:17:50 +09:00
fred-fri
724e9cd302
added ajax to firstmeeting
2014-10-29 15:08:34 +09:00
fred-fri
41a8c35d36
rename
2014-10-29 09:14:23 +09:00
golrokh
c9cd034ca5
final version
2014-10-28 15:09:49 +01:00
53af188834
Bootstrap CSS validation is now added on AJAX completion in addition to page load.
2014-10-28 13:18:27 +01:00
e7bee67ffb
Fixed serialization warning.
2014-10-28 13:16:08 +01:00
5a60b59e2a
Feedback is now shown on successful scheduling of the first meeting.
2014-10-28 13:11:43 +01:00
16a5e7beef
Fixed problem when clicking save multiple times in the first meeting dialog.
...
If you need a detachable model but you do not have a DomainObject you can use DetachableModel and provide the proper persistence strategy.
2014-10-28 13:10:36 +01:00
617a731965
So lazy about building test data.
2014-10-28 10:59:58 +01:00
dc5de3885c
Fixed date filter in Admin / Unit / Statistics.
2014-10-28 10:49:45 +01:00
f02d8b878e
Fixed AJAX behaviours for the Bootstrap date pickers.
2014-10-28 10:49:27 +01:00
f5a69e4e0d
[SCIPRO-20429] Fixed sorting problem.
2014-10-28 10:28:51 +01:00
fred-fri
bae21e62d4
Merge remote-tracking branch 'origin/develop' into develop
2014-10-28 18:02:05 +09:00
6c265d48a3
Fix Sonar issues.
2014-10-28 09:58:37 +01:00
fred-fri
4aae6dfc75
simple stuff done
2014-10-28 17:45:52 +09:00
fred-fri
e8509ced1e
footer fixes
2014-10-28 10:05:24 +09:00
golrokh
3ff40dd7cf
merge with develop and fix some problems
2014-10-27 16:05:41 +01:00
golrokh
96bf0492da
merge with develop and fix some problems
2014-10-27 16:05:17 +01:00
golrokh
893b2e3f1c
functioning version, tests needs to be fixed
2014-10-27 10:45:50 +01:00
fred-fri
cdfadeafcb
password fixes
2014-10-27 17:22:38 +09:00
fred-fri
ac69608394
group forum uploads bug fix
2014-10-27 13:35:30 +09:00
golrokh
268ac464fa
:(
2014-10-24 15:58:10 +02:00
fred-fri
4efddf749d
submit on download grade report
2014-10-24 17:25:43 +09:00
fred-fri
bc69303f4e
this took a while to find lol
2014-10-24 16:07:13 +09:00
fred-fri
26c3b90b17
submit as preliminary grading report now submits properly
2014-10-24 11:52:22 +09:00
golrokh
d99af355d0
should be fixed
2014-10-23 16:02:03 +02:00
a9675369b7
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-10-23 11:18:40 +02:00
858d963add
Preliminary grading removed requirement to be filled in before submit.
2014-10-23 11:18:08 +02:00
1abcc9e696
Fixed tests.
2014-10-23 09:11:15 +02:00
29ff86f756
Removed some old unused dependencies.
2014-10-22 16:48:47 +02:00
b0438aad87
Removed StylableDateTimeField since it is no longer in use.
2014-10-22 16:43:54 +02:00
2c1a10525d
Fixed some references to DateTextField from wicket-extensions.
2014-10-22 16:43:04 +02:00
eaa6c79c0e
Switched to Bootstrap date picker.
2014-10-22 16:40:48 +02:00
8c03e314f8
Switched to Bootstrap date picker.
2014-10-22 16:19:59 +02:00
01ee19d799
Switched to Bootstrap date picker.
2014-10-22 16:11:17 +02:00
d5990324f4
Fixed test.
2014-10-22 15:59:37 +02:00
82e6cc0504
Switched to Bootstrap date picker.
2014-10-22 15:57:48 +02:00
39e84a45ef
Merge remote-tracking branch 'origin/develop' into develop
2014-10-22 15:48:56 +02:00
af9a1fe022
Inlined the date pickers on large screens.
2014-10-22 15:48:33 +02:00
84b061d7ce
Shortened the form width.
2014-10-22 15:46:20 +02:00
c0cdb7eec5
Bootstrapped the HTML.
2014-10-22 15:44:59 +02:00
7f40184405
Changed to Bootstrap date fields.
2014-10-22 15:39:30 +02:00
8e34ad237e
Removed stupid border component and replaced it with the simpler date picker component.
2014-10-22 13:59:38 +02:00
golrokh
ec5bad9640
Stable in test & ui
2014-10-22 13:54:27 +02:00
af57c5f2ec
Created a simple behavior that adds the calendar add-on instead of a complex and annoying border.
2014-10-22 13:53:44 +02:00
e704f0ad57
Refactored.
2014-10-22 10:28:31 +02:00
0f76878d4a
Bootstrapped the HTML.
2014-10-22 09:55:45 +02:00
f01e440005
Switched to Bootstrap date picker when adding exemptions.
2014-10-22 09:52:09 +02:00
4c5b3d2e01
Creating the markup-id using getMarkupId(true) in on AFTER render is obviously too late :p
2014-10-22 09:51:04 +02:00
fred-fri
b906635cde
removing jetty
2014-10-22 16:44:27 +09:00
d6ff79ed51
DatePickerPanel now uses pretty Bootstrap date pickers.
2014-10-22 09:16:39 +02:00
3877d52c90
Replaced the date filtering component on the milestone statistics page.
2014-10-22 09:08:10 +02:00
4ca1555c45
Added Bootstrap date picker (without time).
...
Created a border component for adding a calendar icon that focuses the containing input tag.
2014-10-22 09:07:44 +02:00
52d2a528c2
Merge remote-tracking branch 'origin/develop' into develop
2014-10-22 09:07:26 +02:00
bfcbce70ca
All these rows make me sick.
2014-10-22 08:46:42 +02:00
fred-fri
c5cb603f15
removed panel
2014-10-22 13:19:55 +09:00
fred-fri
943f4a8809
tests
2014-10-22 11:39:12 +09:00
fred-fri
198a5658e4
markup fixes
2014-10-22 10:59:33 +09:00
fred-fri
1f2c96a0fd
small fixes
2014-10-22 10:13:12 +09:00
000d644271
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-10-21 17:20:12 +02:00
28535e7a94
Added feedback to save & add more users #2300 2
2014-10-21 17:20:01 +02:00
golrokh
5b73bdceee
keep required to pass
2014-10-21 16:25:09 +02:00
27b107d061
Merge remote-tracking branch 'origin/develop' into develop
2014-10-21 15:24:50 +02:00
1973721b8e
Changed "initial assessment" to "first version".
2014-10-21 15:24:44 +02:00
fred-fri
f4cbd08953
header
2014-10-21 16:34:17 +09:00
ba3447be52
Fixed duplicate HTML ids on the supervisor grading page that broke dialog toggling and finalize checkbox.
2014-10-21 08:33:49 +02:00
fred-fri
f05dadd7b9
standards
2014-10-21 14:25:28 +09:00
fred-fri
88bc17c08e
https on gravatar
2014-10-21 12:50:07 +09:00
fred-fri
e5e9f52f5e
space
2014-10-21 12:05:54 +09:00
fred-fri
d7dea9d91d
added edit icon
2014-10-21 10:39:53 +09:00
fred-fri
d24672d034
fixes and adding panel
2014-10-21 09:25:10 +09:00
3de0d83d2e
Added feedback to save & add more users #2300
2014-10-20 23:13:18 +02:00
fred-fri
28c9506639
Merge remote-tracking branch 'origin/develop' into develop
2014-10-20 17:15:52 +09:00
fred-fri
fe43e2fb6a
adding rwandagrade
2014-10-20 17:15:38 +09:00
847a47493b
Removed unnecessary fields.
2014-10-20 09:58:16 +02:00
d58282d1ab
Removed faulty back link.
2014-10-20 09:43:38 +02:00
fred-fri
aa06b60d09
switching places
2014-10-20 11:16:36 +09:00
fc5e1dc344
Test fixes.
2014-10-17 16:56:04 +02:00
49289fba8e
Swapped date and title to make it match Peer.
2014-10-17 16:53:49 +02:00
be5ebfd962
Updated the preliminary grading report link on the final seminar page to point the user to the correct new pages.
2014-10-17 16:33:21 +02:00
741816f1f3
Test fixes.
2014-10-17 16:32:27 +02:00
f2e4c37f73
It is now possible to submit a snapshot of either grading report as preliminary grading report to a final seminar.
2014-10-17 14:54:15 +02:00
fred-fri
15d89f60c6
made variables set instead of hashset
2014-10-17 18:14:07 +09:00
fred-fri
860eb284b6
Merge remote-tracking branch 'origin/develop' into develop
2014-10-17 18:08:17 +09:00
fred-fri
2c6629fbb7
test
2014-10-17 18:00:09 +09:00
644e9db6b9
Merge remote-tracking branch 'origin/develop' into develop
2014-10-17 10:03:38 +02:00
89a7a87ad9
[SCIPRO-20301] Fixed rendering of student ideas for supervisor.
2014-10-17 10:03:29 +02:00
fred-fri
a57e0d35a6
cleanup
2014-10-17 16:52:38 +09:00
fred-fri
0d9db71deb
rewritten opposition and participation gui
2014-10-17 16:27:29 +09:00
fred-fri
214620c2ad
refactoring multiple attachments
2014-10-17 13:46:50 +09:00
fred-fri
f853793e56
Merge branch 'develop' into attachments
2014-10-17 12:41:38 +09:00
fred-fri
018cb5d6a3
improved display of checklist title and description
2014-10-17 12:31:28 +09:00
fred-fri
0f2379cb82
improved info
2014-10-17 11:34:38 +09:00
fred-fri
806d74afd7
final grading report > grading report in a single place
2014-10-17 11:16:54 +09:00
fred-fri
a74cbdc901
Revert "final grading report > grading report"
...
This reverts commit 4dee431b3c
2014-10-17 11:13:10 +09:00
8d1ba39723
Change checklist text format to header fix test
2014-10-16 20:05:42 +02:00
1fb42a3948
Change checklist text format to header
2014-10-16 19:10:36 +02:00
golrokh
21f9de4a4f
DB and classes changed
2014-10-16 17:49:45 +02:00
eb27cb1771
Add description text to add exception panel
2014-10-16 16:13:30 +02:00
455ad130fa
Local user table split name add e-mail
2014-10-16 16:09:54 +02:00
03ddbc622e
Admins can now change users password.
2014-10-16 14:05:21 +02:00
9f9cf107de
Removed bottom margin on buttons within modal footers.
2014-10-16 14:04:01 +02:00
8c12482542
Fixed approval history to also show reason with MultiLineLabel
2014-10-16 11:02:41 +02:00
ad5561275b
Bootstrapped the HTML and fixed IDE warnings due to wicket:for
2014-10-16 10:56:53 +02:00
fred-fri
94386a1544
refactoring multiple attachments
2014-10-16 17:55:59 +09:00
701030874f
Simplified HTML.
2014-10-16 10:30:21 +02:00
b4bfb44662
Green button.
2014-10-16 10:25:36 +02:00
a802b1b3f9
Changed text.
2014-10-16 10:24:43 +02:00
golrokh
80e5e16bd8
Add point template to the DB
2014-10-16 10:17:56 +02:00
fd0914c036
Merge remote-tracking branch 'origin/develop' into develop
2014-10-16 10:04:02 +02:00
2431214ef7
Refactored so the boolean parameter is actually used.
2014-10-16 10:03:56 +02:00
142b91b99c
Some more minor touches.
2014-10-16 09:47:39 +02:00
fred-fri
c7b66cba20
Merge branch 'develop' into attachments
2014-10-16 16:47:04 +09:00
ecad9d6a3f
Removed warning suppression.
2014-10-16 09:45:44 +02:00
fred-fri
751f22cc1c
test
2014-10-16 16:45:41 +09:00
51603fcfc9
Removed useless user field. Less state = better.
2014-10-16 09:43:19 +02:00
948eaca150
Removed second useless parameter.
2014-10-16 09:40:01 +02:00
aa37c37059
Removed useless parameter.
2014-10-16 09:38:27 +02:00
fred-fri
e68f4f566b
removed reference to daisy in gui
2014-10-16 14:54:43 +09:00
fred-fri
17f778da27
gui
2014-10-16 14:53:39 +09:00
fred-fri
2ab4dc9aa7
multilinelabel
2014-10-16 12:57:57 +09:00
fred-fri
592c5b6d70
tables side by side
2014-10-16 12:45:03 +09:00
6d726ce21d
Small presentation improvements.
2014-10-15 13:23:29 +02:00
5a2ebac64c
Refactored AddActivitiesFromTemplatePanel into a straightforward panel without too much AJAX and dialog crap. Also simplified the logic for switching between list and detailed view.
2014-10-15 13:12:39 +02:00
fred-fri
c1f0dd00cd
refactoring to multiple attachments
2014-10-15 18:37:23 +09:00
1f7a77ff80
Major refactoring of AddActivitiesFromTemplatePanel.
2014-10-15 11:11:12 +02:00
12451b3e45
Removed faulty Bootstrap CSS.
2014-10-15 10:35:10 +02:00
fred-fri
28cc7ba26a
Merge branch 'develop' into attachments
2014-10-15 16:47:20 +09:00
fred-fri
4dee431b3c
final grading report > grading report
2014-10-15 16:06:26 +09:00
fred-fri
e08e8cffbb
clarify
2014-10-15 16:02:23 +09:00
fred-fri
8dab2bcb1a
clarify
2014-10-15 16:00:42 +09:00
fred-fri
cb56a3b173
e-mail instead of username
2014-10-15 15:57:34 +09:00
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
