Fredrik Norberg
27ce32bae2
Change-Id: Ibeec2187a1cef7f9d5c5d4dfc39838a92eb70323
2011-06-21 10:19:54 +02:00
Fredrik Norberg
570668ea71
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-06-20 17:35:11 +02:00
Fredrik Norberg
49351096e1
Merge branch 'projectpartner' into HEAD
2011-06-20 17:32:03 +02:00
Fredrik Norberg
730a7eaef9
klar med dataview i admindelen med
...
Change-Id: I8a15ac590102cf3b68e079571522d4e2f6a87cfe
2011-06-20 17:31:30 +02:00
Marcus Höjvall
255484fd27
Added info printing and a duplicate check when creating a new project class
2011-06-20 17:21:36 +02:00
Fredrik Norberg
4bd4465d5e
klar med dataview
...
Change-Id: Icf115aa0810491f1090c2b9d30a096e205487cea
2011-06-20 17:07:27 +02:00
mpeters
f1d126927a
Implementation av interfaces
...
Change-Id: I1b9d41230bca05fda967667f391c144bf81d0848
2011-06-20 15:14:22 +02:00
mpeters
7857ebdd79
Fix av interfaces till autowire'ade controllers
...
Change-Id: Ia15387b05d69d35e3e8a74e1c045a59dd9554a1d
2011-06-20 15:13:42 +02:00
Fredrik Norberg
3bfd5f79d8
börjat med dataview
...
Change-Id: I57b2fbcd00dd21e3b449fe4b80e93cc3bd7d5ecb
2011-06-20 14:51:47 +02:00
mpeters
da7d655adc
Bortplock av peer-test-page och fix av peer-rating
...
Change-Id: Ia73bae68707bdfe4235fe57071926da5d738187e
2011-06-20 14:43:10 +02:00
Marcus Höjvall
d06c02f438
Added a undelete function in admin projectclass settings
2011-06-20 13:32:39 +02:00
Fredrik Norberg
7c3fa6b4f2
tagit bort lite oanvända imports
...
Change-Id: Icd9d0e9e3cc3d695aa67d7b2576c485a1e780e7b
2011-06-20 11:16:48 +02:00
Marcus Höjvall
dd8cf8e262
Added panels in for editing and deleting panels
2011-06-20 11:06:02 +02:00
joha-asc
c06b1b6248
Buggfix
...
Change-Id: Id902c7cddb06fc166b94d603786299d06de01358
2011-06-20 10:45:12 +02:00
joha-asc
80bd290c18
Test för categories och tags
...
Change-Id: I0242fb74cacfe9891d5c9c7453de57d2ac5964c9
2011-06-17 16:44:02 +02:00
joha-asc
9d7bd07aff
testfix
...
Change-Id: I2fd4a4976043033d36b661be0e91033a0f9090cd
2011-06-17 16:31:01 +02:00
joha-asc
8f3cafea68
Merge branch 'develop' of ssh://joha-asc@git.dsv.su.se/git/scipro/scipro into HEAD
2011-06-17 16:18:28 +02:00
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
