fred-fri
|
bc7f93340c
|
added some columns
|
2012-11-16 11:49:26 +09:00 |
|
fred-fri
|
e0cf580a9f
|
added dp to page
|
2012-11-15 17:18:58 +09:00 |
|
fred-fri
|
b7452ec1b4
|
added new page for managing targets
|
2012-11-15 16:57:02 +09:00 |
|
fred-fri
|
6d583ae3da
|
added set of targets to applicationperiod
|
2012-11-15 16:22:31 +09:00 |
|
fred-fri
|
0be7d8ea56
|
edited sql
|
2012-11-15 16:11:21 +09:00 |
|
fred-fri
|
51d0619db4
|
renamed to target, added sql
|
2012-11-15 16:08:02 +09:00 |
|
fred-fri
|
7fe9586b6f
|
i got something to work, but not as a map but rather as a set inside employee
|
2012-11-15 14:11:27 +09:00 |
|
fred-fri
|
dcb4bb9cf0
|
added demonstrative comment
|
2012-11-14 15:55:55 +09:00 |
|
fred-fri
|
d02109a57b
|
added statement that creates an empty hashmap with languages when a new employee is created
|
2012-11-14 13:55:26 +09:00 |
|
fred-fri
|
341a6162d3
|
commented out associationoverride line on capabilities languages attribute which no longer exists
|
2012-11-14 13:28:08 +09:00 |
|
fred-fri
|
0f9abd99c1
|
added a set language to employee
|
2012-11-14 13:15:37 +09:00 |
|
fred-fri
|
855ebc049e
|
turn off turnitinmail if not production mode
|
2012-11-14 11:36:01 +09:00 |
|
fred-fri
|
43575141bc
|
the turnitin fix generates nullpointers, commenting out
|
2012-11-14 11:33:15 +09:00 |
|
Jona Ekenberg
|
e1eb039478
|
trying to load stuff from SupervisorIdea but supervisorIdeaService is null for some reason
|
2012-11-13 21:24:06 +01:00 |
|
Jona Ekenberg
|
bb5e874838
|
number of emails now displayed correctly
|
2012-11-13 17:34:18 +01:00 |
|
fred-fri
|
4b69072ec6
|
fixed typo
|
2012-11-13 13:34:36 +09:00 |
|
fred-fri
|
81dff6bca1
|
changed save statements
|
2012-11-13 12:51:11 +09:00 |
|
fred-fri
|
8824dc95ed
|
removed a save statement
|
2012-11-13 12:42:57 +09:00 |
|
fred-fri
|
ac7f18672f
|
moved save statement
|
2012-11-13 12:42:17 +09:00 |
|
fred-fri
|
f9b65222d9
|
a turnitin hack that can help in those cases we get md5 errors
|
2012-11-13 12:40:08 +09:00 |
|
Jona Ekenberg
|
08cd13f2d6
|
added label for showing nofEmails
|
2012-11-12 17:32:20 +01:00 |
|
fred-fri
|
37f936a67c
|
changed wiquery to v 1.2.5
|
2012-11-12 17:36:30 +09:00 |
|
fred-fri
|
7f87458884
|
testcommit for deploy
|
2012-11-12 14:41:18 +09:00 |
|
fred-fri
|
a1c655149d
|
Merge branch 'release20121112'
20121112
|
2012-11-12 14:07:54 +09:00 |
|
Jona Ekenberg
|
c155173c0a
|
fixed some problems concerning the isProjectFollower-function
|
2012-11-10 17:33:55 +01:00 |
|
Jona Ekenberg
|
80814b21a7
|
fixed the paging and now showing 0 projects when no boxes are checked
|
2012-11-08 22:35:29 +01:00 |
|
Jona Ekenberg
|
2a26c7d2be
|
Merge branch 'filterstatus2' into develop
|
2012-11-08 20:12:17 +01:00 |
|
Jona Ekenberg
|
7f2da2dc4e
|
now the filter doesn't disturb ProjectManagementPage anymore
|
2012-11-08 19:58:09 +01:00 |
|
Jona Ekenberg
|
c5f0b0daed
|
removed unused functions
|
2012-11-08 14:24:21 +01:00 |
|
Jona Ekenberg
|
47414ce88e
|
removed some comments
|
2012-11-08 13:54:14 +01:00 |
|
Jona Ekenberg
|
681a2a20e0
|
added hashSet()-function in ProjectTeamMemberRoles
|
2012-11-08 02:51:51 +01:00 |
|
Jona Ekenberg
|
a7a343ad14
|
filter by status now works - but displays all projects when filter is off
|
2012-11-07 14:10:48 +01:00 |
|
Jona Ekenberg
|
603ba199e0
|
added Head supervisor to ProjectTeamMemberRoles - is that a bad idea?
|
2012-11-06 23:35:15 +01:00 |
|
Jona Ekenberg
|
9b7a985838
|
now roles are filtered by checkboxes instead - though Head supervisor is not shown
|
2012-11-06 23:29:50 +01:00 |
|
Jona Ekenberg
|
c486f8efce
|
fixed typo
|
2012-11-05 21:23:41 +01:00 |
|
Jona Ekenberg
|
8804499491
|
now the filtering of projects by status works in SupervisorMyProjectsPanel
|
2012-11-05 21:18:00 +01:00 |
|
Jona Ekenberg
|
306fde414d
|
added some of the filter code, not working yet though
|
2012-11-05 12:49:31 +01:00 |
|
fred-fri
|
9269acaf69
|
added more stuff
|
2012-11-05 11:47:52 +09:00 |
|
fred-fri
|
006f8657f4
|
added some stuff to the page
|
2012-11-05 11:42:49 +09:00 |
|
fred-fri
|
c5640b8e1a
|
made new contents panel for the supervisor idea popup page
|
2012-11-05 10:57:46 +09:00 |
|
fred-fri
|
261f61d33e
|
added a copy of the student page link to the supervisor page
|
2012-11-05 10:52:29 +09:00 |
|
fred-fri
|
e0d4216f61
|
added some comments and stuff
|
2012-11-05 10:06:55 +09:00 |
|
Jona Ekenberg
|
3f8322881e
|
in SupervisorMyProjectsPanel - how to make it use params?
|
2012-11-04 14:10:36 +01:00 |
|
Jona Ekenberg
|
9f9b3e361c
|
made a panel for filtering statuses, need to add it to the correct menu
|
2012-11-02 15:03:48 +01:00 |
|
fred-fri
|
6207803b3d
|
Merge branch 'release20121102d'
20121102d
|
2012-11-02 12:28:03 +09:00 |
|
fred-fri
|
453e9b9f04
|
removed remove statement from current
|
2012-11-02 12:26:44 +09:00 |
|
fred-fri
|
bdbb892500
|
Merge branch 'release20121102c'
20121102c
|
2012-11-02 12:24:34 +09:00 |
|
fred-fri
|
8d12378fc0
|
added remove statement
|
2012-11-02 12:23:54 +09:00 |
|
fred-fri
|
88061f9e2a
|
Merge branch 'release20121102b'
20121102b
|
2012-11-02 12:05:57 +09:00 |
|
fred-fri
|
7ebccf14e7
|
removed old page and settings
|
2012-11-02 12:03:58 +09:00 |
|