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
fred-fri
d35b684efe
cleanup
2014-09-23 13:10:22 +09:00
fred-fri
59dd74417d
fixes
2014-09-23 13:09:38 +09:00
fred-fri
ca4181bca4
supervisor stuff
2014-09-23 10:50:13 +09:00
fred-fri
b3cd62c54c
tests
2014-09-23 10:19:20 +09:00
fred-fri
08b6f4b5b4
refactoring into panel
2014-09-23 09:42:07 +09:00
9fc4441dc0
Simple method rename.
2014-09-22 16:54:32 +02:00
31284c82ee
Renamed FinalSeminarCreationApproval to FinalSeminarCreationReviewerApproval and added NoReviewer as a possible case.
2014-09-22 16:54:17 +02:00
b42fd86f71
Injected FinalSeminarCreationService into SeminarCRUDPanel and hooked up simple logic when trying to create the final seminar.
2014-09-22 16:50:51 +02:00
d43450494c
SeminarCRUDPanel converted to Scala.
2014-09-22 16:08:56 +02:00
golrokh
2f38211cc2
Work in progress
2014-09-22 15:08:44 +02:00
e23258a877
What is this test doing here? (Also it does not test anything since there is no functionality for disabling that specific date field.
2014-09-22 12:27:36 +02:00
fred-fri
1720d44f21
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-09-22 14:22:23 +09:00
fred-fri
100b9f16b1
cleanup
2014-09-22 14:19:46 +09:00
fred-fri
c2215cc792
blargh
2014-09-22 14:05:46 +09:00
fred-fri
fc4fe69c11
verify
2014-09-22 14:04:28 +09:00
fred-fri
32b1b6dcba
nasty users
2014-09-22 13:58:26 +09:00
fred-fri
9231e1590a
trigger
2014-09-22 13:33:14 +09:00
fred-fri
61c14f2f7c
adding stuff, making page work
2014-09-22 13:03:18 +09:00
2b79caab5f
Merge remote-tracking branch 'origin/develop' into develop
2014-09-19 16:12:31 +02:00
fred-fri
9ae5453b23
adding stuff
2014-09-19 17:42:42 +09:00
fred-fri
eae8d1563e
adding new page
2014-09-19 14:40:45 +09:00
fred-fri
5a0b522bdf
added filters
2014-09-19 13:18:39 +09:00
f7132bcb0e
Added tests for when the seminar exists and when the head supervisor is supposed to create it.
2014-09-18 15:49:40 +02:00
a87019cf31
Minor touches.
2014-09-18 15:44:07 +02:00
d7f22434cc
Refactored to prepare for approval before creation.
2014-09-18 14:29:42 +02:00
395c2750b0
Fixed display of "Students" column in opposition panel.
2014-09-18 13:27:43 +02:00
fred-fri
aef0951af5
password 20 char limit removed
2014-09-18 15:17:27 +09:00
fred-fri
c90cbe7405
password 20 char limit removed
2014-09-18 15:17:00 +09:00
fred-fri
3a90a58a4e
removed creator
2014-09-18 15:05:53 +09:00
fred-fri
74e751cbb0
info added
2014-09-18 15:03:18 +09:00
fred-fri
57d9d159f7
more specific info
2014-09-18 14:59:41 +09:00
fred-fri
644c3808fc
info added
2014-09-18 14:57:32 +09:00
fred-fri
d845911613
sonar
2014-09-18 14:50:18 +09:00
fred-fri
6011016b66
sonar
2014-09-18 13:54:20 +09:00
fred-fri
596ad6ab29
sonar
2014-09-18 12:03:39 +09:00
fred-fri
fb0b1c97a5
sonar
2014-09-18 12:00:52 +09:00
fred-fri
d6e414e3f5
test
2014-09-18 11:18:14 +09:00
fred-fri
c2f7e76adc
test
2014-09-18 10:55:40 +09:00
fred-fri
45258ad699
fixes
2014-09-18 10:39:41 +09:00
fred-fri
3392813163
fixes
2014-09-18 10:06:03 +09:00
fred-fri
a9d2394ea0
fixes
2014-09-18 09:34:59 +09:00
fred-fri
c1ab5b319b
top tab fixes when opening grading reports
2014-09-18 09:13:05 +09:00
6036a2bd22
[SCIPRO-20183] Fixed sorting/display of supervisor in Supervisor > All projects > Final theses
2014-09-16 15:47:14 +02:00
fred-fri
9ff56ddf04
adding interact with supervisor
2014-09-16 16:17:59 +09:00
fred-fri
92a5dcef7f
tab fixes
2014-09-16 12:22:57 +09:00
fred-fri
821958f829
new top reviewer and examiner tabs
2014-09-16 11:35:24 +09:00
fred-fri
f9b742b840
findbugs
2014-09-15 13:58:17 +09:00
fred-fri
f5427c5272
findbugs
2014-09-15 13:54:34 +09:00
fred-fri
b1a235bcb1
findbugs
2014-09-15 13:49:59 +09:00
fred-fri
81b19c0266
utf8
2014-09-15 13:46:32 +09:00
fred-fri
9b081e4ea5
code inspection issues
2014-09-12 16:09:48 +09:00
2ea1c276e8
Button layout is now always vertical instead of switching to horizontal on big screens.
2014-09-11 15:20:38 +02:00
a967be3370
Fixed spacing of log in buttons.
2014-09-11 15:20:38 +02:00
fred-fri
82b0366412
pretty url
2014-09-11 16:59:33 +09:00
fred-fri
5936f31f0b
fixed milestones set project status
2014-09-10 11:22:23 +09:00
fred-fri
e08ecc1552
cleanup
2014-09-10 09:21:19 +09:00
fred-fri
ffcb8f174c
cleanup
2014-09-10 09:20:56 +09:00
fred-fri
fd1d170761
Merge branch 'importusersback' into develop
2014-09-10 09:10:29 +09:00
fred-fri
bed881739b
some tests
2014-09-08 13:45:58 +09:00
fred-fri
86c6f14171
refactoring
2014-09-08 11:02:25 +09:00
fred-fri
3311567dd4
refactoring
2014-09-08 10:17:57 +09:00
fred-fri
f431c36489
refactoring
2014-09-08 09:33:37 +09:00
fred-fri
e12acbf43e
refactoring
2014-09-08 09:25:28 +09:00
cf0a15caff
Styled the identity selection buttons and removed faulty help text.
2014-09-05 10:51:01 +02:00
fred-fri
2d9f76fcd1
feedbcak
2014-09-05 16:50:18 +09:00
fred-fri
59d2b6d68b
css
2014-09-05 15:44:47 +09:00
fred-fri
94379993c8
sort fix
2014-09-05 15:36:18 +09:00
fred-fri
c11fbfb125
what have i done II
2014-09-05 14:55:40 +09:00
fred-fri
ec212f962c
what have i done
2014-09-05 12:52:21 +09:00
fred-fri
98d570c396
deleting unused local users now works. this is crude but imo better than lazy deleting (because adding lazy deleted checks everywhere simply isnt feasible)
2014-09-04 11:11:08 +09:00
fred-fri
a9beffb460
test fix
2014-09-03 12:50:27 +09:00
fred-fri
551e040962
final seminar created notification leads to projects final seminar page rather than project overview page
2014-09-03 09:53:34 +09:00
fred-fri
20e8ad63e9
bug fix
2014-09-03 09:34:27 +09:00
fred-fri
3a75d289ea
sorting
2014-09-03 09:05:10 +09:00
fred-fri
4c5113d0df
fixes
2014-09-03 08:21:28 +09:00
fred-fri
74e3ffaa84
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-09-03 07:07:12 +09:00
fred-fri
d1b9dee6dc
fix namespace
2014-09-03 07:06:27 +09:00
cc84521277
Send email to supervisors with targets > 0 in a period
2014-09-02 13:59:31 +02:00
fred-fri
59ed4f4d0a
remind match responsible to match
2014-09-02 16:16:26 +09:00
fred-fri
69e260edf8
refactor, tests fail
2014-09-02 10:43:31 +09:00
801aa8eb75
Fixed test.
2014-09-01 13:51:21 +02:00
7e2aced4e2
Merge remote-tracking branch 'origin/develop' into develop
2014-09-01 13:37:35 +02:00
e856e09363
Uploading a file to an activity in the activity plan creates a thread for discussion.
...
Subsequent uploads generates a reply in the same thread.
2014-09-01 13:34:10 +02:00
fred-fri
cffd6ef35b
doing the round in the service seems to be the only way to make this work smoothly...
2014-09-01 17:59:08 +09:00
8f54c6499c
Some restructuring.
2014-09-01 10:42:06 +02:00
fred-fri
e68741d29a
moar refactor
2014-09-01 17:30:14 +09:00
e4a04279c4
DIE NULL
2014-09-01 10:29:18 +02:00
fred-fri
bdaf17dcb6
more refactor
2014-09-01 17:18:43 +09:00
fred-fri
05f5cc1cd0
refactor dat bitch
2014-09-01 16:17:33 +09:00
fred-fri
9b91ba8f72
removed projects
2014-09-01 11:22:27 +09:00
fred-fri
b2854033ce
default stuff
2014-09-01 11:11:59 +09:00
fred-fri
1d03b2a7cc
default project types
2014-09-01 11:03:45 +09:00
fred-fri
a773270c96
naiz url
2014-09-01 10:48:49 +09:00
fred-fri
00693a6781
language fix
2014-09-01 10:46:14 +09:00
fred-fri
1b22b2ccd3
null program other now
2014-08-29 15:45:06 +09:00
fred-fri
e1bcc4cda6
remind supervisors to add more ideas
2014-08-29 15:00:37 +09:00
fred-fri
4a1444cccc
css
2014-08-29 11:02:02 +09:00
b72d306d71
entityID with capital D.
2014-08-28 15:51:50 +02:00
e0066cd546
Merge remote-tracking branch 'origin/develop' into develop
2014-08-28 09:34:34 +02:00
abcf36d034
Merged first meeting package into match.
2014-08-28 09:34:30 +02:00
fred-fri
0f94386ae7
cleanup
2014-08-28 11:53:11 +09:00
fred-fri
1edfc098b3
Merge branch 'develop2' into develop
2014-08-28 11:50:00 +09:00
fred-fri
75146bb821
added count of projects that didnt complete both milestones, cleanup
2014-08-28 11:49:03 +09:00
fred-fri
87118eecc5
added count, cleanup
2014-08-28 11:14:09 +09:00
fred-fri
ed0daaa9d2
extensive cleanup
2014-08-28 10:35:39 +09:00
55764204ac
Merged applicationperiod package into match.
2014-08-27 17:08:31 +02:00
c7da4ee31e
Unmet target statistics is now available under Admin / Statistics
2014-08-27 13:34:22 +02:00
fred-fri
4288ad934a
median works, time to clean up
2014-08-27 20:15:07 +09:00
fred-fri
853e1879b1
working on median page
2014-08-27 18:21:35 +09:00
fred-fri
dbb583d06e
Merge branch 'develop' into develop2
2014-08-27 18:06:12 +09:00
fred-fri
bb0e12e430
working on page
2014-08-27 11:43:05 +09:00
fred-fri
a426d930d1
working on page
2014-08-27 11:32:42 +09:00
fred-fri
e70265fd9a
working on page
2014-08-27 08:12:31 +09:00
cb9518b907
Merge remote-tracking branch 'origin/develop' into develop
2014-08-26 15:42:15 +02:00
c1c1badb2e
Removed notification when resetting password.
2014-08-26 15:42:05 +02:00
5f9f6fed2f
Made it easier to create new locale users
2014-08-26 15:29:56 +02:00
950668de02
Fixed test
2014-08-26 14:07:44 +02:00
81b9b03774
Choice of application period is now stored between page refreshes in admin idea panels.
2014-08-26 14:05:25 +02:00
6f5a21ed85
Replaced the big ugly tables with a simple list.
2014-08-26 13:50:19 +02:00
aed39efaf0
Minor refactoring
2014-08-26 11:13:57 +02:00
fred-fri
6027735f25
basic median milestone page
2014-08-26 13:58:44 +09:00
fred-fri
f07de0f207
send password hidden if not local user
2014-08-26 13:55:07 +09:00
fred-fri
3b3d6145a0
cant get querydsl queries to work no matter what, sticking with this in the meantime
2014-08-26 12:23:19 +09:00
fred-fri
e57d30d2ff
Merge remote-tracking branch 'origin/develop' into develop
2014-08-26 12:21:47 +09:00
21cbfc672a
Ops.
2014-08-25 16:09:02 +02:00
4e8bceb4e1
Model.of() is forbidden, stop using it. The only thing it is good at is generating LazyInitializationExceptions.
2014-08-25 14:55:06 +02:00
6e23791b2a
Merge remote-tracking branch 'origin/develop' into develop
2014-08-25 14:27:58 +02:00
a314e8a8a1
Fixed header on the public log in pages.
2014-08-25 14:27:46 +02:00
d3c6ef9e50
Fixed Wicket XML namespace declaration.
2014-08-25 14:25:53 +02:00
07ab0675a6
When logging in to SciPro you are first presented with an identity selection (if SSO is enabled).
2014-08-25 14:24:21 +02:00
torgny
bd9089ab96
Enklare skapande av nya projekt.
2014-08-25 13:30:32 +02:00
fred-fri
bc2e787809
improved queries
2014-08-25 13:24:17 +09:00
fred-fri
c0d8e31044
adding adminpeoplestatisticspage
2014-08-22 16:44:14 +09:00
fred-fri
0130966322
edited admin info
2014-08-22 11:05:57 +09:00
fred-fri
7c222cfddc
removed column
2014-08-21 15:34:14 +09:00
fred-fri
72e1abd8b6
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-08-21 13:16:24 +09:00
fred-fri
f91e97ae53
this is so beautiful
2014-08-21 13:15:43 +09:00
a09b6b84db
Fixed unchecked warning.
2014-08-20 17:06:39 +02:00
3fe4ad5d9f
Extended the duplicated code block :)
2014-08-20 16:03:51 +02:00
122f2c4eb6
Sonar
2014-08-20 15:50:42 +02:00
ae7472722b
Moved MailEvent, MailEventService(Impl) to the mail package.
2014-08-20 15:39:33 +02:00
3488a0fbfe
Added an alt attribute to the Gravatar <img>-tag containing the users full name.
2014-08-20 14:58:12 +02:00
574f086a4a
Made plugin toggling a nice and switch-like.
2014-08-20 14:56:36 +02:00
86e6e7d370
Basic plugin system.
2014-08-20 14:42:27 +02:00
af5f5c08e6
Fixed unchecked warning.
2014-08-20 13:56:56 +02:00
fred-fri
fb0ffbeaa1
added send to forum button
2014-08-20 16:37:59 +09:00
4fa266af2f
Fixed name sorting in the admin role management.
2014-08-20 08:48:12 +02:00
28d174dd77
Fixed name sorting in the admin role management.
2014-08-20 08:44:30 +02:00
fred-fri
a1590b8a9d
notes
2014-08-20 13:16:38 +09:00
6cafb216fb
Added ToString implementation to CurrentUserImpl
2014-08-19 16:48:26 +02:00
10a6b78eec
Fixed some faulty texts.
2014-08-19 16:46:54 +02:00
torgny
464578e38d
Författare kan inte spara Activity Plan template.
2014-08-19 13:37:45 +02:00
8e0e4ea042
Re-ordered the settings a bit.
2014-08-19 11:23:39 +02:00
897f23dad7
Separated reply e-mail and account name.
2014-08-19 11:21:17 +02:00
e43f2d20d6
Fixed label markup.
2014-08-19 11:15:06 +02:00
09a370fce1
Renamed some forum mail settings.
2014-08-19 11:13:56 +02:00
b8179745ab
Fixed warning.
2014-08-19 10:52:40 +02:00
fred-fri
7079762c2d
removed import
2014-08-19 15:39:35 +09:00
fred-fri
3614e6694f
admin can now cancel final seminars
2014-08-19 15:27:17 +09:00
fred-fri
85a939c7aa
final seminar now has activity in activity plan
2014-08-19 12:34:33 +09:00
82f2ee2fa5
Merge remote-tracking branch 'origin/develop' into develop
2014-08-18 17:26:34 +02:00
e2f2865284
Export av edit targets till excel
2014-08-18 17:25:54 +02:00
ec1c279751
I hate whoever invented null.
...
I hate JPA for enforcing default constructors.
I hate Java for not having Option.
2014-08-18 16:48:20 +02:00
f4f9e908ab
Tests now use a properly populated user with an e-mail address.
2014-08-18 16:10:48 +02:00
e2644f1be7
Tests now use a properly populated user with an e-mail address.
2014-08-18 16:09:30 +02:00
847f20b484
User link panel now uses gravatar images instead of default anonymous icon.
2014-08-18 15:55:57 +02:00
9ab5bdc1eb
Removed hard-coded normal font-weight for label and made the font-weight fix run after ajax completions in addition to page load.
2014-08-18 15:46:22 +02:00
f412558654
Fixed proper Bootstrap markup.
2014-08-18 15:45:18 +02:00
514c8708e6
Users can now choose to hide their Gravatar image.
2014-08-18 15:36:21 +02:00
491a3a916e
Moved the md5 utility function out of TurnItInComponent.
...
Added Gravatar images to user profiles.
2014-08-18 15:23:13 +02:00
8666f0594f
Rewrote the md5 function so you can actually understand what is going on.
...
There is a test verifying with 1000 random 4096 byte arrays that the results are still the same.
2014-08-18 14:53:23 +02:00
384f2356da
Merge remote-tracking branch 'origin/develop' into develop
2014-08-18 14:25:51 +02:00
e871b0b393
Public page that lists the next 20 upcoming final seminars.
2014-08-18 14:25:46 +02:00
0464d6f7e8
Merge remote-tracking branch 'origin/develop' into develop
2014-08-18 13:55:13 +02:00
c3a90bb264
GRU replaced with Match
2014-08-18 13:54:43 +02:00
ce153311a2
Merge remote-tracking branch 'origin/develop' into develop
2014-08-18 13:10:00 +02:00
2024bd5ac2
Removed ignored test.
2014-08-18 13:07:32 +02:00
12b0b3a141
Removed commented out code.
2014-08-18 13:01:58 +02:00
e98f92ed8a
Un-ajaxified the student idea submission page. It was not used for anything except complicating re-rendering of feedback panels.
2014-08-18 13:01:38 +02:00
5baeb2e71f
Ideas can now have multiple languages selected.
2014-08-18 11:35:56 +02:00
torgny
64a8743ecd
Ändrat ordningen mellan flikarna Reviewing och Examining.
2014-08-18 11:13:27 +02:00
97aa07b32d
Fixed unchecked warning.
2014-08-18 10:04:36 +02:00
ab75916dd6
Fix
2014-08-15 10:31:36 +02:00
55ed8300f3
Minor refactorings.
2014-08-15 10:26:02 +02:00
293b09cbc2
Make the test class name match the class under test.
2014-08-15 10:17:22 +02:00
d0c425165b
Removed stupid SSO redirect.
2014-08-15 10:16:55 +02:00
c983c26d92
Merge remote-tracking branch 'origin/develop' into develop
2014-08-14 16:45:24 +02:00
52140b8809
Changed FileUpload to work with InputStream using the loaner pattern rather than in-memory byte arrays.
...
Why does so much stuff depend on uploading files? It should really only be FileDescriptionService.
2014-08-14 13:24:44 +02:00
b689dd23db
Tiny refactor
2014-08-14 11:50:55 +02:00
196004d43e
Refactored some file uploads.
2014-08-14 11:42:57 +02:00
Golrokh Moattar
da838d66f9
Merge remote-tracking branch 'origin/develop' into develop
2014-08-13 16:18:53 +02:00
Golrokh Moattar
4120dc40f0
styling
2014-08-13 16:18:46 +02:00
0ac564076d
Fixed some Sonar problems.
2014-08-13 15:08:44 +02:00
665852cc74
Removed "some" unused code.
2014-08-13 11:12:01 +02:00
49d87b3f4c
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
view/src/test/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanelTest.java
2014-08-13 08:20:47 +02:00
fred-fri
9f69b5b67d
shortened some texts
2014-08-13 15:13:55 +09:00
fred-fri
ef0b24af56
individual milestone graphics added
2014-08-13 15:03:51 +09:00
fred-fri
5f4a1ba2e3
added new link to download report without input
2014-08-13 11:26:27 +09:00
fred-fri
d34f4a27bc
gradingreport pdf no longer says null at grade if grade is null, it says that grade will be calculated when all critera have been assessed
2014-08-13 10:03:17 +09:00
Golrokh Moattar
28edfb76b0
opposition and active participation parts separated in the supervisor project overview
2014-08-12 16:34:34 +02:00
Golrokh Moattar
6131126cdb
adding "s" to "review"
2014-08-12 15:03:02 +02:00
Golrokh Moattar
74cef17beb
Merge remote-tracking branch 'origin/develop' into develop
2014-08-12 14:55:02 +02:00
Golrokh Moattar
4aaec0df6d
"Opposition & active participation" removed from the supervisor tabs and moved to the project overview page
2014-08-12 14:54:45 +02:00
ca3da5826b
Fixed test
2014-08-12 09:41:18 +02:00
43ac32e263
"Matched, has project" is now not selected by default on the supervisor ideas page.
2014-08-12 09:38:43 +02:00
90e6e85b16
Removed the old "Published" column, it is now included in the new selection column.
2014-08-12 09:32:54 +02:00
22a11437b0
Removed redundant local variable.
2014-08-12 09:31:52 +02:00
8bd97b7b97
Fixed some non-detachable models.
2014-08-12 09:31:36 +02:00
def64c9802
Made title column exportable.
2014-08-12 09:25:48 +02:00
95f750081b
Show every ideas selection state in the supervisors list of ideas.
2014-08-12 09:21:47 +02:00
fred-fri
80c3d0e5e9
removed all traces of final version (changed to final thesis, which it should be)
2014-08-12 14:07:50 +09:00
fred-fri
e5f7c15870
grading report can now be downloaded even though nothing has been filled in
2014-08-12 10:32:58 +09:00
fred-fri
fbc81445b0
supervisor now always has access to grading
2014-08-12 09:36:09 +09:00
Golrokh Moattar
9125f6f8d3
Grading template changed so that we have project type in the pdf file as well
2014-08-11 16:23:45 +02:00
8356e44405
Removed "Matched, has project" as default filter selection from supervisor my ideas page.
2014-08-11 16:20:00 +02:00
eae65c23d0
Removed unnecessary service method.
2014-08-11 15:46:11 +02:00
7c37377d36
Merge remote-tracking branch 'origin/develop' into develop
2014-08-11 15:24:04 +02:00
Golrokh Moattar
6a48d6d82f
Reset removed from login page, Forgot password moved down
2014-08-11 15:10:58 +02:00
69c95f3bb4
More cleaning.
2014-08-11 14:56:05 +02:00
a9d947e14a
Changed so its called Final theses not Final versions
2014-08-11 13:48:11 +02:00
2ba6689dab
Made the final thesis list sortable.
2014-08-11 13:47:52 +02:00
197d3f5f27
Added help text to the group panel.
2014-08-11 13:40:39 +02:00
e46cdf707d
Added date filtering to the unfinished seminar page.
2014-08-11 13:32:07 +02:00
7ee225352c
Changed text.
2014-08-11 12:35:39 +02:00
a8809267d8
Added feedback when requesting password reset.
2014-08-11 12:32:04 +02:00
fred-fri
ca004ae7e3
removed unused method
2014-08-11 16:40:29 +09:00
fred-fri
ea4886bba8
removed unused method
2014-08-11 14:19:54 +09:00
fred-fri
1502097308
sonar
2014-08-11 13:49:43 +09:00
fred-fri
e644bcfcfa
doesnt appear as if these old icons are being used, removing
2014-08-11 13:39:18 +09:00
fred-fri
90ea694fcd
removed some old markup file with no corresponding java file
2014-08-11 13:03:22 +09:00
fred-fri
701691f3dc
wish we could get rid of imageobject classs, removed one usage
2014-08-11 12:59:23 +09:00
fred-fri
857d826d41
sonar
2014-08-11 12:53:15 +09:00
fred-fri
e01ee1d7bf
sonar
2014-08-11 12:51:59 +09:00
fred-fri
1afe15ee40
sonar
2014-08-11 12:51:47 +09:00
fred-fri
529543c67b
sonar
2014-08-11 12:50:15 +09:00
716a851d07
Installed the ForumMailModule in the web application.
2014-08-06 15:51:39 +02:00
d0bf95ab3b
Moved some remaining entities to the proper package.
2014-08-06 14:30:13 +02:00
fae50cc0d5
Extracted forum mail related stuff to its own package.
2014-08-05 16:43:45 +02:00
fred-fri
ee8555dd41
fenced feedback stuff
2014-08-01 15:53:03 +09:00
fred-fri
5545a4bf3d
removed getsession
2014-08-01 09:29:45 +09:00
fred-fri
22efb07eb5
removed getsession
2014-08-01 09:25:04 +09:00
fred-fri
db709668d5
removed getsession
2014-08-01 09:23:02 +09:00
fred-fri
8f8c8a1108
removed getsession
2014-08-01 09:21:23 +09:00
fred-fri
9b3d7b5d8a
removed getsession
2014-08-01 09:18:24 +09:00
Emil Siverhall
f4086dfa09
changed header under forum settings
2014-07-31 21:40:17 +02:00
Emil Siverhall
0a550feab5
mounting admin forum settings
2014-07-31 14:54:17 +02:00
Emil Siverhall
16ee33c830
changed to use a password text field to not show password in the user interface
2014-07-31 14:12:23 +02:00
f5fb7c0944
Revert "Changed DataView in threaded forum to a simple ListView since we don't use the pagination and removed some more forum service interface methods."
...
This reverts commit 9d6723d39a
2014-07-31 11:36:01 +02:00
fred-fri
fe927eab33
removed getsession
2014-07-31 16:30:38 +09:00
fred-fri
fa88dbb0a8
removed getsession
2014-07-31 16:10:21 +09:00
fred-fri
8c63b2f2ce
removed getsession
2014-07-31 14:26:12 +09:00
fred-fri
8ec9430054
removed getsession
2014-07-31 14:05:14 +09:00
fred-fri
b3697e3bd7
removed getsession
2014-07-31 14:02:12 +09:00
fred-fri
f70ddd3ddd
removed getsession
2014-07-31 13:28:26 +09:00
fred-fri
107956c8b9
removed getsession
2014-07-31 12:12:52 +09:00
fred-fri
2653d17a97
removed getsession
2014-07-31 10:15:50 +09:00
fred-fri
9e3f4c49ca
removed getsession
2014-07-31 10:07:33 +09:00
af622fd75c
Removed more methods on the forum interfaces.
2014-07-30 16:33:09 +02:00
9d6723d39a
Changed DataView in threaded forum to a simple ListView since we don't use the pagination and removed some more forum service interface methods.
2014-07-30 16:31:58 +02:00
e945e7dfb4
Removed useless interface methods.
2014-07-30 16:18:33 +02:00
326013089e
Made Thread abstract.
2014-07-30 12:36:54 +02:00
fred-fri
22643498bd
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2014-07-30 17:56:11 +09:00
fred-fri
ff5fd1192f
removed getsession
2014-07-30 17:54:47 +09:00
fred-fri
b5bba513dd
removed getsession
2014-07-30 14:07:40 +09:00
fred-fri
547e9adf72
removed getsession
2014-07-30 14:05:37 +09:00
fred-fri
3f87a7946d
removed getsession
2014-07-30 13:43:44 +09:00
fred-fri
74125a9662
removed getsession
2014-07-30 13:38:53 +09:00
fred-fri
e616814be9
removed getsession
2014-07-30 13:36:48 +09:00
fred-fri
0986be392b
removed getsession
2014-07-30 13:31:32 +09:00
fred-fri
1ff65b20e2
removed getsession
2014-07-30 13:27:07 +09:00
fred-fri
ad18b6ef5f
removed getsession
2014-07-30 13:26:15 +09:00
fred-fri
aa55897fd4
removed getsession
2014-07-30 13:20:48 +09:00
fred-fri
1c5ff3a019
removed getsession
2014-07-30 13:18:26 +09:00
fred-fri
2a9dad9871
removed getsession
2014-07-30 13:15:08 +09:00
fred-fri
a821e27471
removed getsession
2014-07-30 13:09:26 +09:00
fred-fri
2a6d58282c
removed getsession
2014-07-30 07:51:21 +09:00
fred-fri
d4aebb4b17
removed getsession
2014-07-30 07:33:17 +09:00
fred-fri
643998d39d
removed getsession
2014-07-30 07:31:34 +09:00
fred-fri
dbb6391d7d
removed getsession
2014-07-30 07:29:06 +09:00
fred-fri
06b1c208e9
removed getsession
2014-07-30 07:03:28 +09:00
Emil Siverhall
e7aa4ef146
Merge remote-tracking branch 'origin/develop' into develop
2014-07-29 16:48:22 +02:00
Emil Siverhall
7857154886
administration page for forum mail settings
2014-07-29 16:36:28 +02:00
Emil Siverhall
f9cd3d82a8
service for forum mail settings
2014-07-29 15:42:35 +02:00
a8a3a3069b
Merge remote-tracking branch 'origin/develop' into develop
2014-07-29 15:32:04 +02:00
1639c1ef6f
Moved mail classes to their own package.
2014-07-29 13:10:56 +02:00
Emil Siverhall
dabff40ffd
Merge remote-tracking branch 'origin/develop' into develop
2014-07-29 10:19:43 +02:00
Emil Siverhall
7bd36a1a98
added filter details to milestone chart as well
2014-07-29 10:19:11 +02:00
Emil Siverhall
a2e6d96eea
panelified milestone filter details
2014-07-29 09:49:35 +02:00
33c8410d51
Merge branch 'mss' into develop
2014-07-29 09:21:25 +02:00
56960053a9
Added milestone progress to the statistics menu.
2014-07-29 09:21:03 +02:00
fred-fri
14e411595b
switching from google inject
2014-07-29 15:12:32 +09:00
fred-fri
969e8c6435
test stuff
2014-07-29 15:09:27 +09:00
fred-fri
a9ce67e1d7
moved some stuff into userfacade
2014-07-29 15:07:13 +09:00
fred-fri
7264c59db4
basic userfacade stuff
2014-07-29 14:54:12 +09:00
fred-fri
e19c563e91
removing commented out lines from test
2014-07-29 14:48:12 +09:00
fred-fri
5f9aa56952
moved some code into passwordFacade
2014-07-29 14:47:28 +09:00
fred-fri
8d8e22411b
basic passwordfacade stuff
2014-07-29 14:35:49 +09:00
Emil Siverhall
1cb49aee28
test coverage for supplier links related to group overview panel
2014-07-28 16:25:59 +02:00
4da2666d70
Fixed properties.
2014-07-28 15:56:36 +02:00
Emil Siverhall
c49884eac2
included script in application to prevent https-block
2014-07-28 15:23:02 +02:00
fab6436cdc
Fixed NPE.
2014-07-28 15:06:42 +02:00
Emil Siverhall
e89ceb6f65
missing pages..
2014-07-28 14:29:47 +02:00
Emil Siverhall
c686396f47
Merge remote-tracking branch 'origin/develop' into develop
2014-07-28 14:23:28 +02:00
Emil Siverhall
5252d8df65
milestone statistics goes graphical
2014-07-28 14:22:24 +02:00
6bfc7fbc6b
Start of new milestone progress statistics
2014-07-28 14:07:17 +02:00
fred-fri
32e801eac5
cleanup, redirect
2014-07-28 18:33:59 +09:00
fred-fri
10fa4703ae
doesnt redirect to setpasswordpage while logged in so we must use notification
2014-07-28 18:30:46 +09:00
fred-fri
ac76f419ec
cleanup
2014-07-28 18:15:37 +09:00
fred-fri
ef520ff7f5
tests
2014-07-28 18:12:47 +09:00
fred-fri
4a4057464b
cleaning up setpasswordpage
2014-07-28 18:06:44 +09:00
fred-fri
1e2822e9ba
one hour to change password
2014-07-28 18:02:17 +09:00
fred-fri
24b6d3e7b8
dont validate users
2014-07-28 18:01:45 +09:00
fred-fri
77b21ec6b8
Merge branch 'develop' into hashuser
2014-07-28 17:58:20 +09:00
fred-fri
3423189a1d
adding stuff into turnitinsettings class and removing it from elsewhere (turnitinmodule properties should go too but leaving them for now)
2014-07-28 11:54:22 +09:00
606569005e
Merge branch 'develop' into hashuser
2014-07-25 16:03:19 +02:00
Emil Siverhall
2b82784c02
start page for All projects, could use some more useful information
2014-07-25 11:31:48 +02:00
Emil Siverhall
7f6aa46947
all projects -> final seminar is now module dependent as well
2014-07-25 09:57:43 +02:00
Emil Siverhall
0d5705bb5c
hi
2014-07-25 08:51:43 +02:00
Emil Siverhall
26bcad4f02
mount supervisor milestone statistics page
2014-07-25 08:30:27 +02:00
Emil Siverhall
d4530b8a05
correct menu highlighting for supervisor pages
2014-07-25 08:27:53 +02:00
Emil Siverhall
05c0373d12
supervisor milestone statistics details pages
2014-07-25 08:19:28 +02:00
fred-fri
3de922d445
maybe this will improve readibility a bit
2014-07-25 12:25:53 +09:00
fred-fri
3642e98190
yay regex and tests work
2014-07-25 12:23:31 +09:00
fred-fri
3de323048c
cleaning and trying to figure out regex
2014-07-25 11:20:18 +09:00
fred-fri
bc9ae80559
tests
2014-07-25 08:59:24 +09:00
fred-fri
2d9bc914d9
delete all users hashes when setting password
2014-07-25 08:15:54 +09:00
Emil Siverhall
0bebabf73f
supervisor milestone statistics page
2014-07-24 23:34:40 +02:00
Emil Siverhall
3b46c83f02
properties refactoring
2014-07-24 23:05:27 +02:00
Emil Siverhall
7fdd0ca60a
test refactoring
2014-07-24 22:37:18 +02:00
Emil Siverhall
4de89991ec
abstract page to abstract panel, pages to panels, refactor refactor refactor
2014-07-24 22:29:55 +02:00
Emil Siverhall
f6b1a4baae
supplier for details pages since we need different links for supervisors
2014-07-24 20:37:14 +02:00
Emil Siverhall
5cec81acce
milestone statistics page to panel
2014-07-24 16:11:08 +02:00
Emil Siverhall
26a87be73d
system module component-annotated the overview panel
2014-07-24 14:28:16 +02:00
Emil Siverhall
258f108731
implemeted in author view as well. panel is invisible if no group connections are found
2014-07-24 14:27:09 +02:00
Emil Siverhall
b9a12d40c3
links implemented in supervisor view
2014-07-24 14:13:48 +02:00
Emil Siverhall
afd1304cd1
group overview with title labels for each group
2014-07-24 13:27:07 +02:00
fred-fri
21db90fbd5
notification type change
2014-07-24 16:20:57 +09:00
fred-fri
98d2bb8ac5
testing
2014-07-24 16:17:01 +09:00
fred-fri
a2680cbed1
added forgot password page, testing
2014-07-24 15:59:52 +09:00
fred-fri
793a194e18
refactoring
2014-07-24 12:01:33 +09:00
fred-fri
b2816f7ad7
user who requests new password gets notification
2014-07-24 11:27:53 +09:00
fred-fri
0cef4685da
refactoring
2014-07-24 10:48:26 +09:00
fred-fri
bf0b2085fd
refactoring
2014-07-24 10:40:20 +09:00
fred-fri
f7e5083fc2
refactoring
2014-07-24 10:40:06 +09:00
fred-fri
02c06d6f02
refactoring
2014-07-24 10:28:23 +09:00
fred-fri
a27c7f72a6
removed user details from notification, some cleanup
2014-07-24 09:59:01 +09:00
fred-fri
e9737b0fd6
nicer notification
2014-07-24 09:48:40 +09:00
Emil Siverhall
a0df57970d
Supervisor -> All projects tabs rearranged to have Final seminar as first tab since this one is always visible.
...
The other tabs visibility depends on modules
2014-07-23 21:04:30 +02:00
Emil Siverhall
e728ba80cf
Ideas only visible for supervisors if any active project type have it switched on
2014-07-23 15:10:36 +02:00
Emil Siverhall
b734431bbb
Ideas only visible for authors if any active project type have it switched on
2014-07-23 15:00:19 +02:00
Emil Siverhall
6a8edc3e33
Ideas only visible for authors if any active project type have it switched on
2014-07-23 14:16:53 +02:00
Emil Siverhall
61371bb99b
link to project in groups view projects. enabled for supervisors, co supervisors and reviewers of a specified project
2014-07-23 13:35:24 +02:00
Emil Siverhall
77312fbae0
moved active/inactive label on project details
2014-07-23 09:02:00 +02:00
Emil Siverhall
5525563cb7
moved active/inactive label on group view
2014-07-23 08:54:49 +02:00
fred-fri
c9acdbc689
hooking up notification, error
2014-07-23 15:14:33 +09:00
fred-fri
0488b38d5f
creating and saving hash when admin creates user (but not when admin merely edits)
2014-07-23 12:04:19 +09:00
fred-fri
d3ec278710
adding notifications for user created, user change password and user password changed
2014-07-23 10:30:38 +09:00
fred-fri
43abc2d54f
adding hash service
2014-07-23 09:31:19 +09:00
Emil Siverhall
5f59c51c5a
fixed milestone phase inactivation
2014-07-22 21:38:25 +02:00
Emil Siverhall
5a586008f7
filter by project type when adding projects to a group
2014-07-22 21:18:05 +02:00
Emil Siverhall
80afbbfddc
only active projects selectable
2014-07-22 15:27:57 +02:00
Emil Siverhall
8326deb7b1
exportable to default data panel on my groups
2014-07-22 15:22:57 +02:00
Emil Siverhall
fe748ea523
Merge remote-tracking branch 'origin/develop' into develop
2014-07-22 15:12:16 +02:00
Emil Siverhall
01c7704ad8
de-ajaxified submit on edit groups to make it easier to understand that changes was saved
2014-07-22 15:12:05 +02:00
99d36a5d6c
Removed the ability to sort by the user column since it did not work.
2014-07-22 15:09:06 +02:00
8f9b68d13c
Made dialog larger.
2014-07-22 14:53:40 +02:00
d3a8de2117
Merge remote-tracking branch 'origin/develop' into develop
2014-07-22 14:42:00 +02:00
17174b29d2
Removed unused code.
2014-07-22 14:39:18 +02:00
Emil Siverhall
b557a7bb89
some alignment
2014-07-22 13:45:30 +02:00
Emil Siverhall
cc20d6cb7d
editing of footer links enabled
2014-07-22 13:38:39 +02:00
fred-fri
5b6c1cc778
working on setpasswordpage
2014-07-22 16:09:43 +09:00
fred-fri
56cd9fe30d
replacing create new idea tab with link
2014-07-22 11:30:32 +09:00
fred-fri
0c7861eede
replacing listview with exportabledatatable
2014-07-22 11:18:03 +09:00
fred-fri
2d4d6dd150
test fix
2014-07-22 10:54:19 +09:00
fred-fri
d49462a280
test fix
2014-07-22 08:23:55 +09:00
fred-fri
2ba5a594e2
readded projectdetailspanel
2014-07-22 07:54:19 +09:00
fred-fri
2a48919739
showing what group members receives notifications
2014-07-21 18:04:30 +09:00
fred-fri
840709551c
showing more participants in groups
2014-07-21 17:45:42 +09:00
fred-fri
e86270f850
removing redundant link
2014-07-21 17:28:01 +09:00
fred-fri
5626fd627a
removing unused old bootstrap css files
2014-07-21 17:12:33 +09:00
fred-fri
b6e28b6487
removed redundant info
2014-07-21 15:16:01 +09:00
fred-fri
ce9f452f7e
label css fix
2014-07-21 14:57:20 +09:00
fred-fri
0b6b1cca3a
test fix
2014-07-21 14:35:25 +09:00
fred-fri
90a329e095
added published column to supervisor my ideas table
2014-07-21 12:45:59 +09:00
fred-fri
ecec03018a
changed infotext
2014-07-21 12:40:17 +09:00
fred-fri
da9101b7d8
my projects titles truncated and tooltipped
2014-07-21 12:36:49 +09:00
Emil Siverhall
b880f1a0f6
removed beta annotations from group features.
2014-07-17 15:29:29 +02:00
Emil Siverhall
02124d0872
group forums: mark threads as read when entering 'view thread page'
2014-07-17 13:44:47 +02:00
Emil Siverhall
9f657fcf20
basic test coverage for untested classes
2014-07-16 15:22:55 +02:00
Emil Siverhall
ddf7dd2c7a
sonar
2014-07-16 15:03:51 +02:00
Emil Siverhall
c508a8fb51
keyword <-> research area connection bugs
2014-07-16 12:39:00 +02:00
Emil Siverhall
6174d6088f
fixed wrongly formatted confirmation message
2014-07-16 11:12:24 +02:00
Emil Siverhall
122c7db6ca
lacking tests in footer panel + change to use model for faster update
2014-07-15 16:04:15 +02:00
Emil Siverhall
5975ef89b7
better feedback messages when validation fails in 'Create new program' dialog
2014-07-15 14:44:19 +02:00
Emil Siverhall
7be63710a0
sonar issues
2014-07-15 14:15:52 +02:00
Emil Siverhall
d11c1617d3
sonar issues
2014-07-15 14:12:12 +02:00
Emil Siverhall
923bc1708a
some basic testing for untested idea panel
2014-07-15 13:40:21 +02:00
Emil Siverhall
18e23c8a84
delivery configuration panel for group notifications
2014-07-15 09:56:44 +02:00
Emil Siverhall
4302a1de56
mail notification formatting and correct redirect page to go straight to the message threads
2014-07-15 09:31:17 +02:00
Emil Siverhall
5c547980fa
more work for group event notifications
2014-07-14 16:30:39 +02:00
02349a6f8f
Removed commented-out code.
2014-07-11 16:06:49 +02:00
9e09bb8c40
Sonar fixes: removed unused fields.
2014-07-11 15:46:37 +02:00
fb73a17c0b
Sonar fixes.
2014-07-11 15:43:22 +02:00
63d8b5db11
Sonar fixes.
2014-07-11 13:48:37 +02:00
fred-fri
40bddc9aa0
Merge remote-tracking branch 'origin/develop' into develop
2014-07-11 18:30:00 +09:00
7961f5a320
Merge remote-tracking branch 'origin/develop' into develop
2014-07-11 11:29:47 +02:00
fred-fri
87e34df0c9
thread wrong class
2014-07-11 18:29:45 +09:00
476e4c9da1
Popup when auto-saving fails.
2014-07-11 11:29:41 +02:00
fred-fri
464a974025
pageparameterkeys doesnt need to contain forumthread (ftid), groupthread (gtid) and thread (tid), thread (tid) is enough
2014-07-11 18:19:18 +09:00
fred-fri
5956b94c60
Merge remote-tracking branch 'private/threadurl' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ForumThreadOverviewPanel.java
2014-07-11 18:17:39 +09:00
fred-fri
e39f6f7db5
pageparameterkeys doesnt need to contain forumthread (ftid), groupthread (gtid) and thread (tid), thread (tid) is enough
2014-07-11 17:59:15 +09:00
62ad9df8bd
Minor style changes.
2014-07-11 10:53:30 +02:00
f7a3ff4868
Refactored old forum to use the new (and improved?) components from the group forum.
2014-07-11 10:50:10 +02:00
df08e4a456
Refactored old forum to use the new (and improved?) components from the group forum.
2014-07-11 10:46:13 +02:00
1b49198815
Moved "Mark all read" link up to the page.
2014-07-11 10:32:57 +02:00
2dd59f371a
Moved create link to their respective overview pages instead of overriding a getPage() method.
2014-07-11 10:15:52 +02:00
1cd5213093
Removed unused parameters.
2014-07-11 09:50:19 +02:00
fred-fri
b5729b2b85
pageparameterkeys doesnt need to contain forumthread (ftid), groupthread (gtid) and thread (tid), thread (tid) is enough
2014-07-11 16:29:26 +09:00
fred-fri
9dd50a1e97
Merge branch 'bookmarkableurls' into develop
2014-07-11 16:15:39 +09:00
fred-fri
2dc8f74898
css fix
2014-07-11 15:53:45 +09:00
fred-fri
70d36ac2b5
fixing urls and corresponding notifications
2014-07-11 15:37:40 +09:00
fred-fri
62ad2277d6
group forum fixes
2014-07-11 10:24:29 +09:00
937e079438
Added view group thread page for supervisors.
2014-07-10 16:18:24 +02:00
e1a87dc749
Fixed latest post (can't rely on the database fetching a list in any specific order when no ORDER BY specified).
2014-07-10 15:58:43 +02:00
c11ebe849c
Fixed thread overview for students.
2014-07-10 15:39:04 +02:00
7a28e845cb
Fixed Wicket XML namespace.
2014-07-10 15:30:27 +02:00
ac6427be0f
Removed unused field.
2014-07-10 14:27:26 +02:00
30b2437431
Fixed some bad non-detachable models.
2014-07-10 13:17:52 +02:00
0cf392c0b4
Why have this stupid flag thing if it is only used in one place and only half the time in that one place? Gone.
...
See line (81/77) in PartnerAdditionPanel where it is not used.
2014-07-10 13:09:49 +02:00
bc4ec668d4
View/reply to a thread as a author.
2014-07-10 12:05:15 +02:00
c75eed301c
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
view/src/main/java/se/su/dsv/scipro/util/PageParameterKeys.java
2014-07-10 10:39:18 +02:00
076009b670
Implemented creating group threads for authors.
2014-07-10 10:38:20 +02:00
2459a2df8f
Removed unused method.
2014-07-10 10:37:51 +02:00
427ad6b01e
Added Thread parameter to the onThreadCreated callback.
2014-07-10 10:37:23 +02:00
492507e6ce
Sonar problems.
2014-07-10 10:32:32 +02:00
fred-fri
fde79ced3d
supervisor can now view all threads (but not open)
2014-07-10 17:24:05 +09:00
fred-fri
d34859e824
Merge remote-tracking branch 'origin/develop' into develop
2014-07-10 16:50:54 +09:00
fred-fri
b4c21c2821
new basicforumservice which generifies project and group forum services
2014-07-10 16:50:41 +09:00
a45b55bd41
Link to create new thread page.
2014-07-10 09:23:55 +02:00
6a63c34d42
Moved isAuthorInGroup to isAuthor in Group class instead.
2014-07-10 09:13:28 +02:00
4fef68b8d6
Refactoring.
2014-07-10 09:07:14 +02:00
8bef32168c
Minor test refactoring.
2014-07-10 08:50:05 +02:00
a2c980c3f5
Sonar issues.
2014-07-10 08:33:41 +02:00
8714182040
Fixed unchecked warning.
2014-07-10 08:31:40 +02:00
fred-fri
3c86dec27b
test
2014-07-10 15:24:46 +09:00
fred-fri
f4823a509b
supervisor can create group threads. notification methods use project events (this should probably change to new group events) and are not implemented. showing threads and posts is not implemented.
2014-07-10 15:22:13 +09:00
fred-fri
3d7c69ea94
adding back link to supervisor group create new thread page
2014-07-10 12:58:33 +09:00
fred-fri
4613f51823
clarifying gui for project modules (vs system modules)
2014-07-10 12:23:35 +09:00
b0055206d5
Made the wrapper implementation serializable so there is no problem with stateful Wicket.
2014-07-09 17:30:53 +02:00
2a983b598d
Fixed test.
2014-07-09 17:00:09 +02:00
592fa3ddd4
Merge branch 'group_forum' into develop
...
Conflicts:
core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java
view/src/main/java/se/su/dsv/scipro/forum/pages/SupervisorForumBasePage.java
view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectCreateForumThreadPage.java
view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPage.java
view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java
2014-07-09 16:50:53 +02:00
8fc9be2a05
RejectFinalThesisPanel does not belong in the forum package.
2014-07-09 15:56:54 +02:00
bb82cf82c5
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 15:55:15 +02:00
c63e3e3eb5
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 15:35:29 +02:00
f876740203
Formatting.
2014-07-09 15:13:26 +02:00
9bed9af96b
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 14:59:56 +02:00
8755343dcf
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 14:45:48 +02:00
71bdddfe6d
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 14:44:02 +02:00
00b3b72ce0
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 14:41:40 +02:00
a163f2300c
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
2014-07-09 14:40:01 +02:00
5cea5b9903
Refactored out problematic reference to Project in ViewForumThreadPanel.
2014-07-09 14:29:11 +02:00
26d0e72de7
Made it compile.
2014-07-09 11:17:53 +02:00
49d4ddccb1
Renamed FinalSeminarApprovalDecisionPage to ReviewerApprovalDecisionPage.
2014-07-09 10:44:06 +02:00
31b6ee4287
Removed role from forum post panel.
2014-07-09 10:35:33 +02:00
33245272e1
Merge remote-tracking branch 'origin/develop' into develop
2014-07-09 10:12:55 +02:00
fred-fri
bec32e562e
removing last modified from group details panel
2014-07-09 17:11:58 +09:00
fred-fri
3151adf4dc
bug fix
2014-07-09 17:10:45 +09:00
fred-fri
263c1befe1
gui for system modules
2014-07-09 16:47:51 +09:00
fred-fri
b1af5ccea4
renaming modules
2014-07-09 16:30:53 +09:00
fred-fri
66080c9fd6
test fix
2014-07-09 15:35:03 +09:00
fred-fri
6b48f7f914
adding system modules, group module
2014-07-09 14:59:01 +09:00
fred-fri
62b079381b
adding system modules, group module
2014-07-09 14:00:01 +09:00
fred-fri
1e9d0ff233
removed incorrect group module
2014-07-09 11:42:36 +09:00
915b38e690
Fixed unchecked warning.
2014-07-08 15:50:12 +02:00
fred-fri
5e4a56482a
submitforumthreadpanel and submitforumreplypanel generified
2014-07-08 20:07:42 +09:00
fred-fri
cc0e21214c
conform to new argument project
2014-07-08 19:52:42 +09:00
fred-fri
966743b652
moving wrapper argument last
2014-07-08 19:35:49 +09:00
fred-fri
30e017ff2c
conform to new argument project
2014-07-08 19:22:52 +09:00
fred-fri
9b43e1d228
wicket wrapper for different service implementations that point to the project, group etc
2014-07-08 18:31:08 +09:00
fred-fri
e1fc99ead1
moving stuff
2014-07-08 17:05:07 +09:00
a05b514621
Merge remote-tracking branch 'origin/develop' into develop
2014-07-07 09:25:28 +02:00
fred-fri
ea5a3c2511
typo
2014-07-07 15:45:42 +09:00
fred-fri
37c37618dd
test fix
2014-07-07 15:38:31 +09:00
fred-fri
9713c92649
improved feedback at user edit
2014-07-07 15:26:18 +09:00
fred-fri
3265083cc3
added date
2014-07-07 12:59:01 +09:00
fred-fri
1b91cb5554
Group module
2014-07-07 12:15:35 +09:00
fred-fri
71f0ac9e5f
supervisor page
2014-07-03 15:07:39 +09:00
fred-fri
aa27870a3f
removing remote export setting
2014-07-02 10:35:17 +09:00
fred-fri
a3b39f2547
added last modified date
2014-07-02 10:13:30 +09:00
fred-fri
9502592563
(s) replaced with s
2014-07-01 17:08:33 +09:00
fred-fri
851991f6ef
more space in footer form
2014-07-01 13:02:19 +09:00
fred-fri
4073eb0ee1
clarifying
2014-07-01 11:41:31 +09:00
fred-fri
808a4def90
refactor group gui
2014-07-01 11:32:21 +09:00
fred-fri
6da866edb5
refactoring group gui
2014-07-01 10:05:21 +09:00
fred-fri
334568784b
student group pages, filtering out relevant groups rather than showing all
2014-06-30 14:22:43 +09:00
fred-fri
03aee5ad1b
moving stuff
2014-06-27 16:01:02 +09:00
fred-fri
0ca05bb54a
lots of refactoring
2014-06-27 15:44:22 +09:00
fred-fri
ee2b425019
refactoring away bad panel
2014-06-26 18:16:14 +09:00
fred-fri
97eb94c68c
refactoring away bad panel
2014-06-26 17:35:49 +09:00
fred-fri
bc9de3ad03
cleanup and test
2014-06-26 16:46:12 +09:00
fred-fri
eb9bb141ba
validation
2014-06-26 16:15:50 +09:00
fred-fri
10370ff99e
added feedback
2014-06-26 11:27:55 +09:00
fred-fri
6796b9651f
preliminary grading report only one criteria must have been filled out
2014-06-26 11:02:55 +09:00
fred-fri
a700451760
css
2014-06-26 10:21:30 +09:00
fred-fri
9745f31703
css
2014-06-26 10:19:59 +09:00
Golrokh Moattar
c205c621c7
removed breadcrumb from my group since there is no other place in the system (except forum) that we use such, we should decide about it
2014-06-25 16:03:34 +02:00
Golrokh Moattar
e963bb9693
css fixed in some places for having the same design everywhere
2014-06-25 15:46:34 +02:00
Golrokh Moattar
c9e55ecbfa
css fixed in admin local user creation
2014-06-25 15:14:23 +02:00
Golrokh Moattar
252e345318
css fixed in admin unit and program creation
2014-06-25 14:59:33 +02:00
Golrokh Moattar
c7f828bca4
catch error during deleting a language
2014-06-25 14:21:14 +02:00
Golrokh Moattar
b7349e3683
table's style fixed
2014-06-25 13:30:59 +02:00
fred-fri
6450725f98
manual adding of active participants to final seminars
2014-06-25 15:40:03 +09:00
fred-fri
a229f33a19
manual adding of active participants to final seminars
2014-06-25 15:39:40 +09:00
fred-fri
27f251b3d7
update grade and download report link on submit
2014-06-25 11:20:03 +09:00
fred-fri
c588bd23b3
refactoring group stuff
2014-06-25 09:48:07 +09:00
fred-fri
ce0c976aed
refactoring group stuff
2014-06-25 09:30:54 +09:00
fred-fri
84d636edde
adding more group stuff
2014-06-25 08:48:17 +09:00
fred-fri
ad239588b8
lazy
2014-06-25 07:52:47 +09:00
fred-fri
071edb53c3
basic more group stuff
2014-06-25 07:33:00 +09:00
fred-fri
14d9369967
refactoring group stuff
2014-06-24 15:40:53 +09:00
fred-fri
d5d0d2fa3a
refactoring group stuff
2014-06-24 15:32:31 +09:00
fred-fri
6e5aec44f0
refactoring group stuff
2014-06-24 15:15:03 +09:00
fred-fri
db982e9595
refactoring group stuff
2014-06-24 11:16:54 +09:00
Golrokh Moattar
39dd4bb21b
Merge remote-tracking branch 'origin/develop' into develop
2014-06-23 16:12:36 +02:00
Golrokh Moattar
59923f27fd
continue with group creation
2014-06-23 16:09:49 +02:00
Golrokh Moattar
18c4b24fbc
continue with group creation
2014-06-23 16:09:22 +02:00
fred-fri
f0be4c528b
small fix
2014-06-23 17:22:53 +09:00
golrokh
6bb5575b38
Create group-the very beginning
2014-06-19 16:31:24 +02:00
9133f27517
Moved jQuery rendering to BasePage so that it is always available.
2014-06-19 13:55:02 +02:00
41b57cb901
Made all help text toggleables in the idea submission page for authors.
2014-06-19 10:06:47 +02:00
1d18244e29
Added pingdom
2014-06-19 08:40:41 +02:00
693d99caeb
Admin page to manage languages.
2014-06-19 08:34:05 +02:00
349d1dc710
Renamed Language2 entity to Language.
2014-06-18 16:29:12 +02:00
1d71428dba
Migrated user to the new language entity.
2014-06-18 16:05:31 +02:00
5c44ece70e
Migrated idea to the new language entity.
2014-06-18 14:51:20 +02:00
9519371cc5
Migrated final seminar related stuff to the new language entity.
2014-06-18 11:05:34 +02:00
5713faeea7
Flipped module settings so that modules are rows and project types columns.
2014-06-17 13:55:17 +02:00
9fcf1f6571
Renamed class from a generic name to a more specific.
2014-06-17 13:44:33 +02:00
76686dde61
Added admin setting for specifying priority days.
2014-06-17 13:42:03 +02:00
Golrokh Moattar
c4446d3962
test fixed
2014-06-17 11:24:32 +02:00
Golrokh Moattar
c604c9864f
Fixed reviewing tab
2014-06-17 11:15:24 +02:00
0178882058
The text answers when filling in a peer review are now automatically saved.
2014-06-17 09:50:44 +02:00
8fd559ab12
Sonar
2014-06-17 09:24:25 +02:00
17dc1efebb
Re-ordered columns.
2014-06-17 09:21:41 +02:00
ae2f4e13b6
Added status column to reviewer deadline followup.
2014-06-17 09:20:02 +02:00
2240080687
Styled headers in tables enhanced by the DataTable plugin.
2014-06-17 09:16:33 +02:00
edbc44171d
Added requested date.
2014-06-17 09:13:44 +02:00
Golrokh Moattar
8918ee8096
Role Student changed to Author
2014-06-16 15:06:33 +02:00
Golrokh Moattar
5c2ce7e35e
Role Employee changed to Supervisor
2014-06-16 13:49:25 +02:00
Golrokh Moattar
86d70eeaa6
test fixed
2014-06-16 13:21:17 +02:00
Golrokh Moattar
729c231e4e
two separate columns for reviewers thesis approvals
2014-06-16 13:03:52 +02:00
051100f233
Escape ' in JavascriptEventConfirmation.
2014-06-13 16:42:11 +02:00
234d43dfe4
Removed unfinished stuff.
2014-06-13 16:14:27 +02:00
700d6be161
Changed final seminar approval deadlines to use the new way of checking per decision rather than the whole reviewer approval.
2014-06-13 11:50:33 +02:00
f0fa6d9b13
Merge remote-tracking branch 'origin/develop' into develop
2014-06-13 11:50:06 +02:00
golrokh
cfea2313c8
Merge remote-tracking branch 'origin/develop' into develop
2014-06-13 11:32:58 +02:00
golrokh
ba6c0c0316
fixed updating of address in footer
2014-06-13 11:32:44 +02:00
71da45739a
Changed rough draft deadlines to use the new way of checking per decision rather than the whole reviewer approval.
2014-06-13 11:26:12 +02:00
0c7ab5ed19
Forgot one place.
2014-06-13 10:57:54 +02:00
c4e4816754
Merge remote-tracking branch 'origin/develop' into develop
2014-06-13 10:56:53 +02:00
4b27a5b54c
Changed getDeadline to getCurrentDeadline (working with the latest decision) and now takes into account non-working days.
2014-06-13 10:56:48 +02:00
golrokh
7ad531b559
fixed null id problem with footer address
2014-06-13 10:41:49 +02:00
5819ba14be
Merge remote-tracking branch 'origin/develop' into develop
2014-06-12 15:56:10 +02:00
bb16703678
[SCIPRO-17846] SciPro is not stateless.
2014-06-12 15:55:56 +02:00
Golrokh Moattar
e3a152b115
updatable footer address
2014-06-12 13:59:42 +02:00
Golrokh Moattar
4d7d2f59b7
updatable footer address
2014-06-12 13:23:47 +02:00
fred-fri
e0756bfb86
Merge branch 'users' into develop
2014-06-10 14:45:56 +09:00
fred-fri
6cd40be8b3
cleanup
2014-06-10 14:45:02 +09:00
fred-fri
57c9c134fa
working on user page
2014-06-10 12:48:53 +09:00
e67ee9c1ee
Fixed last missing method for the workaround for the Wicket bug.
2014-06-09 14:16:02 +02:00
fred-fri
9fa187b47a
working on user form
2014-06-09 15:16:24 +09:00
5a0352143f
Fixed test
2014-06-05 15:01:02 +02:00
0f83f35541
Moved ReviewerDeadline stuff to reviewing package.
2014-06-05 15:00:09 +02:00
68de7c366a
Styled DataTable sorted column headers.
2014-06-05 14:35:11 +02:00
983370b228
Enabled filtering and removed Bootstrap DataTables CSS since it was only in the way.
2014-06-05 14:31:26 +02:00
327e61162e
Added some bottom-margin to the .nav-tabs
2014-06-05 14:30:23 +02:00
a7f52ee7e2
Minor JavaScript fixes.
2014-06-05 14:06:18 +02:00
a1d6bea167
Added help text.
2014-06-05 13:52:52 +02:00
9b6a5dd9b1
Styling and catch the error thrown from DataTable plugin to enable the other JavaScript to run properly.
2014-06-05 13:47:55 +02:00
ac5f25b07e
I18n and sorting of rough draft and final seminar approvals.
2014-06-05 13:16:06 +02:00
b9a0177133
Added tabs to the reviewer deadline followup for the four different steps.
2014-06-05 12:59:11 +02:00
8edaa7ea23
Show late rough draft approvals and final seminar approvals.
2014-06-05 12:50:13 +02:00
7d940e6b46
Fixed tests.
2014-06-05 10:33:11 +02:00
15698adbfe
Merge remote-tracking branch 'origin/develop' into develop
2014-06-05 09:47:40 +02:00
f82e783f7e
Added feedback when saving activity plan as template.
...
Wicket ajax... :(
2014-06-05 09:47:27 +02:00
3efd2d7793
Added title to the "Save as template" dialog.
2014-06-05 09:16:52 +02:00
fred-fri
ebf07e0264
adding program crud
2014-06-05 14:14:15 +09:00
ab785872bc
Added feedback panel to save as template panel to show error if name is not filled out.
2014-06-04 15:39:09 +02:00
5cace5398b
Removed stupid callback and made SaveAsTemplatePanel testable.
2014-06-04 15:08:31 +02:00
c6ee21847f
Refactoring.
2014-06-04 14:48:13 +02:00
9b09285a50
Removed stupid User parameter.
2014-06-04 14:46:04 +02:00
0b4cc37dad
Refactoring.
2014-06-04 14:42:26 +02:00
24c15394f5
Fixed test.
2014-06-04 14:38:45 +02:00
2103d91940
Merge remote-tracking branch 'origin/develop' into develop
2014-06-04 11:17:06 +02:00
81686695be
Tiny refactor.
2014-06-04 10:15:58 +02:00
fred-fri
f1040984aa
added reviewer deadlines
2014-06-04 16:43:27 +09:00
fred-fri
8ef62b63cb
added reviewer deadline settings
2014-06-04 14:21:42 +09:00
fred-fri
b4b8280c47
added check that makes sure the selected final seminar start date is not a non work day
2014-06-04 10:27:57 +09:00
b3e261e755
Stupid names with apostrophes.
...
Escapes ' in the javascript confirmation message.
2014-06-03 16:12:54 +02:00
fred-fri
c693c144a9
test fix
2014-06-03 12:48:52 +09:00
