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.
release-2014-12-14_20-43-16
|
2014-12-12 11:23:57 +01:00 |
|
|
|
debd6adeab
|
Tested adding default activity plan when project gets started from an idea.
|
2014-12-12 11:21:26 +01:00 |
|
|
|
ff7e8c2479
|
This is the method that every consumer wants.
|
2014-12-12 10:58:27 +01:00 |
|
|
|
5d0ad7417b
|
Added mock implementations of EventBus and ActivityPlanFacade to the test match module.
|
2014-12-12 10:50:40 +01:00 |
|
|
|
5ca59d2828
|
Delomboked for Scala compatibility.
|
2014-12-12 10:40:29 +01:00 |
|
|
|
5914b61067
|
Removed dependency on match module from activity plan, the dependency should go the other way around.
|
2014-12-12 10:30:58 +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 |
|
golrokh
|
6e2e651466
|
Added a Logger to give us more info about the problem in user import
|
2014-12-11 12:45:17 +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 |
|
|
|
b8627f117c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-12-10 13:17:19 +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
|
261914e85b
|
change the length of source in NotificationData to LONGTEXT
|
2014-12-10 10:55:19 +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
release-2014-12-09_12-38-01
|
2014-12-09 12:06:30 +01:00 |
|
|
|
16dd1bc087
|
Deleted stupid crap.
|
2014-12-08 16:32:45 +01:00 |
|
|
|
3bbfc82b97
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-12-08 15:34:02 +01:00 |
|
|
|
15e7df0ef9
|
Fixed test.
|
2014-12-08 15:33:53 +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 |
|
|
|
f504398bd7
|
Stuff is immutable you know.
|
2014-12-08 14:14:22 +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 |
|
|
|
7d41e5e7a9
|
Fixed SQL migration version conflict.
|
2014-12-08 13:20:12 +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 |
|
|
|
e7bcaa90e4
|
Fixed version conflict in SQL migrations.
|
2014-12-08 13:06:55 +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 |
|
|
|
6839ebc3e8
|
Removed Membership interface.
|
2014-12-08 13:01:59 +01:00 |
|
|
|
03b1b95e3a
|
Removed old notification landing pages.
|
2014-12-08 13:00:17 +01:00 |
|
|
|
0b326c3396
|
Deleted unused methods.
|
2014-12-08 12:41:08 +01:00 |
|
|
|
f33cf1eb08
|
Improved some types to signal that they may not return a value rather than throwing an exception.
|
2014-12-08 12:40:11 +01:00 |
|
