fred-fri
|
539c2e51f0
|
fixed url issue
|
2013-10-29 20:13:42 +09:00 |
|
fred-fri
|
d69c5e4fe4
|
fixed setreviewer method
|
2013-10-29 19:58:04 +09:00 |
|
fred-fri
|
275ed19a72
|
test fix
|
2013-10-29 12:17:13 +09:00 |
|
|
|
f014675786
|
Thesis are now fetched with XML instead of JSON despite the performance problems due to issues with date parsing :(
|
2013-10-28 21:13:32 +01:00 |
|
|
|
4ba2bb81e4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-28 16:53:14 +01:00 |
|
|
|
b404064ff4
|
Yes it is. No need to bring QueryDSL with us when we build the application since it has already done its work.
|
2013-10-28 16:48:32 +01:00 |
|
Leo
|
54873d8287
|
supervisor created notifications no longer send two notifications when accepted by student
|
2013-10-28 16:48:25 +01:00 |
|
|
|
ec6ba2fc47
|
Extracted methods of work from external importer to a separate bean to get proper transactions.
|
2013-10-28 16:25:37 +01:00 |
|
|
|
475020411b
|
Removed logging.
|
2013-10-28 16:21:04 +01:00 |
|
|
|
81b0976af8
|
Made the Daisy integration use JSON and never XML since XML parsing is too heavy weight and memory consuming.
|
2013-10-28 16:20:30 +01:00 |
|
Leo
|
e4673e17ce
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-28 15:55:13 +01:00 |
|
Leo
|
7e6c6c2fd7
|
Fixed a bug where you could not remove authors from ideas
|
2013-10-28 15:55:03 +01:00 |
|
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 |
|
|
|
f5f8b14865
|
Fixed duplicate entry problem in role_Program when importing a user who is both a supervisor and has admissions.
|
2013-10-28 13:55:02 +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 |
|
|
|
399a0e706f
|
Added some logging to the importer to try and figure out why it fails.
|
2013-10-28 11:03:20 +01:00 |
|
|
|
4f81fcd0f6
|
Added some logging to the importer to try and figure out why it fails.
|
2013-10-28 10:45:41 +01:00 |
|
fred-fri
|
75ffdaff7f
|
changed rules for export ideas
|
2013-10-28 12:59:27 +09:00 |
|
fred-fri
|
22fe90e57d
|
annotations
|
2013-10-25 11:19:21 +09:00 |
|
fred-fri
|
fef0cd7176
|
reload not necessary
|
2013-10-24 16:21:50 +09:00 |
|
fred-fri
|
2644adbde7
|
annotation fixes
|
2013-10-24 16:21:00 +09:00 |
|
fred-fri
|
f5324ac839
|
fixed lazy
|
2013-10-24 12:30:07 +09:00 |
|
fred-fri
|
48e0b1e84d
|
moved transaction down one level
|
2013-10-23 15:41:15 +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 |
|
|
|
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 |
|
|
|
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 |
|
fred-fri
|
d7113a3b2d
|
added null check
|
2013-10-17 15:50:17 +09: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 |
|
|
|
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 |
|
Per Lundholm
|
7d342282c9
|
Removed System.out.println except for instansiating
|
2013-10-16 14:38:46 +02:00 |
|
fred-fri
|
89d2a18848
|
merge
|
2013-10-16 16:42:58 +09:00 |
|
fred-fri
|
8b9cbe45ee
|
fixed final seminar delete issue
|
2013-10-16 16:40:05 +09:00 |
|
Emil Siverhall
|
11f686aa70
|
render tests + builder method to add specific user as author to project
|
2013-10-16 08:42:55 +02:00 |
|
|
|
ef6e2705b4
|
Updated authorization strategy to include check for actual roles.
Hide review panel if user does not have employee as actual role.
|
2013-10-15 17:40:05 +02:00 |
|
Emil Siverhall
|
4494afba37
|
added new keyword autocomplete and refactored role autocomplete providers
|
2013-10-15 13:46:04 +02:00 |
|
Emil Siverhall
|
93f36492c6
|
resolved merge conflicts
|
2013-10-15 11:42:42 +02:00 |
|
Emil Siverhall
|
714aa7a371
|
switched out the autocomplete component to use select2choice instead of our old broken component
|
2013-10-15 11:28:09 +02:00 |
|
fred-fri
|
865a566670
|
commented back on
|
2013-10-15 13:45:05 +09:00 |
|
fred-fri
|
25ba45d3b4
|
sql
|
2013-10-15 10:12:23 +09:00 |
|
