|
|
00f8558d59
|
Fixed compilation error.
|
2014-01-29 13:38:57 +01:00 |
|
|
|
fd69bc254c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-29 13:27:51 +01:00 |
|
|
|
413a26ea91
|
Shows feedback when changing the external organization on a project.
|
2014-01-29 13:27:46 +01:00 |
|
|
|
251cf3e144
|
Changed external organization attribute of project from String to ExternalOrganization.
|
2014-01-29 12:46:52 +01:00 |
|
Emil Siverhall
|
32430d1579
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-29 12:46:27 +01:00 |
|
Emil Siverhall
|
20c1e96f40
|
removed IDEA_INACTIVATED notification event since status change works better for switching between active/inactive
|
2014-01-29 12:46:09 +01:00 |
|
|
|
86ba313e49
|
Show feedback when external organization is removed.
|
2014-01-29 12:35:30 +01:00 |
|
fred-fri
|
c4f873345b
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-01-29 19:35:32 +09:00 |
|
fred-fri
|
9fecdaa0f7
|
made all datainitializer users beta
|
2014-01-29 19:34:51 +09:00 |
|
|
|
0ef4ef5027
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-29 10:48:16 +01:00 |
|
|
|
b5482e1837
|
Posted failed events when the supervisor fails participants on the final seminar.
|
2014-01-29 10:48:12 +01:00 |
|
|
|
8d9a9fe092
|
Added abstract base class for all events so that many events can share the same name.
Used by approve/fail seminar participants so there is no need to specify two different events for the milestone.
|
2014-01-29 10:41:29 +01:00 |
|
|
|
b209a166eb
|
Made abstract classes abstract.
|
2014-01-29 10:14:44 +01:00 |
|
|
|
264a1d3bbe
|
Added ParticipationFailedEvent that deactivates the milestone.
|
2014-01-29 10:14:21 +01:00 |
|
|
|
ae29b25c1e
|
Renamed OppositionRejectedEvent to OppositionFailedEvent.
Added RespondentFailedEvent and the milestone gets deactivated when it is posted.
|
2014-01-29 10:09:42 +01:00 |
|
|
|
4e794c1896
|
Small refactoring.
|
2014-01-29 10:04:02 +01:00 |
|
|
|
d8e8b1aee3
|
Milestone gets deactivated when a opposition rejected event gets posted.
|
2014-01-29 09:58:53 +01:00 |
|
|
|
bd646f0814
|
Moved methods around.
|
2014-01-29 09:49:05 +01:00 |
|
|
|
58ba21cd07
|
Added Authorship interface to all the events to have a common interface to use in the milestone activator.
|
2014-01-29 09:48:35 +01:00 |
|
leosu
|
39e60c7322
|
new mail feedback for thread creation easier solution
|
2014-01-29 09:47:13 +01:00 |
|
|
|
15c75aecae
|
Refactored activator after final seminar participation change from user to student.
|
2014-01-29 09:40:08 +01:00 |
|
|
|
cd9b04249b
|
Fixed title column to match idea title column.
|
2014-01-29 09:11:15 +01:00 |
|
leosu
|
e0e8e0242b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-29 09:11:12 +01:00 |
|
|
|
01e0b82be7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-29 09:06:04 +01:00 |
|
Emil Siverhall
|
67a05e2e30
|
Inactive to Active on Admin / match
|
2014-01-29 08:57:37 +01:00 |
|
|
|
d27ceb4fd4
|
Test clean up.
|
2014-01-28 17:10:24 +01:00 |
|
|
|
7a6497b2ab
|
Fixed NPE.
|
2014-01-28 17:06:40 +01:00 |
|
leosu
|
84504b5302
|
new mail feedback for thread creation
|
2014-01-28 16:57:00 +01:00 |
|
|
|
5fb59c7c49
|
Moved confirmation message to a property.
|
2014-01-28 16:43:46 +01:00 |
|
|
|
57b26ae936
|
Inline
|
2014-01-28 16:42:29 +01:00 |
|
|
|
2273fab45e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-28 16:40:07 +01:00 |
|
|
|
b949c53868
|
Clearing out one field before clicking submit will now show error instead of crashing.
|
2014-01-28 16:40:03 +01:00 |
|
|
|
8771914fb4
|
Replaced ajax submit link with a real submit to refresh the individual parts as well.
|
2014-01-28 16:33:47 +01:00 |
|
|
|
3df04fe7d3
|
Fixed scroll sneaky to execute at document.ready so the entire page is loaded before attempting to scroll.
Changed save button panel to normal submit instead of complicating things with ajax.
Added feedback when saving for the reviewer grading report.
|
2014-01-28 16:24:09 +01:00 |
|
|
|
7f072d7542
|
Deleted some left-over files from the big refactor.
|
2014-01-28 16:23:17 +01:00 |
|
leosu
|
00b5c760dd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-28 15:58:16 +01:00 |
|
leosu
|
a554b5ac8c
|
pleasing sonar
|
2014-01-28 15:58:01 +01:00 |
|
Emil Siverhall
|
9afd563120
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-28 15:49:04 +01:00 |
|
Emil Siverhall
|
135d7d1e56
|
label change + tests
|
2014-01-28 15:48:41 +01:00 |
|
Emil Siverhall
|
623f3f851e
|
checkbox for switching between ProjectStatus.ACTIVE and ProjectStatus.INACTIVE on projects without external identifiers
|
2014-01-28 15:18:10 +01:00 |
|
|
|
e93e4cc34b
|
Renamed hasException() to isAutomatic() and included activatedBy events.
Checkboxes in the milestone overview will therefore now get disabled if they are activated by an event.
|
2014-01-28 14:55:19 +01:00 |
|
leosu
|
9be64de982
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-28 14:29:27 +01:00 |
|
leosu
|
af1968a193
|
participate link now in seminar panel
|
2014-01-28 14:29:23 +01:00 |
|
|
|
545e119534
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-28 14:18:30 +01:00 |
|
|
|
e1087dafb5
|
Changed back showSql
|
2014-01-28 14:16:53 +01:00 |
|
|
|
e22cde20e4
|
LUNCH TIME!
|
2014-01-28 14:14:29 +01:00 |
|
|
|
7e20b8eeb0
|
We win!
|
2014-01-28 14:06:47 +01:00 |
|
leosu
|
ff68881cce
|
opposelink now in seminarpanel
|
2014-01-28 14:05:04 +01:00 |
|
leosu
|
3cf0e9e327
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-28 13:29:25 +01:00 |
|
leosu
|
e766e5f798
|
only shows opposition report label when relevant
|
2014-01-28 13:28:55 +01:00 |
|
