Fredrik Friis
|
d397f99b6f
|
Merge branch 'release-2011-12-21'
|
2011-12-21 20:28:25 +09:00 |
|
Marcus Höjvall
|
fce93fcb3f
|
Moved dialog to the parent panel AdminManageProjectIdeaPanel. The dialog content is still not working
|
2011-12-21 10:17:38 +01:00 |
|
Marcus Höjvall
|
6cec0e6372
|
Edited match entity to allow supervisor to be null. When a projectidea is created the default match object is Unmatched with null supervisor
|
2011-12-21 09:58:19 +01:00 |
|
Fredrik Friis
|
db8f1d1c68
|
request
|
2011-12-21 11:55:51 +09:00 |
|
Fredrik Friis
|
9dc6f352ee
|
added project details panel to author project details page
|
2011-12-21 11:52:56 +09:00 |
|
Fredrik Norberg
|
851fe0ec9d
|
Fixed some bugs in match, temp fixes to avoid nullpointers, supervisors can now see their published ideas and some gui improvements
|
2011-12-20 12:23:31 +01:00 |
|
Fredrik Norberg
|
e94b21d6ff
|
matchings now gets published to supervisors
|
2011-12-20 09:52:30 +01:00 |
|
Fredrik Friis
|
aeab58fb39
|
popup for deleting conference messages fixed
|
2011-12-20 14:33:35 +09:00 |
|
Fredrik Friis
|
6ed799ba48
|
default sort is now on activity dates
|
2011-12-20 13:29:58 +09:00 |
|
Fredrik Friis
|
d3969f4a24
|
comments are now hidden from peer reviews unless the review is finished as not to confuse the users with two submit buttons
|
2011-12-20 11:57:47 +09:00 |
|
Fredrik Friis
|
0135d7eeba
|
we dont want to show match stuff to ordinary users yet
|
2011-12-19 17:32:13 +09:00 |
|
Fredrik Friis
|
9578d52b03
|
bugfix
|
2011-12-19 16:16:14 +09:00 |
|
Fredrik Friis
|
fcb3600a64
|
fixed conflicts, cleaned up.
|
2011-12-19 14:50:57 +09:00 |
|
Fredrik Friis
|
b9e7aada4f
|
some cleanup
|
2011-12-19 14:33:53 +09:00 |
|
Fredrik Friis
|
b1ebacecf5
|
added edit panel
|
2011-12-19 14:13:16 +09:00 |
|
Fredrik Friis
|
cc7c98280c
|
added edit panel
|
2011-12-19 14:13:07 +09:00 |
|
Fredrik Friis
|
217a096176
|
filtering functionality implemented
|
2011-12-16 16:30:01 +09:00 |
|
Fredrik Friis
|
fbaa993a28
|
blabla
|
2011-12-16 15:47:55 +09:00 |
|
Fredrik Friis
|
e9424c5c4e
|
simple dataview and underlying layers implemented. no params yet
|
2011-12-16 15:02:07 +09:00 |
|
Fredrik Friis
|
6315277b4b
|
changed some links according to request
|
2011-12-16 11:57:29 +09:00 |
|
Robin Eklund
|
d26b8f0461
|
More sensible defaults
|
2011-12-15 14:55:43 +01:00 |
|
Robin Eklund
|
bb01c8f2e4
|
Resolved merge conflicts, also added more clear indication of login failures via external authentication.
|
2011-12-15 14:55:06 +01:00 |
|
Robin Eklund
|
fb9cc6a486
|
Now allowing editing of projects, semantics on when this should be
allowed is yet to be defined.
|
2011-12-15 14:30:43 +01:00 |
|
Fredrik Friis
|
1b086833df
|
implementing...
|
2011-12-15 17:18:56 +09:00 |
|
Fredrik Friis
|
0dfbcb78be
|
added params class to projectDao
|
2011-12-15 17:10:51 +09:00 |
|
Fredrik Friis
|
02c759ee1a
|
beginning implementation
|
2011-12-15 17:00:51 +09:00 |
|
Fredrik Friis
|
1157af2696
|
beginning implementation
|
2011-12-15 16:02:54 +09:00 |
|
Fredrik Friis
|
0f54983a25
|
moved panel file
|
2011-12-15 15:42:19 +09:00 |
|
Fredrik Friis
|
96d98cead4
|
some optimizations
|
2011-12-15 14:01:49 +09:00 |
|
Fredrik Friis
|
109cca783f
|
some leftover name changes
|
2011-12-15 11:52:01 +09:00 |
|
Fredrik Friis
|
961572e4de
|
some name changes on request
|
2011-12-15 11:43:02 +09:00 |
|
Robin Eklund
|
27206093bd
|
Minor refactoring and scheduling of bulk-supervisor imports.
|
2011-12-14 17:44:31 +01:00 |
|
Fredrik Norberg
|
1ff5d1b27e
|
fixed a bug where supervisor profile worked with a stale object
|
2011-12-14 16:44:38 +01:00 |
|
Robin Eklund
|
f6d4c4e2cc
|
Added import of projects based on title
|
2011-12-14 16:37:53 +01:00 |
|
Robin Eklund
|
5bc2fd374e
|
Major refactoring, old importers has been completely removed.
|
2011-12-14 16:30:11 +01:00 |
|
Robin Eklund
|
c8e0d60289
|
Temporarily removed call to null pointer-throwing method
|
2011-12-14 13:00:31 +01:00 |
|
Robin Eklund
|
132d70a202
|
Added manual import of projects via identifier queries.
|
2011-12-14 12:58:02 +01:00 |
|
Fredrik Friis
|
aab53984f5
|
Merge branch 'projectmanage' into develop
|
2011-12-14 18:31:59 +09:00 |
|
Fredrik Friis
|
bc1783ca09
|
Merge branch 'test' into develop
|
2011-12-14 18:16:34 +09:00 |
|
Robin Eklund
|
7bd42bba88
|
Problem two 'fixed'
|
2011-12-14 10:02:05 +01:00 |
|
Robin Eklund
|
aa4b04bac0
|
Problem one 'fixed', continued
|
2011-12-14 09:55:45 +01:00 |
|
Robin Eklund
|
69518a96b4
|
Problem one 'fixed'
|
2011-12-14 09:55:04 +01:00 |
|
Fredrik Friis
|
56cd21c395
|
fixed the add/edit panel with abstract method too
|
2011-12-14 17:41:12 +09:00 |
|
Fredrik Friis
|
72e90b96e5
|
cleanup
|
2011-12-14 16:06:50 +09:00 |
|
Fredrik Friis
|
22ba8421a3
|
cleanup
|
2011-12-14 15:29:49 +09:00 |
|
Fredrik Friis
|
cd63b0cdd4
|
extensive refactoring of checklistpanel, adding generic components
|
2011-12-14 15:09:42 +09:00 |
|
Fredrik Friis
|
3c7bc01d8f
|
fixed generic boolean filtering panel
|
2011-12-14 14:21:03 +09:00 |
|
Fredrik Friis
|
5bdc92eec6
|
added generic show only my objects checkbox
|
2011-12-14 12:40:59 +09:00 |
|
Fredrik Friis
|
f799c84d50
|
added generic filter component... but it needs a reference to the paramsobject. is it possible to get rid of the paramsobject reference?
|
2011-12-14 12:10:43 +09:00 |
|
Fredrik Friis
|
0dd9277c91
|
new generic filtering component
|
2011-12-14 10:46:56 +09:00 |
|