Emil Siverhall
a12a5d6ce9
removed query from peer request dao that is no longer necessary when SortableDataProvider is implemented. Associated unit test also removed
2011-11-08 11:33:17 +01:00
Emil Siverhall
1b18f6f63d
modified data provider for peer requests to make lists sortable. admin - peer request list is now sortable by date.
2011-11-08 11:30:03 +01:00
Robin Eklund
6ba94dc6b9
Removed more unused stuff
2011-11-08 11:00:58 +01:00
Robin Eklund
78588f99b7
Merge branch 'develop' into eventCleanup
2011-11-08 10:49:51 +01:00
Robin Eklund
8c1b99b3a0
Cleaned up old schedule stuff.
2011-11-08 10:49:09 +01:00
Fredrik Friis
65621abc0f
halfway adding info about no files
2011-11-08 18:09:13 +09:00
Fredrik Friis
14bce20579
fixed AJAX bug
2011-11-08 17:37:23 +09:00
Fredrik Friis
d7d3419fe5
fixed AJAX bug
2011-11-08 17:36:50 +09:00
Fredrik Friis
cd2dc7f529
removed bug from usersettinspanel
2011-11-08 16:29:39 +09:00
Fredrik Friis
076771eab3
implemented full behaviour of info label
2011-11-08 16:21:30 +09:00
Fredrik Friis
92c622a36f
added empty activity plan info + delete behaviour
2011-11-08 16:02:41 +09:00
Fredrik Friis
703a8a8a5d
fixed user settings panel bugs
2011-11-08 14:11:29 +09:00
Fredrik Friis
543d2d6971
added no upcoming events label
2011-11-08 12:58:04 +09:00
Fredrik Friis
413bc45692
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-11-08 10:50:38 +09:00
Fredrik Friis
1c3c8675ee
fixed the mail setting, saved setting is now displayed
2011-11-08 10:50:18 +09:00
Fredrik Norberg
c0d37fe506
buggfix, checklisttemplates can now be edited properly
2011-11-07 18:34:03 +01:00
Fredrik Norberg
5a334aecdf
buggfix, editing checklisttemplates now work properly
2011-11-07 18:21:19 +01:00
Emil Siverhall
4a1985847d
removed sortable field by mistake. now added again.
2011-11-07 16:13:19 +01:00
Emil Siverhall
1954cef78a
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
small fixes for improved user experience when interactng with the activityplan and checklists as a supervisor
Added viewing of activity-plan events, could be made a lot more graphically appealing.
Added mode-switch for checklist viewing, needs more work.
buggfixes from merge
Minor cleanup
made settingspanel more usable, TODO: fix the mail settings
added a feedbackpanel to activityplan
removed old icon
changed the db script the lazy way since its late
fixed persistence xml
2011-11-07 16:07:53 +01:00
Emil Siverhall
9e271525aa
minor changes to unit tests after adding sortable field to project domain object
2011-11-07 16:05:21 +01:00
Fredrik Norberg
8090005180
Merge branch 'fix_for_production' into develop
...
* fix_for_production:
small fixes for improved user experience when interactng with the activityplan and checklists as a supervisor
2011-11-07 16:04:29 +01:00
Emil Siverhall
fbc2b6df45
supervisor - my projects now supports sorting by headers and paging navigator added. radiogroup is now used instead of checkboxes
2011-11-07 16:00:02 +01:00
Fredrik Norberg
9d9a4717dc
small fixes for improved user experience when interactng with the activityplan and checklists as a supervisor
2011-11-07 15:58:43 +01:00
Emil Siverhall
c91fa0f811
temp commit
2011-11-07 14:39:28 +01:00
Robin Eklund
7809405f2f
Added viewing of activity-plan events, could be made a lot more graphically appealing.
2011-11-07 14:39:00 +01:00
Robin Eklund
4c8fd7a5ec
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-11-07 13:28:48 +01:00
Robin Eklund
5d7a371a06
Added mode-switch for checklist viewing, needs more work.
2011-11-07 13:28:16 +01:00
Fredrik Norberg
7c0e87ca6e
buggfixes from merge
2011-11-07 13:21:40 +01:00
Fredrik Norberg
a23292317e
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Minor cleanup
made settingspanel more usable, TODO: fix the mail settings
changed the db script the lazy way since its late
fixed persistence xml
2011-11-07 13:09:41 +01:00
Robin Eklund
bc10ee990f
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-11-07 12:57:44 +01:00
Robin Eklund
08aea72294
Minor cleanup
...
Signed-off-by: Robin Eklund <robi-ekl@dsv.su.se>
2011-11-07 12:57:28 +01:00
Fredrik Friis
18ecddaefb
made settingspanel more usable, TODO: fix the mail settings
2011-11-07 20:55:22 +09:00
Fredrik Norberg
8933dd00e3
Merge branch 'fix_for_production' into develop
...
* fix_for_production:
added a feedbackpanel to activityplan
2011-11-07 12:05:57 +01:00
Fredrik Norberg
d81bfb092a
added a feedbackpanel to activityplan
2011-11-07 12:05:23 +01:00
Robin Eklund
fdbd789b60
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-11-07 11:31:04 +01:00
Fredrik Friis
cf824b9aff
removed old icon
2011-11-07 19:24:53 +09:00
Robin Eklund
0a86cea035
Merge branch 'master' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-11-07 09:09:31 +01:00
Emil Siverhall
3aa9248b82
code cleanup. removed panels from supervisor start page that shouldn't be there
2011-11-07 08:56:10 +01:00
Fredrik Friis
b1c2a498e5
notificationssida
2011-11-06 13:27:38 +09:00
Fredrik Norberg
a9683a0c76
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
fixed bug when table moved out to the right in firefox
added infobox
filter function added for supervisor - my projects. it is now possible to view inactive and completed projects as well. paging or sorting is not implemented yet.
2011-11-04 11:49:20 +01:00
Fredrik Norberg
cc6d02c82e
cleaned up the viewchecklist code
2011-11-04 11:45:48 +01:00
Emil Siverhall
f25771e5f8
Merge branch 'supervisorFirefoxFix' into develop
...
* supervisorFirefoxFix:
fixed bug when table moved out to the right in firefox
2011-11-04 11:45:25 +01:00
Emil Siverhall
c1c8e93b05
fixed bug when table moved out to the right in firefox
2011-11-04 11:44:51 +01:00
Fredrik Friis
1f16976861
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-11-04 19:03:18 +09:00
Fredrik Friis
0137b0d761
added infobox
2011-11-04 19:02:44 +09:00
Fredrik Norberg
635e0913fc
checklistanswers now again save their state
2011-11-04 10:52:12 +01:00
Emil Siverhall
e547e0063d
Merge branch 'supervisorMyProjects' into develop
...
* supervisorMyProjects:
filter function added for supervisor - my projects. it is now possible to view inactive and completed projects as well. paging or sorting is not implemented yet.
2011-11-04 10:33:26 +01:00
Emil Siverhall
8290038cc3
filter function added for supervisor - my projects. it is now possible to view inactive and completed projects as well. paging or sorting is not implemented yet.
2011-11-04 10:31:56 +01:00
Fredrik Norberg
73722054a5
fixed the add all checklists functionality
2011-11-04 10:06:04 +01:00
Fredrik Friis
061eb47915
Merge branch 'checklist' into develop
2011-11-04 16:39:22 +09:00
