fred-fri
|
fef0cd7176
|
reload not necessary
20131024b
|
2013-10-24 16:21:50 +09:00 |
|
fred-fri
|
2644adbde7
|
annotation fixes
|
2013-10-24 16:21:00 +09:00 |
|
fred-fri
|
1bb223de7c
|
fixed more radios
20131024
|
2013-10-24 12:56:27 +09:00 |
|
fred-fri
|
c0245f2d32
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-24 12:31:08 +09:00 |
|
fred-fri
|
f5324ac839
|
fixed lazy
|
2013-10-24 12:30:07 +09:00 |
|
Richard
|
bb34355b1d
|
Fixed problem with users not being able to click on radio-buttons in firefox.
|
2013-10-23 15:13:09 +02:00 |
|
fred-fri
|
48e0b1e84d
|
moved transaction down one level
20131023
|
2013-10-23 15:41:15 +09:00 |
|
fred-fri
|
3ac12c6b6a
|
fixed tostring
|
2013-10-23 11:59:26 +09:00 |
|
fred-fri
|
ce32f0069f
|
added delete link
|
2013-10-22 18:46:18 +09:00 |
|
fred-fri
|
48545e0a39
|
added delete link
|
2013-10-22 18:44:23 +09:00 |
|
fred-fri
|
70f0b2ae16
|
fixes
|
2013-10-22 15:46:45 +09:00 |
|
fred-fri
|
9435a9a322
|
fixes
|
2013-10-22 15:36:03 +09:00 |
|
fred-fri
|
3d8cbcec03
|
fixes
|
2013-10-22 15:01:11 +09:00 |
|
fred-fri
|
4667b14327
|
making integration test for delete method
|
2013-10-21 16:14:13 +09:00 |
|
fred-fri
|
bd33295054
|
making integrationtest for delete method
|
2013-10-21 14:32:40 +09:00 |
|
fred-fri
|
d5f5be7633
|
attempt fix
|
2013-10-18 18:21:00 +09:00 |
|
fred-fri
|
5d3d98f6e1
|
loginpage fix
|
2013-10-18 17:38:47 +09:00 |
|
fred-fri
|
e4f7cd03bf
|
fix
|
2013-10-18 17:08:07 +09:00 |
|
fred-fri
|
cba1a48578
|
refactoring out another column
|
2013-10-18 16:15:03 +09:00 |
|
fred-fri
|
6f49c4140f
|
removed clickabletitlecolumn and replaced with new component
|
2013-10-18 13:23:59 +09:00 |
|
fred-fri
|
aaeb62a1cd
|
minor fix, added to page
|
2013-10-18 12:56:02 +09:00 |
|
fred-fri
|
9b23bdc365
|
added new ajaxlinkpanel
|
2013-10-18 12:44:20 +09:00 |
|
|
a1ac928924
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-17 12:29:03 +02:00 |
|
|
613283b593
|
Rewrote RegistrationPanel to not suck.
|
2013-10-17 12:28:59 +02:00 |
|
Richard
|
6b803ce792
|
Fixat fel sökväg till dialogernas bakgrundsbild.
|
2013-10-17 11:03:16 +02:00 |
|
|
30f752f814
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-17 10:30:09 +02:00 |
|
|
97f0fab174
|
Added logging to try and find out why we get JDBC exception when trying to save a student idea.
|
2013-10-17 10:30:03 +02:00 |
|
Leo
|
cfce824f71
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-17 10:18:57 +02:00 |
|
Leo
|
99192cc313
|
ModalWindoPlus now resets it's title when closed
|
2013-10-17 10:18:43 +02:00 |
|
Richard
|
98cb2741fa
|
Fortsatt styling av wicket modal. Kryssen för att stänga rutan skrivs nu över av en egengjord transparent bild vilket möjliggör ändring av bakgrundsfärg på titeln.
Fixat vita länkar i footern som inte syntes tidigare. Nu tillbaka till DSV-blå.
|
2013-10-17 09:51:28 +02:00 |
|
fred-fri
|
60baa0a8ba
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-17 15:53:39 +09:00 |
|
fred-fri
|
d7113a3b2d
|
added null check
|
2013-10-17 15:50:17 +09:00 |
|
Per Lundholm
|
e205087a87
|
Fixed test problem due to DetachableServiceModel been introduced. And warnings about not using equals.
|
2013-10-17 08:26:50 +02:00 |
|
fred-fri
|
1ba715da29
|
fixed some peer issues relating to multiple reviews on a request
|
2013-10-17 12:29:29 +09:00 |
|
fred-fri
|
7a00d7f7f3
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-17 11:11:39 +09:00 |
|
fred-fri
|
a39fcd9936
|
minor test fix
|
2013-10-17 11:10:50 +09:00 |
|
fred-fri
|
4d9c0465e4
|
added comment
|
2013-10-17 10:46:04 +09:00 |
|
Leo
|
88329c541c
|
merge
|
2013-10-16 16:16:36 +02:00 |
|
Leo
|
82c2ab470b
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/datatables/GenericDataPanel.java
|
2013-10-16 16:12:12 +02:00 |
|
Leo
|
c8fb117222
|
re-added the functionality to download excel files
|
2013-10-16 16:09:55 +02:00 |
|
|
1ce1f7eb81
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-16 16:00:32 +02:00 |
|
|
ecea5d6c5a
|
Made GenericDataPanel use detachable model instead of stale serializable models for its objects to prevent optimistic locking.
General clean up of GenericDataPanel.
|
2013-10-16 16:00:27 +02:00 |
|
Leo
|
2916aeaab9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-16 15:44:44 +02:00 |
|
Leo
|
397afb1d8a
|
fixed lazy initialization exception
|
2013-10-16 15:44:29 +02:00 |
|
|
f454615ca8
|
Removed ProjectEvent collection from Project because it is not used and causes intermittent problems.
|
2013-10-16 15:28:42 +02:00 |
|
fred-fri
|
92922e4bea
|
fixed wording of notification and removed double notifications for partner added to idea when creating student ideas
|
2013-10-16 22:16:01 +09:00 |
|
|
43d5c15135
|
Changed log level to reduce noise.
|
2013-10-16 14:56:10 +02:00 |
|
|
d6182cabf2
|
Fixed faulty test. Failed if any earlier test had built a project using the builder thing.
|
2013-10-16 14:54:42 +02:00 |
|
|
9afee9a1ce
|
Merge remote-tracking branch 'origin/wicketupdate' into wicketupdate
|
2013-10-16 14:48:05 +02:00 |
|
|
99b6d56583
|
Yay for duplicated code ;)
|
2013-10-16 14:48:01 +02:00 |
|