joha-asc
c9e0d5b890
namechange
...
Change-Id: I4cee62cd29207e2de3375e16940ca5605e38368d
2011-07-21 13:56:12 +02:00
joha-asc
1d8447d3b9
Merge branch 'develop' into newz
2011-07-21 13:49:32 +02:00
joha-asc
51e8477b64
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-07-21 13:49:18 +02:00
joha-asc
a00ec56cb9
dito
...
Change-Id: Ie3915d6f75e23aac60940ffe0e731dc5f7c43a59
2011-07-21 11:54:01 +02:00
joha-asc
96d4d6b154
deletes textarea after submitg
...
Change-Id: Ifd128ec85ad014cf0d3002b2ea8c964dd61c554d
2011-07-21 11:51:55 +02:00
joha-asc
1757957dba
format fix
...
Change-Id: Ia345933c892b0a9856abf488a660b07931cd74ad
2011-07-21 11:45:49 +02:00
joha-asc
5bad95a58f
hide set all read and pagfinator
...
Change-Id: I5dc916501b6276ecbe34554c0b91ada3b818f689
2011-07-21 11:44:07 +02:00
Fredrik Norberg
b88d319140
ignored a test that indicated db changes
2011-07-21 11:22:03 +02:00
joha-asc
33501a3ab4
text
...
Change-Id: Iea620bfc1ffd98977921e7adde67b5798725ac60
2011-07-21 11:19:24 +02:00
joha-asc
f503d95e3e
format fix
...
Change-Id: I7a161f4c40f27b89b382c23085b77f5e1cc51103
2011-07-21 11:16:33 +02:00
joha-asc
9f133859c8
Support for restinterface for comments
...
Change-Id: Ie85022e2f32878f283bdcfdbb4440f47d972e1bb
2011-07-21 11:15:31 +02:00
joha-asc
aea255173d
Add rest possiblity
...
Change-Id: I8dca30af8d6a029bc594eab8474cba24962497aa
2011-07-21 11:14:33 +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
joha-asc
5ae70ce57a
name change from relativePath, to absolute
2011-07-20 17:13:07 +02:00
joha-asc
d453e02ae2
name change from relativePath, to absolute
2011-07-20 17:10:20 +02:00
joha-asc
e0928de5bf
removed sysout
...
Change-Id: Ic0744c3cf55c3de371c5c79c1b96124f5d8d68f6
2011-07-20 17:05:05 +02:00
joha-asc
804ea46ca4
ta bort sysouts
2011-07-20 17:02:31 +02:00
joha-asc
4005e3d6e7
scipro pighleef
...
Change-Id: Idf8b714a19be038b8565e42386c989756360e2a2
2011-07-20 16:56:35 +02:00
joha-asc
c0ee4748d3
removed order by in count
...
Change-Id: I5eb6379c98157d4792a519d4a17ce5b7ba319854
2011-07-20 16:54:33 +02:00
joha-asc
8a171e8107
Testfixar på projectpartner
...
Change-Id: Ibe3b27f7bb2e71418132b538a14f6818571b18c4
2011-07-20 16:54:06 +02:00
joha-asc
cfabfec340
Conflitct fixes
2011-07-20 16:45:57 +02:00
joha-asc
5f88e45484
deleted fiels
2011-07-20 15:25:53 +02:00
joha-asc
2db1ac12d0
heading css change
...
Change-Id: I10bdb85ca572e2dd372d2ae5dbfdbbb49e42668e
2011-07-20 15:22:35 +02:00
joha-asc
dab678deff
just admin can removes messages
...
Change-Id: I15ecff12789435fda65709c52700d09f6d270593
2011-07-20 15:21:54 +02:00
joha-asc
693c89bd35
dataproivder for web notification
...
Change-Id: I39ddd4dcacefe2fe096a405d9a361c6dc17aaf17
2011-07-20 15:07:12 +02:00
joha-asc
a45766eb6f
notification border
...
Change-Id: I5e6e35d108bfa1300116da46a855bd16c1e189c4
2011-07-20 15:04:13 +02:00
joha-asc
e64e3e6d8e
test for conferences and projectstartpage
...
Change-Id: Ic22483643f6703601acc98efa75e34162ac5aeba
2011-07-20 15:03:50 +02:00
joha-asc
eb93f544e0
nullcheck
...
Change-Id: I7b2986759b8ddf4743bc2665ce16f7824d5d135d
2011-07-20 15:03:23 +02:00
joha-asc
bab761de8f
Emptypanel on null
...
Change-Id: I895f1591c623640e03ed0855b1f439de16510046
2011-07-20 15:01:19 +02:00
joha-asc
af01fdce23
test for dataproivder query
...
Change-Id: I615f4d0942bed72d988ae7da77f9492fc6649fda
2011-07-20 14:55:35 +02:00
joha-asc
9753769f45
notifications messages
...
Change-Id: I1dbc2be77e99cddd714e3809af62041321c5ee09
2011-07-20 14:30:47 +02:00
joha-asc
74a6680ed0
supervisorconference
...
Change-Id: Id6b0e973da35822798e3d35c3c6403955c054857
2011-07-20 14:30:31 +02:00
joha-asc
dcf768ebd5
using generalsystemsetting instead of properties settings for mail
...
Change-Id: I7997ebb0e0232f181338fb8a9a53053a1f348ef7
2011-07-20 14:29:39 +02:00
joha-asc
cb0b37d1cd
format fix
...
Change-Id: I60c66ac89c7ab8aa4f5ddc6395c1c6ec2cb41f4b
2011-07-20 14:29:10 +02:00
joha-asc
2adfb0370c
Made mail to an @component and removed properties-parameter
...
Change-Id: I028fcb53f4b012b0a1b3fbd2b8fc0eac3724b5da
2011-07-20 14:28:49 +02:00
