6548 Commits

Author SHA1 Message Date
fred-fri
0a16449574 Merge branch 'release20130215' 20130215 2013-02-15 11:46:29 +09:00
fred-fri
07286f22d5 added new db file 2013-02-15 11:21:09 +09:00
fred-fri
5db796ad79 small markup fix 2013-02-15 11:08:35 +09:00
fred-fri
5008d192e9 changed tabs back to 110% size 2013-02-15 10:38:28 +09:00
fred-fri
714444552a added authorization sysadmin for forum mockup 2013-02-15 10:21:03 +09:00
Jona Ekenberg
747ddf2697 made css/js-files local for the mockup 2013-02-14 17:41:03 +01:00
Jona Ekenberg
2e1b59971e fixade bugg i forummockup 2013-02-14 17:28:32 +01:00
Jona Ekenberg
986165a63d added htmlmockups
Merge branch 'fixaHTMLMockupsForum' into develop
2013-02-14 17:12:41 +01:00
Jona Ekenberg
6a12ca0e58 fixed small things with forummockups 2013-02-14 17:10:56 +01:00
Jona Ekenberg
0f6abac70d made the forum mockups a bit nicer looking 2013-02-14 16:58:01 +01:00
Jona Ekenberg
da18a2c97c added forummockups 2013-02-14 13:50:34 +01:00
8ca0099025 TurnItIn expiration worker is now scheduled at 4am 2013-02-14 11:12:34 +01:00
fred-fri
0c2b5476d5 added sending of mail to importer and moved a log print 2013-02-14 15:46:29 +09:00
fred-fri
49e3295833 made turnitinexpirationworker use the strings instead of users 2013-02-14 15:25:44 +09:00
fred-fri
2a5108b2c2 added sql and some logic 2013-02-14 15:22:36 +09:00
fred-fri
f38f53dd39 added set of strings to mailevent 2013-02-14 14:51:06 +09:00
fred-fri
73e8f9ce52 Merge branch 'noti' into develop 2013-02-14 12:22:24 +09:00
fred-fri
6dcf876aa8 some cleanup 2013-02-14 12:05:23 +09:00
fred-fri
80cf0a9bc4 added a test 2013-02-14 11:37:38 +09:00
fred-fri
6412df2d32 cleaned up tests 2013-02-14 11:13:56 +09:00
fred-fri
3dccd6f3d1 path was wrong 2013-02-13 17:19:43 +09:00
fred-fri
5b2d7be818 test fails 2013-02-13 17:13:11 +09:00
fred-fri
d9ae90d5c4 added sql 2013-02-13 16:17:55 +09:00
fred-fri
858310a0e2 added gui 2013-02-13 16:15:46 +09:00
fred-fri
2d88bdceac added alarm mail list attribute to generalsystemsettings entity 2013-02-13 16:05:29 +09:00
fred-fri
7e7da164c5 added logic and warning 2013-02-13 15:30:56 +09:00
fred-fri
dd8b78f76d added a remove thesis link to seminar panel 2013-02-13 15:25:58 +09:00
fred-fri
387e262e90 added status filtering to project management page 2013-02-13 14:45:50 +09:00
fred-fri
b66ad09b7c added source 2013-02-13 12:52:39 +09:00
fred-fri
79edf96355 added comments that describe the problem 2013-02-13 11:23:50 +09:00
fred-fri
7dbeea75a0 implemented check 2013-02-12 16:29:09 +09:00
fred-fri
705cd77708 found where to check if supervisor has changed 2013-02-12 15:28:15 +09:00
cde369fca0 URL fixed for research areas. 2013-02-11 16:19:08 +01:00
fa8552c98e Merge branch 'feature/turnitin_expiration_warning' into develop 2013-02-11 15:41:33 +01:00
8fd2f8fc4d TurnItIn expiration worker implementation and test. 2013-02-11 15:39:57 +01:00
474926eeb3 TurnItIn expiration worker base. 2013-02-11 12:52:13 +01:00
090fd25842 Updated general system settings entity to match the new database schema. 2013-02-11 11:52:07 +01:00
2eb411ed84 ListField now takes an optional class type parameter that gets passed down to the IConverter for object conversion. 2013-02-11 11:51:30 +01:00
95ba528634 SQL for new turnitin expiration warnings. 2013-02-11 11:45:14 +01:00
fred-fri
ab8d80e5a4 fixed sorting and put filters on one row 2013-02-11 16:06:30 +09:00
fred-fri
907cee7904 added correct sorting on fist meeting column in admin match 2013-02-11 15:53:58 +09:00
fred-fri
00e56a7e47 removed dead space 2013-02-11 15:10:27 +09:00
fred-fri
fa97c8f71f made tabs a little bit smaller to save space 2013-02-11 14:50:09 +09:00
fred-fri
a7b6c1be3f did the same for delete method 2013-02-11 14:01:15 +09:00
fred-fri
463a21aa37 redirect to refresh page after seminar has been created 2013-02-11 13:40:37 +09:00
fred-fri
76405a654f added possibility to create final seminar from within project. but no ajax updating yet 2013-02-11 12:33:18 +09:00
fred-fri
d1524f32a7 changed phrasing of student project overview tab 2013-02-11 11:18:40 +09:00
fred-fri
865fe33e27 changed state of mind strings 2013-02-11 11:11:59 +09:00
Emil Siverhall
27921b6dad Merge branch 'studentChecklists' into develop 2013-02-10 21:04:48 +01:00
Emil Siverhall
6435aafdce added the same notification when students add checklists to a project as when the supervisor is doing it 2013-02-10 21:00:30 +01:00