Commit Graph

2327 Commits

Author SHA1 Message Date
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
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
Emil Siverhall
c50b214c8d Merge branch 'develop' into peer_reviewdate_feature 2011-07-12 16:37:24 +02:00
joha-asc
74819ea792 messageboard test
Change-Id: I5a97637d6bdd47fbf6b28f29fa795dc0cc697b62
2011-07-12 16:18:52 +02:00
Emil Siverhall
91388962e3 Added a new panel that show the latest reviews in the peer portal 2011-07-12 16:16:42 +02:00
joha-asc
e07c85e852 conflict fix 2011-07-12 15:40:55 +02:00
joha-asc
73a6ea4fe1 format fixes
Change-Id: If6498eda760a29a14ddd31e788220607b37411fc
2011-07-12 15:33:50 +02:00
joha-asc
202e911c96 removed readbyuser
Change-Id: Ic36d06206206fc12ae6d08ace0fc837c56e21456
2011-07-12 15:32:37 +02:00
joha-asc
3b841219ef Notification Dao
Change-Id: I4876ea5edc065efb9f70128d2da18044fb1b1f7a
2011-07-12 15:15:30 +02:00
joha-asc
7821553fb2 notification dao
Change-Id: I87236e7979859895d1e2ba405a862c1a60a42bfc
2011-07-12 15:13:54 +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
joha-asc
5a387c3f94 General panel for conferences
Change-Id: I50457bfe41fbfea05e8bff12338cb7ea05bbd3f7
2011-07-12 13:59:41 +02:00