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 |
|
Emil Siverhall
|
ba41711120
|
more refactoring
|
2013-06-04 08:51:20 +02:00 |
|
Emil Siverhall
|
a608205745
|
new milestone panels to go with new structure
|
2013-06-04 08:50:37 +02:00 |
|
fred-fri
|
e36d14ac08
|
added test for new panel
|
2013-06-04 15:41:35 +09:00 |
|
fred-fri
|
1181f313fa
|
fixed ajax bug in panel
|
2013-06-04 15:16:14 +09:00 |
|
fred-fri
|
3f08d0d2d3
|
made new seminarcancelledinfopanel and added it to seminarpanel, next cleanup and tests
|
2013-06-04 15:12:39 +09:00 |
|
fred-fri
|
0aaf1eef2c
|
adding cancelled info to examiner thesis comment upload panel. this should be turned into one single panel as to not violate DRY
|
2013-06-04 14:01:39 +09:00 |
|
fred-fri
|
a1dabed501
|
made it impossible for examiners to select cancelled final seminars
|
2013-06-04 13:40:47 +09:00 |
|
fred-fri
|
7b2a0d565d
|
closing thesis comment uploads if seminar is deleted
|
2013-06-04 13:10:30 +09:00 |
|
fred-fri
|
ba0baacd1d
|
closed seminar thesis uploads if seminar is deleted
|
2013-06-04 13:06:30 +09:00 |
|
fred-fri
|
73e3ffbfa9
|
added ajax targeting for seminarpanel info so that its made invisible on update
|
2013-06-04 12:46:54 +09:00 |
|
fred-fri
|
7de1f2b868
|
added logics for changing the date and set notdeleted on lazydeleted final seminars
|
2013-06-04 12:28:53 +09:00 |
|
fred-fri
|
f30359cbdd
|
changed info, added info to seminarcrudpanel too
|
2013-06-04 11:55:56 +09:00 |
|
fred-fri
|
03c0bbf4b9
|
added cancelled info to isdeleted seminars
|
2013-06-04 10:53:46 +09:00 |
|
Emil Siverhall
|
0a2462298d
|
new milestone activity domain object + service/repo
|
2013-06-03 13:50:33 +02:00 |
|
fred-fri
|
22e7a1b674
|
worker now lazy deletes seminars
|
2013-06-03 15:02:17 +09:00 |
|
fred-fri
|
988d4ea3b7
|
changing back to from now, thought fail
|
2013-06-03 14:56:55 +09:00 |
|
fred-fri
|
a8f751f3d4
|
removed delete clause from worker
|
2013-06-03 14:46:54 +09:00 |
|
fred-fri
|
7b392907f9
|
made worker use all seminars as many days in the future as the final seminar thesis upload must be made
|
2013-06-03 14:46:17 +09:00 |
|
fred-fri
|
7a1c9c68ce
|
made new notification for cancelled final seminars
|
2013-06-03 14:35:15 +09:00 |
|
fred-fri
|
2be9a6a07d
|
removed unused line
|
2013-06-03 14:08:22 +09:00 |
|
fred-fri
|
6103f96c19
|
made final seminar lazy deletable
|
2013-06-03 14:06:26 +09:00 |
|
fred-fri
|
555af90a22
|
commented out URLworker
|
2013-06-03 13:54:49 +09:00 |
|
fred-fri
|
9dbf33913d
|
better phrasing
|
2013-06-03 13:39:17 +09:00 |
|
fred-fri
|
789b66ad80
|
added real implementation of new info
|
2013-06-03 13:27:43 +09:00 |
|
fred-fri
|
a80bfac617
|
added mock implementation of new info
|
2013-06-03 12:37:36 +09:00 |
|
Emil Siverhall
|
8a35ca03e1
|
Merge branch 'milestones_base' into develop
|
2013-05-31 12:56:08 +02:00 |
|
Emil Siverhall
|
77684e7e13
|
minor cleanup
|
2013-05-31 12:42:26 +02:00 |
|
Emil Siverhall
|
ab14712757
|
added progress bars to milestones progress
|
2013-05-31 12:42:24 +02:00 |
|