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
988d5a895d
Merge branch 'hotfix-2011-11-07'
...
* hotfix-2011-11-07:
buggfix, checklisttemplates can now be edited properly
2011-11-07 18:51:36 +01: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
Robin Eklund
23ba91d3be
Merge branch 'release-2011-11-07'
2011-11-07 16:40:13 +01:00
Fredrik Norberg
17aab84ce0
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
removed sortable field by mistake. now added again.
minor changes to unit tests after adding sortable field to project domain object
supervisor - my projects now supports sorting by headers and paging navigator added. radiogroup is now used instead of checkboxes
temp commit
2011-11-07 16:23:15 +01:00
Emil Siverhall
e0822cdfcb
Merge branch 'sortFix' into develop
...
* sortFix:
removed sortable field by mistake. now added again.
2011-11-07 16:13:35 +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
2f534bdb52
Merge branch 'unitTestMods' into develop
...
* unitTestMods:
minor changes to unit tests after adding sortable field to project domain object
2011-11-07 16:05:33 +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
Fredrik Norberg
075e237109
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Added viewing of activity-plan events, could be made a lot more graphically appealing.
Added mode-switch for checklist viewing, needs more work.
2011-11-07 16:04:10 +01:00
Emil Siverhall
aa62f64c67
Merge branch 'myProjectsSorting' into develop
...
* myProjectsSorting:
supervisor - my projects now supports sorting by headers and paging navigator added. radiogroup is now used instead of checkboxes
temp commit
2011-11-07 16:00:46 +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
444de44078
Merge branch 'viewActivityPlanEvent' into develop
2011-11-07 14:39:16 +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
5c5391f5ab
Merge branch 'checklistViews' into develop
2011-11-07 13:28:40 +01:00
Robin Eklund
5d7a371a06
Added mode-switch for checklist viewing, needs more work.
2011-11-07 13:28:16 +01:00
Fredrik Norberg
5ade3a81f1
Merge branch 'fix_for_production' into develop
...
* fix_for_production:
buggfixes from merge
2011-11-07 13:21:50 +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
8a96311d44
Merge branch 'develop' into checklistViews
2011-11-07 12:58:56 +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
957a070841
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
removed old icon
2011-11-07 12:05:39 +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
Fredrik Norberg
493ed86b51
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
code cleanup. removed panels from supervisor start page that shouldn't be there
notificationssida
2011-11-07 09:35:11 +01: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
9ff412b327
Merge branch 'myProjectsCleanup' into develop
...
* myProjectsCleanup:
code cleanup. removed panels from supervisor start page that shouldn't be there
2011-11-07 08:57:15 +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
