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
joha-asc
a31d7218c5
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-07-22 16:24:01 +02:00
joha-asc
9bd9610526
getabsoluteurl
...
Change-Id: I377449fbfb16fc275b665ee67c31e90141688470
2011-07-22 16:21:14 +02:00
joha-asc
6f06dbb7ba
notificationscontroller
...
Change-Id: Ibf8ce4d27665b40977e9a8c24fe235de63734c6d
2011-07-22 16:19:56 +02:00
joha-asc
5db061e81c
notfitionan controller oxh getAbsoluteURL
...
Change-Id: Ie73f92185c8978dffbeef1ffbccd884d7d184154
2011-07-22 16:19:26 +02:00
joha-asc
332391fc04
getAbsoluteURL
...
Change-Id: I6888c5f28206710ac4663a8856ff7c80c0607887
2011-07-22 16:19:06 +02:00
joha-asc
325d31900b
formatfix
...
Change-Id: I3a112c575c39f9b3528a7d6f69e6b5c5e0eaa3e6
2011-07-22 16:18:04 +02:00
joha-asc
69ac7ad61a
format fix
...
Change-Id: Ia1cc0959060078a57549b0dc734642fb093d9b93
2011-07-22 16:17:28 +02:00
joha-asc
804d035a0d
getabsoulteurl och peer notifications
...
Change-Id: Ie110885d4a8b79ae438426f52d1e31ff721826da
2011-07-22 16:17:05 +02:00
joha-asc
04ae4cbaef
getabsoulteurl
...
Change-Id: I543ce104ef423b5ea1015ddded70c34010ff1e41
2011-07-22 16:16:45 +02:00
joha-asc
ef8ad610b5
getabsoulteurl
...
Change-Id: I8638a28b22c6ee6dfc4d0dc26f9efdb1242fceef
2011-07-22 16:16:37 +02:00
joha-asc
a380c0f1cd
cant post message vith zero length
...
Change-Id: Ia92804670207972dd5ea5ac5f0b14fae01547cb0
2011-07-22 16:06:37 +02:00
joha-asc
0b7e46434d
getAbsoluteURL
...
Change-Id: Idf8187723746f79b605097436ab7ced5e2e67db5
2011-07-22 16:06:19 +02:00
joha-asc
a31147d46c
added feedbackpanel cant post message with zero length text
...
Change-Id: Ide88e6abd9304cafdfa6baece4df114c86365c80
2011-07-22 16:05:04 +02:00
joha-asc
3c479a9998
made processnotifiaction private
...
Change-Id: Ifdc2116b2c97c3e32e1a6212895fb38978cce1cb
2011-07-22 16:03:41 +02:00
joha-asc
7589a2a6a9
format fix
...
Change-Id: I24023b36dac310eaccc6ccaaeeabb145022d7178
2011-07-22 16:02:33 +02:00
joha-asc
76e8c992b7
Moved all create notifiavtions to notifiactioncontroller and added
...
notifications to finalseminarcontroller
Change-Id: I85022739718296f67b64daf3299992b34419bcc0
2011-07-22 16:02:02 +02:00
