fred-fri
|
ee54e4557e
|
Merge branch 'ehcacheremoved' into develop
|
2013-11-08 17:18:18 +09:00 |
|
fred-fri
|
f0566f090d
|
forgot to remove this before pushing yesterday
|
2013-11-08 14:10:36 +09:00 |
|
fred-fri
|
6f442ff84d
|
removed ehcache
|
2013-11-08 13:49:01 +09:00 |
|
|
|
819f6f4654
|
Fixed violations.
|
2013-11-07 17:01:31 +01:00 |
|
|
|
1daf8822dc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-07 16:16:41 +01:00 |
|
|
|
b195f10dd7
|
Fixed critical issues.
|
2013-11-07 16:16:36 +01:00 |
|
Emil Siverhall
|
e73cdd65e3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-07 14:54:15 +01:00 |
|
Emil Siverhall
|
a2cabad87e
|
removed unnecessary one-to-many relationship milestone phase -> milestone activities.
|
2013-11-07 14:53:34 +01:00 |
|
|
|
0f0210b2ee
|
Removed unused private fields.
|
2013-11-07 14:45:18 +01:00 |
|
niklas3
|
08e2e8d41e
|
Added ApproveFinalThesisPanel.
|
2013-11-07 14:34:50 +01:00 |
|
|
|
8a649c90c6
|
Moved logic determining if uploading a final thesis is allowed to the service layer from view.
|
2013-11-07 13:55:04 +01:00 |
|
|
|
71049b37df
|
Uploading final thesis form is hidden if there exists a final thesis in NOT_DECIDED or APPROVED status.
|
2013-11-07 13:31:42 +01:00 |
|
Emil Siverhall
|
c4d2e09bd8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-07 10:53:24 +01:00 |
|
Emil Siverhall
|
6a00575141
|
fixed lazy init and hibernate exception bugs when updating seminars.
|
2013-11-07 10:49:14 +01:00 |
|
fred-fri
|
86ecaf5f76
|
store method that actually works
|
2013-11-07 16:41:11 +09:00 |
|
fred-fri
|
2a8563dffd
|
fixed tests
|
2013-11-07 14:50:34 +09:00 |
|
fred-fri
|
095192b0c0
|
added finalthesispanel
|
2013-11-07 14:21:57 +09:00 |
|
fred-fri
|
b482a98f3a
|
more improvements on mail fail logging
|
2013-11-07 12:46:11 +09:00 |
|
fred-fri
|
e55c637db6
|
added link for the third time, it keeps magically disappearing
|
2013-11-07 12:08:24 +09:00 |
|
Emil Siverhall
|
41b50dfecf
|
delete thesis from SeminarThesisPanel now refresh page on SeminarPanel to make sure turnitin link disappears if it's not valid.
|
2013-11-06 15:56:12 +01:00 |
|
Leo
|
4ac389a2a3
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/test/java/se/su/dsv/scipro/project/panels/FinalThesisPanelTest.java
|
2013-11-06 14:26:41 +01:00 |
|
Emil Siverhall
|
ddab3ee144
|
fixed NPE in the forum when a post was submitted by someone who no longer has association with the project (eg. supervisor has been changed but old supervisor posted in the forum).
|
2013-11-06 14:12:46 +01:00 |
|
Emil Siverhall
|
2283b4dfdb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-06 13:51:15 +01:00 |
|
Emil Siverhall
|
84df6b7255
|
added notification when uploading final thesis
|
2013-11-06 13:50:27 +01:00 |
|
Leo
|
7a8a7d5e11
|
hides uploadForm if no final seminar has taken place
|
2013-11-06 13:48:50 +01:00 |
|
Emil Siverhall
|
530c793159
|
avoid npe when searching for older projects that doesn't have supervisor attached (for some reason..)
|
2013-11-06 11:41:57 +01:00 |
|
Leo
|
17d258227b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-06 11:10:47 +01:00 |
|
Leo
|
d3244541e0
|
added help needed for days filter
|
2013-11-06 11:10:41 +01:00 |
|
Emil Siverhall
|
6437e652a9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-06 10:03:50 +01:00 |
|
Emil Siverhall
|
582fca0524
|
fixed getString warning for CreateForumThreadPanel
|
2013-11-06 09:58:35 +01:00 |
|
Leo
|
ff06b03a2c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-06 09:36:09 +01:00 |
|
Leo
|
2da377611e
|
fixed project follower bug
|
2013-11-06 09:35:49 +01:00 |
|
fred-fri
|
d636d85fb4
|
more info about sendfailed
|
2013-11-06 15:58:37 +09:00 |
|
fred-fri
|
a9bf3c49df
|
test commit to check log messages on thesis3
|
2013-11-06 15:24:51 +09:00 |
|
fred-fri
|
a4180467a6
|
workaround filter for a wicket bug
|
2013-11-06 15:06:38 +09:00 |
|
Emil Siverhall
|
420c526eab
|
added scipro base url to notifications created by idea export worker for proper url creation
|
2013-11-05 16:58:19 +01:00 |
|
Leo
|
529f9d5836
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-05 15:15:09 +01:00 |
|
Leo
|
11cc94bd86
|
added mocktest to FinalThesisService
|
2013-11-05 15:14:08 +01:00 |
|
Emil Siverhall
|
d0dedb7fed
|
changed logging level when user is attempting to switch user. Only keep error logging if the user is trying to switch without sysadmin role
|
2013-11-05 14:34:20 +01:00 |
|
Emil Siverhall
|
5bda67d5cb
|
changed logging level when user is authenticated but not found through api
|
2013-11-05 13:52:17 +01:00 |
|
Emil Siverhall
|
5e9236f110
|
merge
|
2013-11-05 13:08:09 +01:00 |
|
Emil Siverhall
|
8ac35cefb6
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaOverviewPanel.html
|
2013-11-05 11:53:55 +01:00 |
|
Emil Siverhall
|
034cfbe3c6
|
refactoring of admin idea panels to avoid duplication
|
2013-11-05 11:46:59 +01:00 |
|
Richard
|
1b542a6a7c
|
Minor css-changes on admin/ideas and edit keyword popup.
|
2013-11-05 11:40:45 +01:00 |
|
Richard
|
33d30dd6a6
|
Fixed checkbox not having correct padding on reviewing page.
|
2013-11-05 11:25:54 +01:00 |
|
Richard
|
70e253035d
|
Minor change in CSS regarding horizontal scrollbar in modal windows.
|
2013-11-05 11:16:24 +01:00 |
|
Emil Siverhall
|
84a13ea582
|
switch to use ProjectClassFilter on a few places
|
2013-11-05 09:05:15 +01:00 |
|
fred-fri
|
5a6f2cc09d
|
authorization fixes
|
2013-11-05 16:09:59 +09:00 |
|
Richard
|
c8814f3bb7
|
Fix that removes the horizontal scrollbar on pages and in the modal windows.
|
2013-11-04 17:55:12 +01:00 |
|
Emil Siverhall
|
63817b3206
|
some constants for testing
|
2013-11-04 15:15:25 +01:00 |
|
