15175 Commits

Author SHA1 Message Date
ed3cfb7b86 Preeeeeeetty drastic speed up :) 2014-03-17 19:44:08 +01:00
7f679776de Victory \o/ 2014-03-17 18:14:18 +01:00
8b958a803f Exposed all daisy-integration related services. 2014-03-17 17:56:24 +01:00
79fef4dfb3 Fixed properties for DaisyAPI. 2014-03-17 17:47:06 +01:00
e447639d73 Fixed wrong argument. 2014-03-17 17:36:26 +01:00
3d00453c81 Added missing binding. 2014-03-17 17:35:09 +01:00
d0def477e1 Merge remote-tracking branch 'origin/develop' into develop 2014-03-17 17:28:52 +01:00
cad4b04423 Hooked up the EventBus. 2014-03-17 17:28:47 +01:00
Golrokh Moattar
e03e23bee3 Merge conflicts on RepositoryModule 2014-03-17 17:26:47 +01:00
Golrokh Moattar
2940e40c36 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/main/java/modules/RepositoryModule.java
2014-03-17 17:25:54 +01:00
Golrokh Moattar
a19f1b24d8 Merging the four tabs on the peer. 2014-03-17 17:20:23 +01:00
025da8b2f8 Removed unused repository. 2014-03-17 17:09:30 +01:00
d997cedebf Removed unused repository. 2014-03-17 17:09:11 +01:00
5338f09c38 Removed unused repository. 2014-03-17 17:08:54 +01:00
898748e9c0 Removed unused repository. 2014-03-17 17:08:28 +01:00
d2b8674c41 Removed unused repository. 2014-03-17 17:07:59 +01:00
780ca166f3 Removed unused repository. 2014-03-17 17:07:38 +01:00
f166e14b42 Removed unused repository. 2014-03-17 17:07:20 +01:00
e012d33994 Removed unused repository. 2014-03-17 17:06:58 +01:00
7f200db53d Fixed service implementation. 2014-03-17 17:05:55 +01:00
d47cc8af11 Removed unused repository. 2014-03-17 17:04:05 +01:00
50c04cbbf1 Removed unused repository. 2014-03-17 17:03:52 +01:00
30b900aaf1 Removed unused repository. 2014-03-17 17:03:35 +01:00
9e8fe4dd4e Removed unused repository. 2014-03-17 17:03:00 +01:00
a5c62c7de2 Removed unused repository. 2014-03-17 17:02:38 +01:00
0ae44c108c Removed unused methods. 2014-03-17 17:02:23 +01:00
ad3ef8494b Removed unused repository. 2014-03-17 17:01:08 +01:00
e5d3901268 Removed unused repository. 2014-03-17 17:00:53 +01:00
dd53cc4a9c Removed unused repository. 2014-03-17 17:00:27 +01:00
7c5f488b17 Removed unused repository. 2014-03-17 17:00:12 +01:00
5ff344a757 Removed unused repository. 2014-03-17 16:59:56 +01:00
ece5f12c79 Removed unused repository. 2014-03-17 16:57:21 +01:00
4aac7d527c Removed unused repository. 2014-03-17 16:57:09 +01:00
41c225e13a Removed unused repository. 2014-03-17 16:56:35 +01:00
90fb5f00ac Fixed service implementation. 2014-03-17 16:56:03 +01:00
0b42f223e3 Fixed service implementation. 2014-03-17 16:53:07 +01:00
532b4c1af4 Removed unused repository. 2014-03-17 16:52:53 +01:00
fed45a4832 Removed unused repository. 2014-03-17 16:47:06 +01:00
ecc1410798 Removed unused repository. 2014-03-17 16:46:52 +01:00
60fb46db5b Spring gone for good. No backsies. 2014-03-17 16:40:10 +01:00
dc17c72a48 Merge remote-tracking branch 'origin/develop' into develop 2014-03-17 16:14:06 +01:00
Emil Siverhall
34caff07d4 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/main/java/se/su/dsv/scipro/milestones/service/MilestonePhaseTemplateService.java
2014-03-17 15:08:08 +01:00
Emil Siverhall
17e834bb73 merge 2014-03-17 15:07:56 +01:00
Emil Siverhall
8a8ab34e8e no longer add institution to project title while importing 2014-03-17 15:07:26 +01:00
leosu
10d40af515 fixed naming issue 2014-03-17 15:06:30 +01:00
c16e982169 Hooked up DataInitializer. 2014-03-17 14:29:43 +01:00
314063c6aa Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/main/java/modules/CoreModule.java
	core/src/main/java/modules/RepositoryModule.java
2014-03-17 14:14:43 +01:00
d1a365b10f Added profile and milestone service impl. 2014-03-17 14:13:53 +01:00
790f01c076 Fixed service implementation. 2014-03-17 13:47:48 +01:00
leosu
69aed0bd76 Merge remote-tracking branch 'origin/develop' into develop 2014-03-17 13:41:28 +01:00