fred-fri
|
dbe25fbdf6
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-28 22:04:37 +09:00 |
|
fred-fri
|
d615c30211
|
added onlyactive filter
|
2013-10-28 22:00:02 +09:00 |
|
Leo
|
e40bf22b89
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-28 13:52:27 +01:00 |
|
Leo
|
4b8565ec55
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/NewIdeaServiceImpl.java
|
2013-10-28 13:51:43 +01:00 |
|
Leo
|
e625415b41
|
Fixed a bug where you could not add exemptions
|
2013-10-28 13:47:32 +01:00 |
|
fred-fri
|
c1829983b5
|
changed from start to final seminar page
|
2013-10-28 21:41:27 +09:00 |
|
fred-fri
|
9a2ecc11f9
|
fixed admin supervisor create idea issue
|
2013-10-28 15:23:57 +09:00 |
|
fred-fri
|
7766df53ed
|
fixed my ideas filter
|
2013-10-28 15:08:15 +09:00 |
|
fred-fri
|
6c72ab0530
|
fixed info
|
2013-10-28 14:11:15 +09:00 |
|
fred-fri
|
3fdb7c0686
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-28 13:10:11 +09:00 |
|
fred-fri
|
75ffdaff7f
|
changed rules for export ideas
|
2013-10-28 12:59:27 +09:00 |
|
Emil Siverhall
|
24853c10bf
|
allow users to clear autocomplete fields
|
2013-10-25 14:06:29 +02:00 |
|
fred-fri
|
38a1b49a19
|
fix
|
2013-10-25 17:10:40 +09:00 |
|
fred-fri
|
478752fc58
|
logging
|
2013-10-25 16:56:25 +09:00 |
|
fred-fri
|
3496834192
|
fixed notificationsbug
|
2013-10-25 16:09:50 +09:00 |
|
fred-fri
|
1aceade5ac
|
removed line
|
2013-10-25 14:09:36 +09:00 |
|
fred-fri
|
a29d3f9cbe
|
attempt to fix redirect to local login page issue
|
2013-10-25 13:13:50 +09:00 |
|
fred-fri
|
7f6a4ce63c
|
added nullcheck
|
2013-10-24 16:58:34 +09:00 |
|
fred-fri
|
1bb223de7c
|
fixed more radios
|
2013-10-24 12:56:27 +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
|
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
|
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 |
|
Leo
|
25d554b742
|
Pleasing sonar
|
2013-10-17 11:17:00 +02:00 |
|
Richard
|
6b803ce792
|
Fixat fel sökväg till dialogernas bakgrundsbild.
|
2013-10-17 11:03:16 +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 |
|
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 |
|
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
|
397afb1d8a
|
fixed lazy initialization exception
|
2013-10-16 15:44:29 +02: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 |
|
|
|
8a836baa66
|
Removed invalid wiquery references.
|
2013-10-16 14:43:01 +02:00 |
|
