1273 Commits

Author SHA1 Message Date
Robin Eklund
7b4db4bb9f Merge branch 'hotfix-2011-07-21' 2011-07-21 2011-07-21 10:21:56 +02:00
Robin Eklund
9907183d71 Hotfix to support automated builds/tests 2011-07-21 10:21:27 +02:00
Robin Eklund
d0162134e6 Merge branch 'release-2011-07-18' 2011-07-18 2011-07-18 15:21:28 +02:00
Robin Eklund
82513a59e3 Added unit tests for SSO and userlookup config, much more could be done with this config-checking stuff 2011-07-18 13:36:35 +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
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
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
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
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
Fredrik Norberg
e1f9183cd4 untracked unnecesary files 2011-07-13 10:10:30 +02:00
Robin Eklund
ef88a11790 Added display page for server/request parameters, this will be used to monitor what data is sent via the AJP-proxy.
Refactoring/documentation is next.
2011-07-12 19:23:43 +02:00
Fredrik Norberg
98e5da762b fixed conflict in testwicketpages 2011-07-12 17:51:36 +02:00
Fredrik Norberg
8951e80c13 changed to production database 2011-07-12 17:45:25 +02:00
Fredrik Norberg
63e355e59d added testcases for ProjectPartner 2011-07-12 17:38:36 +02:00
mpeters
dac8d4e7c4 CSS-fix of tab-menu with icons
Change-Id: If46265ecddd42fc33c6a8a30ad5d7c351353ab09
2011-07-12 16:50:26 +02:00
mpeters
63da085599 Improvement on testing-classes
Change-Id: I0de4a812eea3eebbd9cf4620cc9ba9b1862f3a69
2011-07-12 15:05:02 +02:00
Robin Eklund
b28b37cda2 Another test to ensure that external auth is configurable 2011-07-12 14:56:57 +02:00
Robin Eklund
58ef8a3ff7 Added some more testing procedures, more is likely to be added after review of the sign-in process 2011-07-12 14:55:54 +02:00
U-XeNote\Martin
9b11b04aff Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into local_develop 2011-07-12 13:30:18 +02:00
mpeters
b929c74d3b Support for enabling/disabling peer-ratings
Change-Id: I56ebe733e9d67f6fdc3e4c9f49435cd2bb39e7aa
2011-07-12 12:56:37 +02:00
Fredrik Norberg
64fb0cc978 local changes 2011-07-12 09:11:56 +02:00
Robin Eklund
f8421f77f7 Removed unused imports 2011-07-11 17:41:22 +02:00
Robin Eklund
a0e5201b4d Added initial unit tests for authentication routines, very experimental so far.
Also, external auth now defaults to true which will generate warnings in non-REMOTE_USER enabled environments
2011-07-11 17:39:21 +02:00
Robin Eklund
302db362d5 Added configuration option for accepting external auth(applicationContext.xml), default is OFF 2011-07-11 12:32:54 +02:00
mpeters
4924108096 Kraftigt förbättrade unit-test av riktiga wicket-sidor
Change-Id: I8300b43ddfdfa0a7cb46d676746ee7e9e8edd820
2011-07-08 13:03:52 +02:00
mpeters
f8c26537ad Bortplock av en onödig/felaktig rad
Change-Id: Ia1641617bfc0f53ca12ac1d4f9c0a8d0d04ed48e
2011-07-08 10:22:44 +02:00
mpeters
c7d33c7506 Omformattering för läsbarhet
Change-Id: I85c9c7852962ff8f316a0715b739688487d72336
2011-07-08 10:18:29 +02:00