4845 Commits

Author SHA1 Message Date
Emil Siverhall
3cc25ec7e9 Removed checkbox for activating latest reviewers links since further work is needed on which reviews the students should have access to. 2011-07-18 11:48:12 +02:00
Emil Siverhall
e95b332186 added support for inactivating/activating Latest Reviewers panel in General System Settings and Peer Administration 2011-07-18 09:45:13 +02:00
Fredrik Norberg
546658093b weekend commit 2011-07-15 16:34:22 +02:00
Fredrik Norberg
699ccb2eae fixed an issue where a test behaved differently on windows and linux 2011-07-15 14:30:47 +02:00
joha-asc
92278f8427 Added logic to handle different webnotifications.
Change-Id: Ied056f8e1ae3d2baa7a24052e8bdfea3b7fdc41f
2011-07-15 13:03:40 +02:00
joha-asc
bc50d1be16 WebNotification
Change-Id: Iccb7b4dca2ab3cbf28e0b1a899b68fa51a886f05
2011-07-15 13:02:11 +02:00
joha-asc
0614f51425 added conference and notificaitpn
Change-Id: I5e53efb62b3062fddd4e599f72d8ab8437903f4f
2011-07-15 13:01:26 +02:00
joha-asc
7aa01ddca1 added a conferenecepanel
Change-Id: I4ebd7496f2063cbb4abd74531156ba09d1611e4d
2011-07-15 13:00:57 +02:00
joha-asc
982bea4355 Added a method for handling webnotifications, and som roles and types
to webnotificatiosndao

Change-Id: Ia2f6e3dc2b425463b04d3a637eee6d62fe2a53d6
2011-07-15 12:59:12 +02:00
joha-asc
0ddcc9e75d Notificationcontroler call
Change-Id: Ieb54b0386287b80ea50787284fd93004488fef83
2011-07-15 12:58:24 +02:00
Emil Siverhall
a03cba66cb Fixed merge conflicts in PeerPortalPanel-files 2011-07-15 10:23:18 +02:00
U-XeNote\Martin
5f95f27d8d Merge branch 'local_develop' 2011-07-15 09:55:07 +02:00
mpeters
62028c2cca Tillägg av google analytics
Change-Id: Ide4eb7f07b11a086a992eda614517091379d4836
2011-07-15 09:51:52 +02:00
Fredrik Norberg
cbeb0eba12 Added upcomingeventpanel 2011-07-14 17:00:41 +02:00
Emil Siverhall
feda3bb985 Added support for activating/inactivating clickable links in Latest reviewers panel. 2011-07-14 16:19:24 +02:00
U-XeNote\Martin
d7483c78fd Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into local_develop 2011-07-14 16:19:03 +02:00
mpeters
01094ebae1 Menu-highlighting can now be performed via an additional interface
Change-Id: Id13fcff8d0c2c4154bb72d63cf5680d15a195fae
2011-07-14 16:14:00 +02:00
joha-asc
1e1919735e get username, forname and surname from settings.
Change-Id: I7657feca169d0255e23c51d075afc622ac95c8eb
2011-07-14 15:48:28 +02:00
joha-asc
351449ff7d Turnitin username, forname ands surname fields
Change-Id: I308ed7a8fab661c995a58b2b7a2bed1a92537797
2011-07-14 15:47:34 +02:00
mpeters
72740ca363 Fix of wicket-rendering-warning
Change-Id: I167ed399e37219ae64e53090146daf9a0190a474
2011-07-14 15:46:02 +02:00
Robin Eklund
38a3aaf79e Merge branch 'ciAdaptations' into develop 2011-07-14 15:33:41 +02:00
mpeters
8d86c2bfed Fix new wicket-warning due to unsafe use of enclosure
Change-Id: I02bba0db02a3e125112e159b0f63cb4834aba9ed
2011-07-14 15:25:31 +02:00
joha-asc
5fd989f422 Merge branch 'develop' into newz 2011-07-14 14:51:13 +02:00
joha-asc
5a0e09af91 conferencepage
Change-Id: I2f80ad5c511258540c176ff12fb1e1f0e77f59e9
2011-07-14 14:51:00 +02:00
joha-asc
272a7e6314 Notification class
Change-Id: Iabfd785f22cf688d669b6135cebbbb7a97e08cbb
2011-07-14 14:49:38 +02:00
mpeters
9f5c496c3d Minor cleanup
Change-Id: I4488f4f1c47dda1a67f0fda4daa2a50962f4638b
2011-07-14 12:58:03 +02:00
Robin Eklund
8ecc1dd2c3 Initial adaptations to get a workable build outside of eclipse 2011-07-14 11:05:21 +02:00
mpeters
70254c6bc8 Added som pixels space between multiple tab-menu rows
Change-Id: Ia8cd741e015d080f4e26a6a1f7b077398101f1d1
2011-07-14 10:10:05 +02:00
Fredrik Norberg
651419264d fixed merge conflicts 2011-07-14 10:04:52 +02:00
U-XeNote\Martin
601c944ae2 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into local_develop 2011-07-13 18:37:30 +02:00
mpeters
9bc51b9c2e Another rewrite of tab-menu, multiple lines now supported in separate
menu-version, the normal tab-menu is reverted to previous behavior.

Change-Id: Icdccd17fe4628e1bd183fad8c88575ea73ab5284
2011-07-13 18:34:20 +02:00
Robin Eklund
bac4becd2e Very small css-related fix, this page will likely be scrapped/hidden soon anyway but it was bothering me 2011-07-13 16:28:36 +02:00
Robin Eklund
b4930e436a Re-merging shibIntegration branch after additional development:
Unit tests(needs some refactoring), added a status page for server-side parameters(may be moved/hidden soon), some minor refactoring, etc
2011-07-13 16:20:50 +02:00
Robin Eklund
1349534007 Refactored out small utility class, feel free to use it when you need immutable kvp's for whatever reason. 2011-07-13 15:52:25 +02:00
Emil Siverhall
70145e8f5f Minor changes in Latest reviewers panel and in the general system settings that the panel concern. 2011-07-13 15:48:03 +02:00
Fredrik Norberg
f1dc922ef1 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-07-13 15:38:12 +02:00
U-XeNote\Martin
4e7b428cd4 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into local_develop 2011-07-13 15:36:09 +02:00
mpeters
505520ef99 Improvements to css, new handling of IE-quirks that doesn't
require separate css files and acceptable rendering of the tab-menu
when many tabs are used

Change-Id: I823baa49faf95d9314e1606a1e4eb41d6c4c1383
2011-07-13 15:29:09 +02:00
Fredrik Norberg
6561802704 Added tests for rendering projectpartnerpage 2011-07-13 15:27:53 +02:00
mpeters
36d8b0b3ce Added icon to tab-menu (ui testing purposes)
Change-Id: Iad44bf928891343f512f60656597ac67a5f343c8
2011-07-13 15:25:28 +02:00
mpeters
fb77243da1 Refactor and made ui look the same between pages
Change-Id: I85de91350c8eb11d3e6191c205856011a2404c94
2011-07-13 15:24:38 +02:00
mpeters
4b7926cfd3 Add of comment
Change-Id: I7a8232c32f68f33895bc61c731aef83110cb3cfe
2011-07-13 15:23:07 +02:00
mpeters
6088d669ad Changed selected menu item to be rendered via class, not id
Change-Id: I96ad2622ceed9bf8bb088082fd8277c8556ffe52
2011-07-13 15:22:32 +02:00
mpeters
73c8de7a42 Addition of default alt-text to all ImageIcon's
Change-Id: Ia81f3d8a5f5a7782b015857d3adc4b87a97f156e
2011-07-13 15:19:27 +02:00
mpeters
04be355dce Fix of wicket-warning due to incorrect use of enclosure
Change-Id: I6e659383b82bc518a2370b508c67ebabfff664cb
2011-07-13 15:18:21 +02:00
Fredrik Norberg
f2a7ce59e9 added gitignore 2011-07-13 12:08:51 +02:00
Marcus Höjvall
7030d31225 Changed links from /projectplan to /match 2011-07-13 11:07:06 +02:00
joha-asc
c15e48023d A panel for showing notifications in the system
Change-Id: Ie4282393812c2c4b804548cfad564b0aad273ea3
2011-07-13 10:48:19 +02:00
joha-asc
4fd9a45938 Notificationquery test
Change-Id: I072e56adae84d851a1823605ea8d5dd75e4141f1
2011-07-13 10:38:07 +02:00
Emil Siverhall
2c9928ea08 Added functionality to enable/disable Latest reviews-panel and to specify number of reviews to show. 2011-07-13 10:12:24 +02:00