|
|
7393a7f5be
|
remove old test code
|
2012-11-21 15:56:45 +01:00 |
|
|
|
d39f75518c
|
removed old markupid
|
2012-11-21 15:52:28 +01:00 |
|
|
|
883d472184
|
can mark notifications (un)read
|
2012-11-21 15:15:10 +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 |
|
|
|
56fb474d32
|
removed unused controller bean
|
2012-11-21 12:21:38 +01:00 |
|
|
|
c304b3c790
|
remove debug prints
|
2012-11-21 12:19:46 +01:00 |
|
|
|
ac53b3a8ec
|
refactoring and notification data panel now only lists your own notifications
|
2012-11-21 11:50:32 +01:00 |
|
|
|
5a904ca5d2
|
develop merge
|
2012-11-21 09:11:51 +01:00 |
|
fred-fri
|
0ad2b448d0
|
some cleanup
|
2012-11-21 16:50:43 +09:00 |
|
fred-fri
|
c191459a8f
|
i am a fucking genious. you needed to use longs instead of entity attributes in the compound id class
|
2012-11-21 16:05:13 +09: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 |
|
|
|
dfb1fea1ea
|
notification refactoring and introduction of middle class to point out notification data and recipient
|
2012-11-20 16:07:18 +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 |
|
|
|
5d73e10bc5
|
big initial commit, i will remember to commit more often
|
2012-11-20 11:10:17 +01:00 |
|
fred-fri
|
5435e30232
|
column only editable if ap contains the level
|
2012-11-20 13:14:50 +09:00 |
|
fred-fri
|
0a56d35545
|
made panel abstract, added abstract update and iseditable methods
|
2012-11-20 12:58:23 +09:00 |
|
fred-fri
|
e30fdcc965
|
some cleanup and separation
|
2012-11-20 12:48:17 +09:00 |
|
Emil Siverhall
|
5c0947b5ef
|
Merge branch 'newidea_fixes' into develop
|
2012-11-19 08:45:41 +01:00 |
|
fred-fri
|
b057c27105
|
fixed saving of targets, but only works for one level per supverisor and applicationperiod
|
2012-11-19 16:16:52 +09: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 |
|
fred-fri
|
e97bad79e9
|
trying to add textfields, but since not all supervisors have targets we get nullpointers
|
2012-11-19 10:28:27 +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 |
|
Emil Siverhall
|
aeb815488e
|
Merge branch 'newIdeaEntity' into develop
|
2012-11-16 09:34:47 +01:00 |
|
Emil Siverhall
|
a955d73a5e
|
updated current sql and made some changes to use a renamed keyword selection panel
|
2012-11-16 09:34:30 +01:00 |
|
Emil Siverhall
|
b8d6393fb9
|
minor changes to filterform checkbox panel and mounted some more of the new idea pages in sciproapplication
|
2012-11-16 08:41:55 +01:00 |
|
Emil Siverhall
|
ff9baba8c2
|
added unit test class for new ideas. more tests needed
|
2012-11-16 08:41:53 +01:00 |
|
Emil Siverhall
|
b5c5fc1df7
|
some visibility logic fixes and clean up
|
2012-11-16 08:41:51 +01:00 |
|
Emil Siverhall
|
1472f0609c
|
added new status column panels for student and supervisor idea datatables with more detailed statuses
|
2012-11-16 08:41:48 +01:00 |
|
Emil Siverhall
|
267abe6386
|
added new worker thread to check for expired participant confirmations. also small fixes with links to dialog and name of co-author when accepting to be part of an idea
|
2012-11-16 08:41:46 +01:00 |
|
Emil Siverhall
|
6d58f3dbd7
|
added some more sysadmin annotations to new idea pages
|
2012-11-16 08:41:44 +01:00 |
|
Emil Siverhall
|
17d1da7563
|
added popup if author have confirmed ideas without unfinished watsons. also added watson info text
|
2012-11-16 08:41:41 +01:00 |
|
Emil Siverhall
|
cda301a40e
|
added new complete idea dialog panel where authors may complete the watson boxes
|
2012-11-16 08:41:39 +01:00 |
|
