fred-fri
|
d44b7d8823
|
fix
20131029c
|
2013-10-29 21:20:57 +09:00 |
|
fred-fri
|
d642db530d
|
changed to equals
20131029b
|
2013-10-29 20:35:34 +09:00 |
|
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
|
f31d9ce530
|
fixed some notification urls
|
2013-10-29 15:36:10 +09:00 |
|
fred-fri
|
45effaa596
|
forum subject changed
|
2013-10-29 14:45:38 +09:00 |
|
fred-fri
|
275ed19a72
|
test fix
20131029
|
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 |
|
|
|
c9e45b0f38
|
Default settings for the project is now DEV.
Added back the TEST profile to re-enable logging on thesis3.
|
2013-10-28 17:08:11 +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 |
|
Leo
|
7aacef9536
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-28 16:34:57 +01:00 |
|
Leo
|
69465dd541
|
Ajax debugger no longer complains at ProjectNewIdeaSubmissionPage and SupervisorNewEditIdeaPanel
|
2013-10-28 16:34:50 +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 |
|
Richard
|
596f3b7457
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-28 16:24:17 +01:00 |
|
Richard
|
2332446e01
|
Changed text about the purpose of peer reviews.
|
2013-10-28 16:24:11 +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 |
|
Emil Siverhall
|
7519c4bcc3
|
made sure help icon dialogs doesn't lose their title when closed and reopened
|
2013-10-28 16:19:15 +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
|
fe54e8c91b
|
fixed order
|
2013-10-28 22:18:09 +09:00 |
|
fred-fri
|
f033aea537
|
added code
|
2013-10-28 22:13:32 +09: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
|
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 |
|
|
|
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
|
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
20131025b
|
2013-10-25 13:13:50 +09:00 |
|
fred-fri
|
22fe90e57d
|
annotations
20131025
|
2013-10-25 11:19:21 +09:00 |
|
fred-fri
|
7f6a4ce63c
|
added nullcheck
20131024c
|
2013-10-24 16:58:34 +09:00 |
|
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 |
|
