FredrikNorberg
|
b6cb04dfc6
|
Merge branch 'projectExportCopy' into develop
20120501
|
2012-04-30 15:34:40 +02:00 |
|
FredrikNorberg
|
1aa582e71f
|
Added unittests for exports
|
2012-04-30 15:34:21 +02:00 |
|
FredrikNorberg
|
9aa25a22b8
|
started with adding students
|
2012-04-30 15:34:21 +02:00 |
|
FredrikNorberg
|
d01d2838c5
|
Exporting projects now work with using the new implementation
|
2012-04-30 15:34:20 +02:00 |
|
FredrikNorberg
|
9f70fed934
|
No longer using a deprecated method to get the url for export
|
2012-04-30 15:34:20 +02:00 |
|
FredrikNorberg
|
10cb0485ce
|
added externalExport to applicationContext
|
2012-04-30 15:34:20 +02:00 |
|
FredrikNorberg
|
699e0f22ef
|
started to activate export when creating projects
|
2012-04-30 15:34:20 +02:00 |
|
FredrikNorberg
|
3216a156e5
|
a small change from the merge that did not make it in the previous commit
|
2012-04-30 15:34:20 +02:00 |
|
FredrikNorberg
|
fb93c294ae
|
changed the export to incorporate the new changes
|
2012-04-30 15:34:20 +02:00 |
|
FredrikNorberg
|
38a6436d81
|
projects are now deleted in daisy if there is a problem adding students or supervisor during the creation. Also started on update functionality.
|
2012-04-30 15:34:20 +02:00 |
|
FredrikNorberg
|
b840e90f03
|
It now works to export projects, students and supervisor to daisy, so we can create projects in scipro and export them to daisy
|
2012-04-30 15:34:20 +02:00 |
|
FredrikNorberg
|
003fd090ef
|
you can now create projects via the test api, adding students is almost finished
|
2012-04-30 15:34:20 +02:00 |
|
FredrikNorberg
|
5cc89ec732
|
some inital work on project exports to daisy, nothing funtional yet
|
2012-04-30 15:34:20 +02:00 |
|
FredrikNorberg
|
ebdc4aa75d
|
a first nonworking version of export to daisy
|
2012-04-30 15:34:20 +02:00 |
|
FredrikNorberg
|
3d74cf5663
|
initial commit, created the daisyexporter class
|
2012-04-30 15:34:20 +02:00 |
|
Emil Siverhall
|
59e1aed6c3
|
Merge branch 'importUsernamesByDefault' into develop
|
2012-04-30 13:48:56 +02:00 |
|
Emil Siverhall
|
b7631b1cb3
|
changes to import implementation to make sure all usernames is added by default when importing users (not only when linked projects is available)
|
2012-04-30 13:48:18 +02:00 |
|
Emil Siverhall
|
ebf9bbff5b
|
Merge branch 'supervisorSettingsFix' into develop
|
2012-04-30 09:18:27 +02:00 |
|
Emil Siverhall
|
9251210984
|
added ajax paging navigator and items per page choice to supervisor projects overview panel, to prevent details dialog from closing when switching pages
|
2012-04-30 09:18:04 +02:00 |
|
Emil Siverhall
|
5561c287fa
|
Merge branch 'importerImprovements' into develop
|
2012-04-30 08:53:12 +02:00 |
|
Emil Siverhall
|
ed2dac1f40
|
removed opponents and active participants when checking for removed project members
|
2012-04-30 08:52:18 +02:00 |
|
fred-fri
|
fc6d78cf83
|
Merge branch 'saveactivityplan' into develop
|
2012-04-30 15:17:17 +09:00 |
|
fred-fri
|
9ed9092190
|
messageboard bug when creating new project fixed
|
2012-04-30 15:16:49 +09:00 |
|
fred-fri
|
a163614ffb
|
seems to work now
|
2012-04-30 14:25:25 +09:00 |
|
fred-fri
|
4555b6257e
|
some cleanup
|
2012-04-30 14:08:51 +09:00 |
|
fred-fri
|
b1a279cd00
|
trying to make the offset work
|
2012-04-30 13:21:22 +09:00 |
|
fred-fri
|
3956547d0e
|
changed blabla to xserviceimpl instantiating...
|
2012-04-30 11:49:42 +09:00 |
|
fred-fri
|
dd553b084f
|
changed name from perform peer review to browse peer requests for supervisor
|
2012-04-30 11:42:00 +09:00 |
|
fred-fri
|
dadbcca9e2
|
Merge branch 'newmessagefix' into develop
|
2012-04-30 11:38:52 +09:00 |
|
fred-fri
|
7c06b3a56a
|
works. some cleanup
|
2012-04-30 11:36:55 +09:00 |
|
fred-fri
|
6e8f4949c6
|
using new service instead of dao
|
2012-04-30 11:36:25 +09:00 |
|
fred-fri
|
0a3f0f47e4
|
new db update file
20120430
|
2012-04-30 10:58:49 +09:00 |
|
fred-fri
|
5359094ed4
|
just stashing changes in order to checkout another branch
|
2012-04-30 10:25:29 +09:00 |
|
fred-fri
|
fa3f57f2e8
|
using new service instead of dao
|
2012-04-27 17:58:01 +09:00 |
|
fred-fri
|
acc41f0dff
|
added messageboard repo and service layer
|
2012-04-27 16:59:18 +09:00 |
|
fred-fri
|
020aa39bd7
|
messageboard name now changes upon project name change
|
2012-04-27 16:54:32 +09:00 |
|
fred-fri
|
6dca60b4e1
|
moved do not touch in project idea panel
|
2012-04-26 13:29:03 +09:00 |
|
fred-fri
|
0953c58551
|
moved supervisor do not touch
|
2012-04-26 13:16:44 +09:00 |
|
fred-fri
|
da1bd429ed
|
Merge branch 'basenotify' into develop
|
2012-04-25 18:01:34 +09:00 |
|
fred-fri
|
1c5cf582a2
|
added current sql stuff
|
2012-04-25 18:01:25 +09:00 |
|
fred-fri
|
d0cc8a2314
|
Merge branch 'basenotify' into develop
|
2012-04-25 17:57:10 +09:00 |
|
fred-fri
|
c83d226b48
|
all hookups complete
|
2012-04-25 17:44:45 +09:00 |
|
fred-fri
|
30708aad4e
|
first hookup seems to work fine
|
2012-04-25 17:35:14 +09:00 |
|
fred-fri
|
1da6324fcb
|
notification controller seems to work fine with hooking up to user defined settings
|
2012-04-25 16:48:00 +09:00 |
|
fred-fri
|
fa5c460ebf
|
using models, some bugs fixed
|
2012-04-25 15:21:11 +09:00 |
|
fred-fri
|
18cbc39018
|
using models
|
2012-04-25 15:14:07 +09:00 |
|
|
|
3de1d701da
|
Merge branch 'matchSameLevelSlotsFirst' into develop
|
2012-04-24 15:21:06 +02:00 |
|
Emil Siverhall
|
63329efe8a
|
Merge branch 'peerSpringDataTests' into develop
|
2012-04-24 15:16:07 +02:00 |
|
|
|
effd7739a1
|
Changed compareTo method of match Pair object to order by same degree level FIRST and scoring SECOND. This way master ideas gets matched with master supervisor slots and bachelor ideas with bachelor supervisor slots BEFORE bachelor ideas get matched with master supervisor slots.
|
2012-04-24 15:15:53 +02:00 |
|
Emil Siverhall
|
1c2eb62fd2
|
added unit tests for new peer review/request services
|
2012-04-24 15:15:39 +02:00 |
|
