fred-fri
|
641d6e4ecd
|
removed unnecessary size rules
|
2012-11-28 15:55:35 +09:00 |
|
fred-fri
|
df2b355b79
|
added some space
|
2012-11-28 15:51:45 +09:00 |
|
fred-fri
|
4e16f1aa40
|
added watsons box header
|
2012-11-28 15:19:31 +09:00 |
|
fred-fri
|
8525003d96
|
added partner info
|
2012-11-28 14:25:47 +09:00 |
|
Emil Siverhall
|
25a38e09c7
|
Merge branch 'logFixes' into develop
|
2012-11-27 13:45:51 +01:00 |
|
Emil Siverhall
|
07f5a1e94e
|
removed printlines without value to the logs
|
2012-11-27 13:45:22 +01:00 |
|
Emil Siverhall
|
42208b5524
|
removed some unnecessary info loggers when importing projects and looking for ideas to connect with them.
|
2012-11-27 13:32:39 +01:00 |
|
Emil Siverhall
|
829ee3c83e
|
Merge branch 'workshop_fixes' into develop
|
2012-11-27 10:50:42 +01:00 |
|
Emil Siverhall
|
7d2b63a266
|
removed connected to project? column from supervisor datatables. still available for admins though
|
2012-11-27 10:46:00 +01:00 |
|
Emil Siverhall
|
924fe866d3
|
changed default locale to english in scipro
|
2012-11-27 10:37:12 +01:00 |
|
Emil Siverhall
|
1f0900d0eb
|
Merge branch 'newidea_admin' into develop
|
2012-11-27 09:40:40 +01:00 |
|
Emil Siverhall
|
e8dd4c9dec
|
added status column to new admin idea datatable
|
2012-11-27 09:16:16 +01:00 |
|
Emil Siverhall
|
fac96f3de7
|
implementation for author and supervisor change is done to the dialog. also added check to see if idea is exportable or not
|
2012-11-27 09:16:14 +01:00 |
|
Emil Siverhall
|
40ea6b8a64
|
most of the admin page is done, with dialog for editing added. supervisor change and author change implementation still needed
|
2012-11-27 09:16:12 +01:00 |
|
Emil Siverhall
|
3ce13fd059
|
started working on admin gui for new ideas
|
2012-11-27 09:16:09 +01:00 |
|
Emil Siverhall
|
50d3ba2017
|
Merge branch 'workshop' into develop
|
2012-11-27 09:07:50 +01:00 |
|
Emil Siverhall
|
38c7cdbc15
|
added more instructions to workshop page, and links back to login page
|
2012-11-27 09:07:20 +01:00 |
|
Emil Siverhall
|
c97235ecaf
|
added new workshop page with instructions
|
2012-11-26 22:23:04 +01:00 |
|
Jona Ekenberg
|
7180659356
|
Merge branch 'displayEvenPanel' into develop
|
2012-11-26 14:39:21 +01:00 |
|
Jona Ekenberg
|
28b4b595bd
|
fixed bug
|
2012-11-26 14:38:25 +01:00 |
|
Jona Ekenberg
|
c429f01db6
|
fixed conflict
|
2012-11-23 14:15:50 +01:00 |
|
Jona Ekenberg
|
e925d92f82
|
made files open in new window
|
2012-11-23 14:12:36 +01:00 |
|
fred-fri
|
61c235fe4c
|
test
|
2012-11-23 14:39:35 +09:00 |
|
fred-fri
|
a29b43557a
|
Merge branch 'release20121123'
20121123
|
2012-11-23 14:16:32 +09:00 |
|
Jona Ekenberg
|
12e0d9cae3
|
trying to find what's causing the bug
|
2012-11-22 23:46:19 +01:00 |
|
Jona Ekenberg
|
83333fd562
|
added fileuploadingstuff to the display-panel, a bug to fix thought
|
2012-11-22 15:29:25 +01:00 |
|
Jona Ekenberg
|
a13f90da28
|
added a panel for viewing an event
|
2012-11-21 14:39:47 +01:00 |
|
Jona Ekenberg
|
8ee595f497
|
now you can always change dates and such
|
2012-11-21 13:33:00 +01:00 |
|
Jona Ekenberg
|
7321633a62
|
fixed error
|
2012-11-20 22:59:48 +01:00 |
|
Jona Ekenberg
|
a884a01b66
|
now works
|
2012-11-20 22:52:41 +01:00 |
|
Jona Ekenberg
|
2017969f67
|
fixed an error
|
2012-11-20 22:45:36 +01:00 |
|
Jona Ekenberg
|
b79dcf0911
|
removed duplicate
|
2012-11-20 22:35:26 +01:00 |
|
Jona Ekenberg
|
0a1da33b73
|
added both on save and on create
|
2012-11-20 22:26:21 +01:00 |
|
Jona Ekenberg
|
d0242df28e
|
trying to fix message
|
2012-11-20 22:14:07 +01:00 |
|
Jona Ekenberg
|
a32b602995
|
added feedback message when creating final seminar
|
2012-11-20 21:53:14 +01:00 |
|
Jona Ekenberg
|
4f24633747
|
removed comma from end of emaillist
|
2012-11-20 14:33:32 +01:00 |
|
Jona Ekenberg
|
b6e26387d0
|
Merge branch 'AdminMail2' into develop
|
2012-11-20 14:00:39 +01:00 |
|
Jona Ekenberg
|
271ce45e06
|
added field for copying email adresses
|
2012-11-20 13:59:56 +01:00 |
|
Emil Siverhall
|
5c0947b5ef
|
Merge branch 'newidea_fixes' into develop
|
2012-11-19 08:45:41 +01:00 |
|
fred-fri
|
ade3b52ead
|
Merge branch 'release20121119'
20121119
|
2012-11-19 12:29:33 +09:00 |
|
fred-fri
|
335a0fa4a6
|
created new db_update file
|
2012-11-19 12:23:06 +09:00 |
|
fred-fri
|
e8e7e5f7e9
|
edited current file
|
2012-11-19 12:22:04 +09:00 |
|
Jona Ekenberg
|
adf5918481
|
added a input field for copying email adresses
|
2012-11-17 16:38:38 +01:00 |
|
Emil Siverhall
|
ee83473867
|
added find partner link on submission page for students
|
2012-11-16 14:54:18 +01:00 |
|
Jona Ekenberg
|
751dd3f691
|
added 'recipients' after the number of recipients
|
2012-11-16 14:31:23 +01:00 |
|
Emil Siverhall
|
e484e4c750
|
we should not show partner selection when student accepting a master idea
|
2012-11-16 14:06:27 +01:00 |
|
Emil Siverhall
|
f62c51fe71
|
added keyword filtering to both student and supervisor datatable with ideas available for selection
|
2012-11-16 13:42:25 +01:00 |
|
Jona Ekenberg
|
a8bb6a5b4e
|
Merge branch 'AdminMail' into develop
|
2012-11-16 13:14:54 +01:00 |
|
Jona Ekenberg
|
f0ff52b6c5
|
added and changed some choices for filtering mail, and made it look in SupervisorIdeas as well
|
2012-11-16 13:13:12 +01:00 |
|
Emil Siverhall
|
7d5710db02
|
changed to show matched ideas by default on supervisor idea start page. + details dialog is now closing when supervisor updating first meeting details
|
2012-11-16 13:03:49 +01:00 |
|