Emil Siverhall
|
83dd807026
|
fixed merge conflict from hotfix branch
|
2012-10-24 20:12:24 +02:00 |
|
Emil Siverhall
|
a0440efa3d
|
Merge branch 'hotfix-20121024'
20121024
|
2012-10-24 19:59:19 +02:00 |
|
Emil Siverhall
|
6a03f96199
|
hotfix to make sure a student role is added to users trying to log in without authorization role
|
2012-10-24 19:56:13 +02:00 |
|
fred-fri
|
ce7f67e64a
|
clarification
|
2012-10-24 13:24:53 +09:00 |
|
fred-fri
|
e65b05e446
|
added partner days to accept info
|
2012-10-24 13:22:38 +09:00 |
|
fred-fri
|
73786e8b19
|
fixed so that you dont get javascript are you sure confirmation if link is not enabled
|
2012-10-24 12:37:24 +09:00 |
|
fred-fri
|
7c15b1ad8a
|
fixed so that you dont get javascript are you sure confirmation if link is not enabled
|
2012-10-24 12:34:20 +09:00 |
|
fred-fri
|
ad572e7ce8
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-10-24 12:26:31 +09:00 |
|
fred-fri
|
c07e74eef9
|
removed the jquery css rule that made links inside dialogs black
|
2012-10-24 12:26:03 +09:00 |
|
fred-fri
|
459db052b3
|
fixed some stuff and gave some feedback for the next tasks
|
2012-10-24 11:06:33 +09:00 |
|
Jona Ekenberg
|
510adceae9
|
Har fått till allt förutom att få ListViewn att visa allt på samma rad.
|
2012-10-23 23:42:45 +02:00 |
|
Emil Siverhall
|
ccab4946e9
|
Merge branch 'studentRole' into develop
|
2012-10-23 13:27:37 +02:00 |
|
Emil Siverhall
|
52f2d284e0
|
we now set default role to student if a user is imported without any role attached
|
2012-10-23 13:27:14 +02:00 |
|
fred-fri
|
6267c87021
|
added info about error
|
2012-10-23 15:12:12 +09:00 |
|
fred-fri
|
5b00cfc129
|
added bit error to turnitincheckobjects
|
2012-10-23 14:16:21 +09:00 |
|
fred-fri
|
314ab6d9c4
|
spelling errors
|
2012-10-22 15:56:57 +09:00 |
|
fred-fri
|
8faaf488cf
|
resolved conflicts
|
2012-10-22 15:45:56 +09:00 |
|
Emil Siverhall
|
1d37adbdc8
|
Merge branch 'ideaPageAccess' into develop
|
2012-10-19 13:57:19 +02:00 |
|
Emil Siverhall
|
27d06ebf9a
|
we now check if an author should have access to idea selection and submission pages. if already participating on an idea, the author should not be able to create a new one, or select a supervisor idea
|
2012-10-19 13:57:00 +02:00 |
|
Emil Siverhall
|
eaf1fe2580
|
Merge branch 'manualConnection' into develop
|
2012-10-19 11:54:25 +02:00 |
|
Emil Siverhall
|
33121cd8cb
|
now it's possible for supervisors as well to manually connect his/her ideas to existing projects
|
2012-10-19 11:52:57 +02:00 |
|
Emil Siverhall
|
6a321e3b87
|
changed the message in confirmation dialog. some idea titles made ajax not open the dialog
|
2012-10-19 11:52:55 +02:00 |
|
Emil Siverhall
|
725b32edc1
|
admins are now able to manually connect student ideas to projects as well
|
2012-10-19 11:52:53 +02:00 |
|
Emil Siverhall
|
47b70be17a
|
admins may now manually connect supervisor ideas with projects
|
2012-10-19 11:52:51 +02:00 |
|
Emil Siverhall
|
2dcefbd879
|
added new ajax confirmation link column-type to use in datatables
|
2012-10-19 11:52:49 +02:00 |
|
Emil Siverhall
|
7e56c4f59d
|
added new column to admin - supervisor idea crud panel that shows if idea have project connection or not
|
2012-10-19 11:52:47 +02:00 |
|
fred-fri
|
603162fd1e
|
added an exclusion for wiquerys slf4j
|
2012-10-19 16:38:15 +09:00 |
|
fred-fri
|
63c611e6bb
|
added new db update file
20121019
|
2012-10-19 14:43:31 +09:00 |
|
fred-fri
|
2364a7efa5
|
some comment changes
|
2012-10-18 11:24:53 +09:00 |
|
fred-fri
|
11e4b6d8ed
|
added some stuff and comments
|
2012-10-18 10:57:09 +09:00 |
|
fred-fri
|
843f67775a
|
created new panel filterkeywordspanel
|
2012-10-18 10:22:57 +09:00 |
|
fred-fri
|
abd1d047a1
|
added new selectkeywordspanel that doesnt require a research area
|
2012-10-18 10:16:35 +09:00 |
|
Emil Siverhall
|
f24f7a39c3
|
Merge branch 'updatePeerTexts' into develop
|
2012-10-16 15:07:16 +02:00 |
|
Emil Siverhall
|
d6e72bfbc7
|
updated texts on purpose of peer reviews-page
|
2012-10-16 15:06:56 +02:00 |
|
Emil Siverhall
|
61bdefbf63
|
Merge branch 'studentIdeaCrud' into develop
|
2012-10-16 14:49:45 +02:00 |
|
Emil Siverhall
|
d7c4fc335b
|
added link to dialog with idea info, match actions and match history to title column
|
2012-10-16 14:47:14 +02:00 |
|
Emil Siverhall
|
5fdeb5a717
|
added more filtering options to new student idea crud datatable
|
2012-10-16 14:32:00 +02:00 |
|
Emil Siverhall
|
aef20c5efb
|
started working on new implementation of student idea crud page for admins
|
2012-10-16 14:13:54 +02:00 |
|
Emil Siverhall
|
9b12ef4d80
|
Merge branch 'partnerAdditionBug' into develop
|
2012-10-16 11:38:32 +02:00 |
|
Emil Siverhall
|
ec88e7f96c
|
project idea partner may now not be added if partner already is part of another idea within the current applicationperiod.
|
2012-10-16 11:38:06 +02:00 |
|
Emil Siverhall
|
9e3aa78bf7
|
Merge branch 'matchHistoryCleanup' into develop
|
2012-10-16 07:44:10 +02:00 |
|
Emil Siverhall
|
528ec78acf
|
clean up of idea status and supervisor from all unit tests connected to supervisor ideas
|
2012-10-15 20:40:37 +02:00 |
|
Emil Siverhall
|
c2139c79c6
|
removed all occurrences of ideaStatus on supervisorideas as well. this is also available through match objects instead. also sql to clean up db added
|
2012-10-15 20:31:36 +02:00 |
|
Emil Siverhall
|
2dc79d3875
|
updated current.sql with code to remove creator from supervisoridea
|
2012-10-15 14:02:31 +02:00 |
|
Emil Siverhall
|
65d9479232
|
removed all occurrences of supervisoridea.creator. this is now being retrieved through match object instead.
|
2012-10-15 13:53:13 +02:00 |
|
Emil Siverhall
|
bad099c270
|
Merge branch 'connectProjectsToIdeas' into develop
|
2012-10-15 12:44:36 +02:00 |
|
Emil Siverhall
|
60b30b5928
|
changes to student ideas so we dont have to loop through all ideas, just the one with same supervisor and level
|
2012-10-15 12:44:13 +02:00 |
|
Emil Siverhall
|
8258373373
|
added functionality for supervisor ideas as well
|
2012-10-15 12:44:11 +02:00 |
|
Emil Siverhall
|
6ea92b6d9d
|
added import method that checks if any ideas is available with the same supervisor, authors and level
|
2012-10-15 12:44:09 +02:00 |
|
Emil Siverhall
|
da4691f5b2
|
added new current.sql file
2012-10-15
|
2012-10-15 08:31:33 +02:00 |
|