Fredrik Norberg
ad0ed5b84b
daily commit
2011-07-21 16:54:22 +02:00
Fredrik Norberg
b88d319140
ignored a test that indicated db changes
2011-07-21 11:22:03 +02:00
Fredrik Norberg
ef1b67701f
Merge branch 'activityplan' into develop
...
* activityplan:
implemented the functionality to save activityplans as templates
Almost done with saving schedules as templates
daily commit
2011-07-21 11:06:43 +02:00
Fredrik Norberg
481261aa39
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Hotfix to support automated builds/tests
2011-07-21 11:06:28 +02:00
Fredrik Norberg
b8fdeee59c
implemented the functionality to save activityplans as templates
2011-07-21 11:05:16 +02:00
Robin Eklund
d2c929a41b
Merge branches 'master' and 'hotfix-2011-07-21' into develop
2011-07-21 10:23:08 +02:00
Robin Eklund
7b4db4bb9f
Merge branch 'hotfix-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
Fredrik Norberg
fe70e0f861
fixed db config
2011-07-21 09:51:15 +02:00
Fredrik Norberg
8be2c91bdd
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Bad password in persistence.xml
Added unit test for findLatestReviewers
Changes to build dependencies and config files to support automated builds
2011-07-21 09:50:23 +02:00
Marcus Höjvall
c52c798c60
Bad password in persistence.xml
2011-07-21 09:43:49 +02:00
Marcus Höjvall
c7dc3f01bf
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Added unit test for findLatestReviewers
Changes to build dependencies and config files to support automated builds
2011-07-21 09:42:48 +02:00
Emil Siverhall
6076b779e7
Merge branch 'peer_reviewdate_feature' into develop
...
* peer_reviewdate_feature:
Added unit test for findLatestReviewers
2011-07-21 09:13:42 +02:00
Emil Siverhall
6acc1d35f2
Merge branch 'develop' into peer_reviewdate_feature
...
* develop:
Changes to build dependencies and config files to support automated builds
Done with upcomingEventPanel
events now order properly
Refactored some XML-related stuff to make it more reusable
daily commit
weekend commit
fixed an issue where a test behaved differently on windows and linux
Added upcomingeventpanel
2011-07-21 09:08:17 +02:00
Emil Siverhall
4ae5f9e9d7
Added unit test for findLatestReviewers
2011-07-21 09:04:39 +02:00
Robin Eklund
0930c5c94d
Merge branch 'ciAdaptations' into develop
2011-07-20 17:35:38 +02:00
Robin Eklund
707df5e2ff
Changes to build dependencies and config files to support automated builds
2011-07-20 17:33:01 +02:00
Fredrik Norberg
f6bff289b9
Almost done with saving schedules as templates
2011-07-20 17:17:38 +02:00
Fredrik Norberg
85480e30f2
daily commit
2011-07-19 16:56:15 +02:00
Marcus Höjvall
117f82eb45
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Done with upcomingEventPanel
events now order properly
Refactored some XML-related stuff to make it more reusable
daily commit
Removed checkbox for activating latest reviewers links since further work is needed on which reviews the students should have access to.
added support for inactivating/activating Latest Reviewers panel in General System Settings and Peer Administration
weekend commit
fixed an issue where a test behaved differently on windows and linux
Added upcomingeventpanel
Added support for activating/inactivating clickable links in Latest reviewers panel.
Minor changes in Latest reviewers panel and in the general system settings that the panel concern.
Added functionality to enable/disable Latest reviews-panel and to specify number of reviews to show.
Added a new panel that show the latest reviews in the peer portal
2011-07-19 12:17:16 +02:00
Fredrik Norberg
d222f0c4cd
Merge branch 'activityplan' into develop
...
* activityplan:
Done with upcomingEventPanel
events now order properly
daily commit
weekend commit
Added upcomingeventpanel
2011-07-19 12:11:20 +02:00
Fredrik Norberg
3af8444d02
Merge branch 'master' into develop
...
* master:
fixed an issue where a test behaved differently on windows and linux
2011-07-19 12:09:35 +02:00
Fredrik Norberg
e698544c1c
Merge branch 'master' of ssh://git.dsv.su.se/git/scipro/scipro
...
* 'master' of ssh://git.dsv.su.se/git/scipro/scipro:
Added unit tests for SSO and userlookup config, much more could be done with this config-checking stuff
2011-07-19 12:08:37 +02:00
Fredrik Norberg
00fa623880
merged with origin/dvelop
2011-07-19 12:01:45 +02:00
Fredrik Norberg
e842e1e543
Done with upcomingEventPanel
2011-07-19 11:49:28 +02:00
Fredrik Norberg
bfa5f8ad7c
events now order properly
2011-07-19 11:48:11 +02:00
Robin Eklund
fa63861f04
Merge branch 'refactor' into develop
2011-07-19 10:45:35 +02:00
Robin Eklund
50e0b1d61f
Refactored some XML-related stuff to make it more reusable
2011-07-19 10:44:52 +02:00
Emil Siverhall
770f87b600
Merge branch 'peer_reviewdate_feature' into develop
2011-07-19 09:00:02 +02:00
Emil Siverhall
76699691ad
Merge branch 'develop' into peer_reviewdate_feature
2011-07-18 16:57:02 +02:00
Fredrik Norberg
7fb6513e4c
daily commit
2011-07-18 16:50:39 +02:00
Robin Eklund
c0f7316c49
Re-added hbm2ddl=auto, we'll need a better solution for this at some point.
2011-07-18 15:32:49 +02:00
Robin Eklund
1a5cce59f3
Merge branch 'master' into develop
2011-07-18 15:29:45 +02:00
Robin Eklund
d0162134e6
Merge branch 'release-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
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
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
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
