fred-fri
|
370c969cab
|
fixed resource pointer bug
|
2013-06-11 16:06:21 +09:00 |
|
fred-fri
|
e1b5040299
|
stringresourcemodel wont work
|
2013-06-11 15:32:24 +09:00 |
|
fred-fri
|
c2d59becac
|
test for page added
|
2013-06-11 15:27:58 +09:00 |
|
fred-fri
|
6d27eea767
|
added properties file, and entity strings in project and final seminar
|
2013-06-11 15:21:57 +09:00 |
|
fred-fri
|
150cc9837b
|
added test for wrapper
|
2013-06-11 14:42:28 +09:00 |
|
fred-fri
|
e0793b3347
|
added empty constructor to ajaxcheckboxwrapper not to violate dry
|
2013-06-11 14:35:40 +09:00 |
|
fred-fri
|
f3d5793797
|
added confirmation
|
2013-06-11 14:31:48 +09:00 |
|
fred-fri
|
99225b71cc
|
some logics
|
2013-06-11 14:23:37 +09:00 |
|
fred-fri
|
7a06660d94
|
wrapper created and added
|
2013-06-11 14:10:26 +09:00 |
|
fred-fri
|
d4c10ee6bb
|
working on exemptions page, need to create wrapper panel for adding ajaxcheckbox to column
|
2013-06-11 13:54:46 +09:00 |
|
fred-fri
|
9a61973fa2
|
working on exemptions page
|
2013-06-11 13:32:19 +09:00 |
|
fred-fri
|
e37632c98d
|
added link to exemptions page
|
2013-06-11 12:27:03 +09:00 |
|
fred-fri
|
e909622131
|
added url in sciproapplication
|
2013-06-11 11:41:38 +09:00 |
|
fred-fri
|
54305a188d
|
created new final seminar rule exemption page
|
2013-06-11 11:38:28 +09:00 |
|
fred-fri
|
4142407d1e
|
minor cleanup
|
2013-06-11 11:31:41 +09:00 |
|
fred-fri
|
a0fc70a60f
|
changed phrasing of adminpanel
|
2013-06-11 11:28:51 +09:00 |
|
fred-fri
|
96161827fe
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-06-11 11:02:23 +09:00 |
|
fred-fri
|
e96b31e61d
|
changed phrasing of some notifications
|
2013-06-11 11:01:41 +09:00 |
|
Emil Siverhall
|
b4015b33d1
|
Merge branch 'milestones/advanced' into develop
|
2013-06-10 11:21:08 +02:00 |
|
Emil Siverhall
|
ee954203af
|
removed unnecessary equals/hashcode methods
|
2013-06-10 11:20:50 +02:00 |
|
Emil Siverhall
|
69da4042d6
|
Merge branch 'milestone/notifications' into develop
|
2013-06-10 11:09:36 +02:00 |
|
fred-fri
|
a67ea4c685
|
fixed date bug
|
2013-06-10 18:04:58 +09:00 |
|
Emil Siverhall
|
8ac64188d3
|
milestone notification improvements
|
2013-06-10 10:50:04 +02:00 |
|
Emil Siverhall
|
f5a3d1e53a
|
confirmed and revoked notifications added to milestones
|
2013-06-10 10:50:00 +02:00 |
|
fred-fri
|
10efe26d4e
|
changed the date
|
2013-06-10 17:17:52 +09:00 |
|
fred-fri
|
40f148d4f4
|
final seminar delete worker should not look at seminars held before this date
|
2013-06-10 15:48:51 +09:00 |
|
fred-fri
|
b6d4c7accb
|
removed delete column from admin all final seminars panel
|
2013-06-10 15:30:24 +09:00 |
|
fred-fri
|
d303da40ec
|
completely removed old project centered final seminar cancelled notification
|
2013-06-10 15:21:12 +09:00 |
|
fred-fri
|
5a55a71328
|
Merge branch 'add_thesis_comment_deadline_to_final_seminar_notification' into develop
|
2013-06-10 13:01:32 +09:00 |
|
fred-fri
|
5058fa759f
|
fixed conflicts
|
2013-06-10 12:55:32 +09:00 |
|
fred-fri
|
6a0b8b2eba
|
bug fix
|
2013-06-10 12:29:33 +09:00 |
|
fred-fri
|
6e0e0219b9
|
fixed better query for worker
|
2013-06-10 12:11:39 +09:00 |
|
fred-fri
|
149fed0bd4
|
disabled final seminar thesis upload form if deadline has passed
|
2013-06-10 12:00:41 +09:00 |
|
fred-fri
|
cfa404dc7e
|
added db update file
20130607
|
2013-06-07 17:28:04 +09:00 |
|
fred-fri
|
ed16559482
|
changed visibility of crud and nocrud panels so that only headsupervisor sees crud and everyone else nocrud, this prevents repetition of details and makes things better looking
|
2013-06-05 18:47:25 +09:00 |
|
fred-fri
|
9ee69d20c1
|
changed annotation on project attribute in finalseminar from manytoone to onetoone
|
2013-06-05 18:27:24 +09:00 |
|
fred-fri
|
40f1342301
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-06-05 17:59:00 +09:00 |
|
fred-fri
|
90b460ba36
|
fixed reviewer page bug
|
2013-06-05 17:58:24 +09:00 |
|
Emil Siverhall
|
36f3f3aa86
|
Merge branch 'milestone/activities' into develop
|
2013-06-05 09:37:21 +02:00 |
|
Emil Siverhall
|
31decf7f61
|
removed unnecessary null check
|
2013-06-05 09:36:48 +02:00 |
|
Emil Siverhall
|
c719492d64
|
db updates for new milestone activities
|
2013-06-05 09:28:13 +02:00 |
|
fred-fri
|
d1d41daf8a
|
locked uploading of opponent reports to isdeleted seminars
|
2013-06-05 15:52:43 +09:00 |
|
fred-fri
|
15c684d067
|
disabling opposition and participation for isdeleted seminars, next must make it visible that its deleted to opponents and participants
|
2013-06-05 15:32:52 +09:00 |
|
Emil Siverhall
|
05df079faa
|
improved tests
|
2013-06-05 08:30:58 +02:00 |
|
Emil Siverhall
|
75e1638b87
|
major refactoring work
|
2013-06-04 15:50:11 +02:00 |
|
fred-fri
|
60cde474d7
|
stash commit, working on disabling opposition and participation for isdeleted seminars
|
2013-06-04 18:51:29 +09:00 |
|
fred-fri
|
ca1e63f618
|
moved cancelled info in seminarpanel
|
2013-06-04 16:54:09 +09:00 |
|
fred-fri
|
80b764a3ba
|
closed thesis comment upload for reviewer
|
2013-06-04 16:42:52 +09:00 |
|
fred-fri
|
ecba2cc72d
|
closed thesis comment upload for examiner
|
2013-06-04 16:34:26 +09:00 |
|
fred-fri
|
980a4d8b50
|
some cleanup and refactoring, next close thesis comment upload for examiner if deleted
|
2013-06-04 16:19:43 +09:00 |
|