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 |
|
Emil Siverhall
|
2b60d4668b
|
updated current.sql
|
2012-09-11 13:03:20 +02:00 |
|
Emil Siverhall
|
89c4b213ea
|
student idea supervisor is hidden to the authors until course start date unless supervisor decides to make the name visible. added button to supervisor view to make this possible
|
2012-09-11 13:02:29 +02:00 |
|
Emil Siverhall
|
6d90c1a5d5
|
it now doesnt show who is supervisor on the matched student ideas until course start date
|
2012-09-11 13:02:26 +02:00 |
|
fred-fri
|
32eccf8718
|
moved changes to new sql file
20120911
|
2012-09-11 17:15:47 +09:00 |
|
fred-fri
|
cba90fa7a9
|
added new sql file
|
2012-09-11 17:13:07 +09:00 |
|
fred-fri
|
d9b5990ddf
|
modified current.sql file
|
2012-09-11 15:53:30 +09:00 |
|
fred-fri
|
fd6134fd3e
|
some improvements on turnitinworker
|
2012-09-11 15:49:03 +09:00 |
|
fred-fri
|
d120697a4e
|
some improvements on turnitinworker
|
2012-09-11 15:32:36 +09:00 |
|
fred-fri
|
c34b3c0e01
|
entered the new prod integration id into the pom
|
2012-09-11 13:18:44 +09:00 |
|
Emil Siverhall
|
1a94773ef6
|
Merge branch 'inactivate' into develop
|
2012-09-10 15:28:26 +02:00 |
|
Emil Siverhall
|
dd47bde884
|
added new idea status inactive and worker thread that checks for ideas that does not have filled Watson boxes before application period end date, and if not, inactivates the idea
|
2012-09-10 15:25:22 +02:00 |
|
Emil Siverhall
|
269e979891
|
Merge branch 'sqlFix' into develop
|
2012-09-10 15:10:35 +02:00 |
|
Emil Siverhall
|
05f4d87e25
|
case sensitive changes to current sql
|
2012-09-10 15:10:26 +02:00 |
|
Emil Siverhall
|
1e728b44b9
|
Merge branch 'connection' into develop
|
2012-09-10 15:00:22 +02:00 |
|
Emil Siverhall
|
5c85324441
|
updated current.sql
|
2012-09-10 14:59:55 +02:00 |
|
Emil Siverhall
|
1b1a8605d3
|
new unit test for new keyword-research area connections
|
2012-09-10 14:59:40 +02:00 |
|
Emil Siverhall
|
4550bca678
|
changes to keyword-research area connections to make it work properly.
|
2012-09-10 14:59:10 +02:00 |
|
fred-fri
|
101c906920
|
cleared out nonfunctioning keyword research area connection code
|
2012-09-10 19:21:48 +09:00 |
|
fred-fri
|
0c9374f1c4
|
adding submit evaluation
|
2012-09-10 16:15:46 +09:00 |
|
fred-fri
|
4c8992cd5a
|
adding submit evaluation
|
2012-09-10 16:10:16 +09:00 |
|
fred-fri
|
55fea5d52b
|
fixed some markup bugs and added research area label to watsoninfopanel
|
2012-09-10 15:57:07 +09:00 |
|