fred-fri
|
7a60a64bc9
|
removed supervisorprojectideasubtabmenupanel
|
2012-09-17 16:31:06 +09:00 |
|
Emil Siverhall
|
cfcb99a42d
|
Merge branch 'titleFix' into develop
|
2012-09-17 08:21:17 +02:00 |
|
Emil Siverhall
|
c212bbbf58
|
changed from title in admin crud dialog and removed title from dialog
|
2012-09-17 08:21:05 +02:00 |
|
Emil Siverhall
|
d96cd7b430
|
Merge branch 'createProjectLinks' into develop
|
2012-09-17 08:13:52 +02:00 |
|
Emil Siverhall
|
2cb0491576
|
hiding project creation links until we now exports are working properly
|
2012-09-17 08:13:34 +02:00 |
|
Emil Siverhall
|
afe9b5839b
|
added project creations link to supervisor ideas as well. still need some validation to throw errors if projects cant be created
|
2012-09-17 08:13:32 +02:00 |
|
Emil Siverhall
|
a7329e668e
|
added link to create project from student ideas in datatable column
|
2012-09-17 08:13:29 +02:00 |
|
Emil Siverhall
|
0f3965f354
|
made it possible to create datatable column with label and link with or without confirmation dialog
|
2012-09-17 08:13:27 +02:00 |
|
fred-fri
|
448e320828
|
removed sysadmin decoration from supervisor project ideas page
|
2012-09-17 11:06:50 +09:00 |
|
fred-fri
|
f1e62b2f01
|
added sql file
|
2012-09-15 12:28:02 +09:00 |
|
fred-fri
|
c8c0f8fce0
|
fixed watson npe bug
|
2012-09-15 12:22:11 +09:00 |
|
fred-fri
|
96fe5ae226
|
fixed keywords sorting bug
|
2012-09-15 12:04:01 +09:00 |
|
fred-fri
|
666cc345cc
|
added new sql file
|
2012-09-15 11:55:32 +09:00 |
|
fred-fri
|
3b650e5ceb
|
added new sql file
|
2012-09-15 11:55:10 +09:00 |
|
Emil Siverhall
|
a41f7cfe1c
|
Merge branch 'addStudentBug' into develop
|
2012-09-14 12:27:44 +02:00 |
|
Emil Siverhall
|
ef35a2a11b
|
some changes to unit tests to work with new logics
|
2012-09-14 12:27:34 +02:00 |
|
Emil Siverhall
|
f8dea603ef
|
Merge branch 'addStudentBug' into develop
|
2012-09-14 12:23:52 +02:00 |
|
Emil Siverhall
|
37943cca6a
|
fixed bug when ideas didnt change status to taken when students were added at a later stage by the supervisor
|
2012-09-14 12:23:18 +02:00 |
|
Emil Siverhall
|
52fee01c3f
|
Merge branch 'reqBugFix' into develop
|
2012-09-14 10:33:31 +02:00 |
|
Emil Siverhall
|
893bcff1f2
|
fixed bug that made nullpointer when submitting idea without prerequisites
|
2012-09-14 10:33:08 +02:00 |
|
Emil Siverhall
|
25aa2d4091
|
Merge branch 'matchSettings' into develop
|
2012-09-14 09:32:23 +02:00 |
|
Emil Siverhall
|
d24d9ea764
|
minor line break changes
|
2012-09-14 09:32:16 +02:00 |
|
Emil Siverhall
|
7d6e94e19e
|
Merge branch 'matchSettings' into develop
|
2012-09-14 09:30:01 +02:00 |
|
Emil Siverhall
|
14a601dfcc
|
created new admin match settings page and moved confirmation days option to this page
|
2012-09-14 09:27:59 +02:00 |
|
Emil Siverhall
|
563b174a60
|
Merge branch 'characterCount' into develop
|
2012-09-14 07:56:05 +02:00 |
|
Emil Siverhall
|
77bd2bb40f
|
current sql changes to increase chars in prerequisites field
|
2012-09-14 07:55:44 +02:00 |
|
Emil Siverhall
|
235fc123f5
|
added counter to required prereqs field as well
|
2012-09-14 07:52:55 +02:00 |
|
Emil Siverhall
|
ca20927c08
|
added count with remaining characters to description field
|
2012-09-13 15:47:27 +02:00 |
|
Emil Siverhall
|
7a16fb7c71
|
Merge branch 'focusIssue' into develop
|
2012-09-13 14:04:36 +02:00 |
|
Emil Siverhall
|
0bf8b33c42
|
added ajax behavior to change focus to another auto complete component in admin crud panel, to make selection work properly
|
2012-09-13 14:04:17 +02:00 |
|
Emil Siverhall
|
c6f392dd31
|
Merge branch 'projectCreation' into develop
|
2012-09-13 13:32:08 +02:00 |
|
Emil Siverhall
|
7b10813f97
|
new unit tests to project creation from student ideas
|
2012-09-13 13:30:49 +02:00 |
|
Emil Siverhall
|
0469337ef3
|
changes to project creation from student ideas to make same project service method as supervisor ideas
|
2012-09-13 13:30:46 +02:00 |
|
Emil Siverhall
|
f2b6ca40b2
|
next unit test class to test project creations
|
2012-09-13 13:30:44 +02:00 |
|
Emil Siverhall
|
cd9ddec05e
|
added methods to create projects from supervisor idea details.
|
2012-09-13 13:30:42 +02:00 |
|
fred-fri
|
97d1755757
|
edited current sql
|
2012-09-13 12:08:29 +09:00 |
|
fred-fri
|
dfe36ea260
|
added dp to page
|
2012-09-13 10:31:48 +09:00 |
|
fred-fri
|
6102e3ac6a
|
added new page for datapanel
|
2012-09-13 10:22:28 +09:00 |
|
Emil Siverhall
|
17c1576df0
|
Merge branch 'adminAddAuthor' into develop
|
2012-09-12 10:43:32 +02:00 |
|
Emil Siverhall
|
c485ca87f9
|
added possibility for admins to add authors to supervisor ideas through crud interface
|
2012-09-12 10:43:23 +02:00 |
|
fred-fri
|
8b29abfb88
|
small markup improvement for multiple open periods
|
2012-09-12 16:46:04 +09:00 |
|
fred-fri
|
5d0d4d7c3e
|
added an enclosure
|
2012-09-12 16:42:52 +09:00 |
|
fred-fri
|
57bb023e54
|
some link changes
|
2012-09-12 16:38:21 +09:00 |
|
fred-fri
|
fc8a499530
|
extensive refactoring of application period info panel
|
2012-09-12 16:21:46 +09:00 |
|
fred-fri
|
add3523366
|
fixed typo in current sql table name
|
2012-09-12 13:47:55 +09:00 |
|
Emil Siverhall
|
f7e25b0a8d
|
Merge branch 'supervisorSettingsInfo' into develop
|
2012-09-11 15:32:47 +02:00 |
|
Emil Siverhall
|
22557c4c39
|
added info text to supervisor settings page.
|
2012-09-11 15:32:26 +02:00 |
|
Emil Siverhall
|
7ad1fecb92
|
Merge branch 'areaFilter' into develop
|
2012-09-11 14:11:38 +02:00 |
|
Emil Siverhall
|
8c847eab6d
|
added filtering on research areas to supervisor settings page in admin - match
|
2012-09-11 14:11:14 +02:00 |
|
Emil Siverhall
|
845db5c117
|
Merge branch 'anonymous' into develop
|
2012-09-11 13:03:30 +02:00 |
|