Robin Eklund
7eb784eda3
Refactored main menu to use another base
2011-07-28 16:44:59 +02:00
U-XeNote\Martin
8197a87fc7
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into local_develop
2011-07-28 16:37:13 +02:00
mpeters
deab4f9271
Fix of broken ui-logic, was impossible to create new final seminar
...
(unless there was one already)
Change-Id: Ia190765d0df29c0e730653e724b80e6018522b89
2011-07-28 16:36:50 +02:00
mpeters
8506215602
Spelling+comments
...
Change-Id: I51065466031338b116ab185722915bae1c45c5cc
2011-07-28 16:07:37 +02:00
Fredrik Norberg
3b160e63cc
fixed merge conflicts
2011-07-28 16:05:07 +02:00
Robin Eklund
0ad3de60b6
Merge branch 'develop' into uiMods
2011-07-28 15:59:30 +02:00
Fredrik Norberg
810d6a5f19
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
test fix for board messages
Added year/month/day to logging output
new method for removing boardmessages
development in web.xml
buggfixes for conference
Change of menu order
Fixed non-resetting active project when switching users and the target users active project is null
Enhancements to the base page-test class
Removal of old (and buggy) version of jquery and a new one, that's not
Incorrect access modifier
checklist data classes
Some minor annotation fixes
Future-proofing of final-seminar file paths
added base classes for dynamic checklists
started to improve the traffic lights
2011-07-28 15:55:17 +02:00
Fredrik Norberg
44c9b82b5a
changed trafficlightpanel to not use stateofmind
2011-07-28 15:53:56 +02:00
joha-asc
bb3c3bf118
Merge branch 'develop'
2011-07-28 15:50:55 +02:00
joha-asc
9fb8fe398b
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-07-28 15:47:37 +02:00
joha-asc
4bb3c85707
test fix for board messages
2011-07-28 15:47:19 +02:00
Robin Eklund
fb4d39e40d
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-07-28 15:45:33 +02:00
mpeters
532b93f008
Fix of hiding of "Last 12 months" on peer portal page depending on
...
what's currently visible
Change-Id: I6b0b25817373bacc2af8e3413fc432955b7d9f4a
2011-07-28 15:45:11 +02:00
Robin Eklund
9c024d3541
Added year/month/day to logging output
2011-07-28 15:45:06 +02:00
joha-asc
adcc1324e4
new method for removing boardmessages
2011-07-28 15:42:24 +02:00
joha-asc
11281a9423
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-07-28 15:38:24 +02:00
joha-asc
dd6ba53a36
development in web.xml
2011-07-28 15:37:28 +02:00
joha-asc
1e34d3d283
Merge branch 'checklists' into develop
2011-07-28 15:33:29 +02:00
U-XeNote\Martin
115310561c
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into local_develop
2011-07-28 15:31:50 +02:00
joha-asc
3f55070871
buggfixes for conference
2011-07-28 15:31:41 +02:00
mpeters
ebd17c914c
Change of menu order
...
Change-Id: I55961b2e54627246b904ca0870db95aaffa877ec
2011-07-28 15:31:12 +02:00
Robin Eklund
514bd51961
Merge branch 'ciActiveProjectReset' into develop
2011-07-28 15:30:53 +02:00
Robin Eklund
9222ef71c8
Fixed non-resetting active project when switching users and the target users active project is null
2011-07-28 15:30:31 +02:00
mpeters
1beba1f84a
Enhancements to the base page-test class
...
Change-Id: Id40ff6f973cfe49bfa36ebbd649937b0bdf36953
2011-07-28 12:00:52 +02:00
mpeters
7aebf316fd
Removal of old (and buggy) version of jquery and a new one, that's not
...
in use and thus causes confusion
Change-Id: I923d54fb6602acd1ca53534edae7803a5631094e
2011-07-28 11:55:20 +02:00
mpeters
166e82d1b5
Incorrect access modifier
...
Change-Id: I21e799cbf94ae3e1ae2fd54afd8bdfad4dfe5a86
2011-07-28 09:14:06 +02:00
Fredrik Norberg
43c2e13dc3
added the 4th option to traffic lights
2011-07-27 17:20:13 +02:00
Fredrik Norberg
2a433f5cc5
Merge branch 'checklists' of ssh://git.dsv.su.se/git/scipro/personal/fn into checklists
...
* 'checklists' of ssh://git.dsv.su.se/git/scipro/personal/fn:
checklist data classes
2011-07-27 16:49:33 +02:00
joha-asc
37387ee4a3
checklist data classes
2011-07-27 16:46:53 +02:00
Fredrik Norberg
3343c425bb
Merge branch 'checklists' of ssh://git.dsv.su.se/git/scipro/personal/fn into checklists
...
* 'checklists' of ssh://git.dsv.su.se/git/scipro/personal/fn:
added base classes for dynamic checklists
started to improve the traffic lights
2011-07-27 16:41:28 +02:00
Robin Eklund
23d2aba19a
And yes, even more cleaning up icons
2011-07-27 16:01:01 +02:00
Robin Eklund
4ed3a5376a
More cleaning up icons
2011-07-27 16:00:22 +02:00
Robin Eklund
ec2b127ce3
Cleaning up icons
2011-07-27 15:59:57 +02:00
mpeters
fb978419a1
Some minor annotation fixes
...
Change-Id: Ibd5ca02a67c6f3e8eccd34062e3faa086d5727f6
2011-07-27 15:57:44 +02:00
U-XeNote\Martin
f24e129eea
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into local_develop
2011-07-27 15:43:20 +02:00
mpeters
9f59204df8
Future-proofing of final-seminar file paths
...
Change-Id: Ib2c46c6015c7f42454bb04129309ad96e214aefe
2011-07-27 15:38:45 +02:00
Mariana Simion Rönngårdh
edc8830c22
Added Icons used in Daisy
2011-07-27 14:33:56 +02:00
Robin Eklund
0b28f53e42
Initial UI changes
2011-07-27 14:18:22 +02:00
Fredrik Norberg
37fdba3cbe
Merge branch 'activityplan' into develop
...
* activityplan:
a new version of saving schedules as templates that supports simultaneus events
started to add paralell schedule events
added daysOffset to projecteventtemplate
2011-07-27 12:11:19 +02:00
Fredrik Norberg
19a3962a0c
Merge branch 'activityplan' of ssh://git.dsv.su.se/git/scipro/personal/fn into activityplan
...
* 'activityplan' of ssh://git.dsv.su.se/git/scipro/personal/fn:
a new version of saving schedules as templates that supports simultaneus events
started to add paralell schedule events
added daysOffset to projecteventtemplate
2011-07-27 11:42:41 +02:00
Fredrik Norberg
2bcb9d03ba
a new version of saving schedules as templates that supports simultaneus events
2011-07-27 11:29:55 +02:00
Fredrik Norberg
3a7314ed61
started to add paralell schedule events
2011-07-26 17:24:26 +02:00
Robin Eklund
1f8425dce7
Merge branch 'ssoAdaptations' into develop
2011-07-26 11:18:55 +02:00
Robin Eklund
cf575b43cd
More scanning for attributes
2011-07-26 11:05:40 +02:00
Robin Eklund
7c23588724
Added more scanning for external-auth attributes
2011-07-26 10:31:22 +02:00
Fredrik Norberg
3b25bed168
added daysOffset to projecteventtemplate
2011-07-25 16:20:36 +02:00
joha-asc
56d2501704
Merge branch 'checklists' of ssh://git.dsv.su.se/git/scipro/personal/fn into develop
2011-07-25 15:13:06 +02:00
Fredrik Norberg
94133f4bac
added base classes for dynamic checklists
2011-07-25 14:58:46 +02:00
joha-asc
348781af53
Merge branch 'develop'
2011-07-22 16:33:34 +02:00
joha-asc
265fd6a8da
Merge branch 'notification' into develop
2011-07-22 16:24:23 +02:00
