Commit Graph

4843 Commits

Author SHA1 Message Date
joha-asc
0a4baf373e resourcetester
Change-Id: I8cb588f9aa94e39aa721fb90f0ce1bfafac6a82c
2011-06-17 16:17:56 +02:00
Fredrik Norberg
4d803e7df4 Change-Id: I66873167ded5b04631f22590ffd7c7102ee5698c 2011-06-17 15:09:30 +02:00
Fredrik Norberg
c125ea8ab2 implementerat att admins kan ställa in hur många dagar projectpartner annonser visas 2011-06-17 15:08:30 +02:00
mpeters
2ad3abba0d Merge branch 'develop' of ssh://mpeters@git.dsv.su.se/git/scipro/scipro into HEAD 2011-06-17 14:36:42 +02:00
mpeters
9e92bd3d84 Förbättrat loggning och fixat en felaktiv användning av
filerepository-länkar

Change-Id: Ide060b329199fe9c24a8adf54988a24846f3862c
2011-06-17 14:35:56 +02:00
joha-asc
5e41f42a89 recipienttest
Change-Id: Ic4fb76d2a42dc44915fe69ce953e8e81c37dff8e
2011-06-17 14:11:38 +02:00
joha-asc
084a259eb9 Messageändringar
Change-Id: Idaf5845ca68cffa784072596b37bdd1dd5c3ba78
2011-06-17 14:10:17 +02:00
joha-asc
38d4190127 projectwallen
Change-Id: I6e56fca6eea4b51989c14f748ae1e2d4b9211eee
2011-06-17 14:09:56 +02:00
Fredrik Norberg
2b583354dd Change-Id: Ie8048c9fb387cfb13f1d5e1b645772160071f651 2011-06-17 13:20:02 +02:00
Marcus Höjvall
b87a4d3224 Added new page Level settings to Admin->Settings page. Used to add/edit project classes 2011-06-17 13:00:01 +02:00
joha-asc
859b921053 ratable
Change-Id: Ic7a5db722eff65ac77fa90d0f539c0d90d17507c
2011-06-17 11:56:04 +02:00
joha-asc
140f3f9847 Test case
Change-Id: I831e2b89e69731bf5535007c081f8a67271d8fed
2011-06-17 11:48:46 +02:00
joha-asc
10acef0960 BoardMessage
Change-Id: Ib967b6cbfe05f9ccbb872686888462397fb01a21
2011-06-17 11:32:40 +02:00
joha-asc
a810205842 Change-Id: I21c7cf30e905311712e09dfb7b57ff1b20564fbb 2011-06-17 10:41:40 +02:00
joha-asc
3c8f5a79b6 finalseminartests
Change-Id: Ib46c22e4e30998b9e2cb623a44dc66946c8e453c
2011-06-16 16:23:28 +02:00
joha-asc
0f0aff7ec8 Testcommentsize
Change-Id: Ib3d0af2188184b2a035e862d47e057e1e741fbee
2011-06-16 16:06:35 +02:00
joha-asc
f29884ece9 La till check för kolla sizequery
Change-Id: I768c62566e6b38fe8ce9d51965d606395d4fffb2
2011-06-16 16:05:53 +02:00
joha-asc
89282730f7 Comparetometodbuggfix
Change-Id: I3d809e4ec7146116a89e23818c7524781515a2b5
2011-06-16 16:04:09 +02:00
mpeters
36a24d9b64 Production-deploy deaktivering av peer-prylar
Change-Id: Ia9bb9bcc4570823292887df95adf3842abad446f
2011-06-16 15:30:00 +02:00
U-XeNote\Martin
387ca116b2 Merge branch 'develop' 2011-06-16 14:55:03 +02:00
Fredrik Norberg
4ec4c19ed5 meh
Change-Id: I9d7bf4857d2258aac578ec3775f615c24a3c475c
2011-06-16 14:33:37 +02:00
joha-asc
06f55287b1 Icons
Change-Id: I022e101e9948152e098289bc1625ec5c926c1719
2011-06-16 14:19:54 +02:00
joha-asc
e7f531d217 general
Change-Id: I9f8a97d9b10a88155216bf0bd0042cacd4053796
2011-06-16 14:11:54 +02:00
joha-asc
774f0214fb stateofmindpanel
Change-Id: Ica74f6361e31ea0478be3fb1623314a987472cdb
2011-06-16 11:36:31 +02:00
joha-asc
28c295adb2 Merge branch 'develop' of ssh://joha-asc@git.dsv.su.se/git/scipro/scipro into HEAD 2011-06-16 11:25:38 +02:00
joha-asc
a010016a67 namechange
Change-Id: Ic753576615b97984545c5b673ef3ace9f54b58ae
2011-06-16 11:25:06 +02:00
mpeters
fe2026e364 Merge branch 'develop' of
ssh://mpeters@git.dsv.su.se/git/scipro/scipro into HEAD

Conflicts:
	src/main/java/se/su/dsv/scipro/data/dao/interfaces/UserDao.java
	src/main/java/se/su/dsv/scipro/data/dao/jpa/UserDaoJPAImp.java
	src/main/resources/applicationContext.xml

Change-Id: Ica6baa22c7ebdb3fc5ee5ee5e982c4e4c6e54bd0
2011-06-16 11:11:16 +02:00
mpeters
6eaa85e28a Omarbetat importjobb m.m.
Change-Id: I0e859250800be0f29398c358992e99400b2cc191
2011-06-16 09:53:25 +02:00
Johan Aschan
306b3e1c69 Buggfix visade fel datum för uploaded thesis
Change-Id: Ib463cf91867e5cf359e1196739a1502bc4a8c6cf
2011-06-15 20:17:42 +02:00
mpeters
a066d99ac0 Tillägg av deploy-inställningar
Change-Id: I6f4beefe127850f92851272f28a1e95e5bfafd91
2011-06-15 19:00:48 +02:00
Fredrik Norberg
c864b60a7d Merge branch 'exjobbskompis' into HEAD 2011-06-15 16:42:55 +02:00
Fredrik Norberg
94360a351c Buggfix i MessageBoard db mappning
Change-Id: Ib3fa21c98dd533faefd9efe36ab139b0e3c46523
2011-06-15 16:41:03 +02:00
joha-asc
689c144f4f Buggfix för svenska tecken
Change-Id: I3e1507eead3482745c45ef9b7a8b25e0ec804f5a
2011-06-15 14:43:22 +02:00
joha-asc
ff88b732ac Ändra så deltagarna syns direkt istället för dialogruta för
opposition.

Change-Id: I2bb5b293f33b70c19528b2d13d2d8021973bc03d
2011-06-15 14:16:47 +02:00
Fredrik Norberg
1ec902c153 Change-Id: Ia65c7f8f6055122a5e7001f116dce3a390b08033 2011-06-15 11:58:46 +02:00
Fredrik Norberg
4f0718239a Klar med namnbyte av exjobbskompis
Change-Id: Ifff0ec91dfb99160aa8a070b1e51abe5d7e3ed0d
2011-06-15 11:34:29 +02:00
joha-asc
dd8ce28d1c new message
Change-Id: I8b95a86334d41057bfba6071052a0f7d38e7b88a
2011-06-15 11:28:05 +02:00
Fredrik Norberg
2b648d1aeb namnbyte från svenska till engelska
Change-Id: I97f4a72e2a2b6581ebad273577a4f37c0bc33119
2011-06-15 11:25:09 +02:00
Fredrik Norberg
7d9510dfec mitt i att byta namn från exjobb till project
Change-Id: Ie468206e1a9cd0380c80c0d2bc3083e095b101f9
2011-06-15 11:17:42 +02:00
joha-asc
cdcf2f4192 tog bort massa gamla klasser
Change-Id: I38b50877280249e92e8c9a8544e54249873c2deb
2011-06-15 10:49:49 +02:00
joha-asc
63565df4d2 tog bort mess
Change-Id: Ic06bdefe388f4eb592ee713bc67af905aeeb3626
2011-06-15 10:49:34 +02:00
mpeters
e2f6233300 Fix av workerthreads
Change-Id: I9915fe222ca36e11c58e846b9adcca4a3d103e8c
2011-06-15 10:48:33 +02:00
joha-asc
5cf7e88be4 Cssfixar
Change-Id: I52a3660eb770a91f2e4de3d3690f4b484d777bea
2011-06-15 10:10:28 +02:00
joha-asc
a2d5bc091a wall
Change-Id: Iff9fc5b7412df28d4bab0115a7fe12d90ea299e8
2011-06-14 16:14:29 +02:00
joha-asc
07a07ca419 Message
Change-Id: Ib9d2ef66e05ff8f1fa8cb614c5cd33230ff2452f
2011-06-14 16:13:58 +02:00
joha-asc
28b447efdf metodnamnsändring
Change-Id: I68ab7b8eb7685f878a2b2698420af4242aabb3ba
2011-06-14 16:13:29 +02:00
joha-asc
961402de48 Message
Change-Id: I004da480824ebeb6d1e453390bcd5443a3318b04
2011-06-14 16:13:13 +02:00
joha-asc
e6040c526e usernamedao
Change-Id: I3b960dcff9734d225b512531f194191b6cf55b7d
2011-06-14 15:45:03 +02:00
joha-asc
b0e809298c package name change
Change-Id: Ifc71ba28fd87261cb5233c513569a2ef9ac07955
2011-06-14 14:59:52 +02:00
joha-asc
7865ec7e73 wall
Change-Id: Ie0ecbefae7c104f865b353d7f3fb149b7b5f0b1e
2011-06-14 14:59:36 +02:00