AuthorCommitMessageCommit dateIssues
Marco GrawunderMarco Grawunder
17218884e28MMerge branch 'development'
Marco GrawunderMarco Grawunder
86e432eb5bcbatch updates
Marco GrawunderMarco Grawunder
33876bd25f1MPull request #4: DevelopmentMerge in OI/video from development to master * commit '85a0d8e2cf500a61d983e707ce48f38fafcde9b3': Dependency cleanup
Marco GrawunderMarco Grawunder
85a0d8e2cf5MMerge branch 'development' of https://git.swl.informatik.uni-oldenburg.de/scm/oi/video into development
Marco GrawunderMarco Grawunder
8541834456eDependency cleanup
Marco GrawunderMarco Grawunder
501c6209062MMerge branch 'development'
Marco GrawunderMarco Grawunder
645d6cdd507Update of extension for tycho
Marco GrawunderMarco Grawunder
e11e9011f50MPull request #3: Cleaned up old slf4j dependenciesMerge in OI/video from development to master * commit '0a56f26a8eff515b2a66553faa8de0f07b5801d5': Cleaned up old slf4j dependencies
Marco GrawunderMarco Grawunder
0a56f26a8efCleaned up old slf4j dependencies
Marco GrawunderMarco Grawunder
1f10de8a460MPull request #2: DevelopmentMerge in OI/video from development to master * commit '41e9a8b32895078606592e482daf2e8755b0bd18': Update of submodule ODY-2004: Removed Dependency, needs further handling to activate logging aginODY-2004
Marco GrawunderMarco Grawunder
41e9a8b3289Update of submodule
Marco GrawunderMarco Grawunder
561e18caad6ODY-2004: Removed Dependency, needs further handling to activate logging aginODY-2004
Marco GrawunderMarco Grawunder
acad9c21c36MMerge branch 'development'
Marco GrawunderMarco Grawunder
e84604df109added solobuild profile
Tobias BrandtTobias Brandt
f3fc0390432MMerge pull request #1 in OI/video from development to master* commit '4c244a93d47a9ae40eff0b85a04e075803aa4f07': maven preparation odysseus_dev update
Tobias BrandtTobias Brandt
4c244a93d47MMerge branch 'development' of https://git.swl.informatik.uni-oldenburg.de/scm/oi/video
Tobias BrandtTobias Brandt
ac768d27fb1maven preparation
Marco GrawunderMarco Grawunder
ef9e33c339eodysseus_dev update
Marco GrawunderMarco Grawunder
f29193a5d8dodysseus_dev update
Marco GrawunderMarco Grawunder
9c55a69efc8Update of odysseus_dev
Marco GrawunderMarco Grawunder
cbfb533934eMaven buildable
Marco GrawunderMarco Grawunder
2af3a5b9f44maven preparations
Marco GrawunderMarco Grawunder
4e8e552f063maven preparations
Tobias BrandtTobias Brandt
318235ee167Added submodules
Tobias BrandtTobias Brandt
1913ff43835Initial commit
Tobias BrandtTobias Brandt
e7d3b1233ccCommit removals
Marco GrawunderMarco Grawunder
105a28606f2MMerge branch 'development' of https://git.swl.informatik.uni-oldenburg.de/scm/ody/odysseus into development
Marco GrawunderMarco Grawunder
bb621c2cae5MMerge pull request #23 in ODY/odysseus from RemoveOutdatedProjects to development* commit '3d2fa6bc9c7a4d0bff86ff1fbdbb186c8995e011': Removed outdated projects
Marco GrawunderMarco Grawunder
0e4db93644aMMerge pull request #15 in ODY/odysseus from modules to development* commit 'a80919cfea85e983dd49eb45f47506967cf6fa83': Renamed folder for cache plugin ... Moved server projects to same level Moved bundles to module folders
Marco GrawunderMarco Grawunder
55d6fe1b6ceMoved bundles to module folders
Marco GrawunderMarco Grawunder
62a76f54ba4MMerge pull request #3 in ODY/odysseus from feature/ODY-1631-totimestampfromstring to development* commit 'b8853c65eab722300f8d0c3f25f2a26dec3c61a7': ODY-1631: implemented functionODY-1631
Marco GrawunderMarco Grawunder
84a9bf710a6removed version .qualifier --> manual update of version number required now
Marco GrawunderMarco Grawunder
9789093ea2fMMerge pull request #421 in ODY/odysseus from bugfix/ODY-1620-xmlprocotolhandler-don-t-work-with-push to development* commit '83ba1bfdc434d40defbd7ce8943965e672cbfaef [formerly d54d760c11c516237b5cf9d85541bb4e210b974a]': ODY-1620: Always initialize result-list Former-commit-id: 813c98ca8c059813ac293ae0d087ab883056b107ODY-1620
Marco GrawunderMarco Grawunder
a4d971b9c06MMerge pull request #420 in ODY/odysseus from feature/digital-signal-processing to development* commit '4db06627db379dc6ae71ea3a47c66b27fd5df448 [formerly f08928cae80156a655ecc35c1e2b148a70beb0a6]': (33 commits) Rename InterpolationMethod interface to IInterpolationMethod Respect Base Time Improved Interpolation Documentation of abstract operators Output Schema of placeholder abstract operators FFT and Cross Correlation substitution rules Fir Filter Substitution First Ve...
Marco GrawunderMarco Grawunder
6ee8da829a2MMerge pull request #415 in ODY/odysseus from ODY-1627-anomaly-detection-output to development* commit 'b684bef96884542bc7c20b30c8be495f42e50007 [formerly f25bd300cc76a46d0d875d6ce4f484a5b23d2de2]': ODY-1627 Same changes for output on port 1 on master Former-commit-id: fc29aa6c65d6e97eeb51db9234c5f13bb03d6c2dODY-1627
Marco GrawunderMarco Grawunder
358fa4a789cMMerge pull request #411 in ODY/odysseus from ODY-1626-java-10-compability to development* commit '237add5dee5f9eb9d4436c0f5b5fa02617e5a899 [formerly 579be6983c8fc368d5b99fd5061db658331ead62]': ODY-1626: Added external libs for removed jdk support Former-commit-id: f9a0b06f202e124bf80db3229fb6aacc346942fcODY-1626
Marco GrawunderMarco Grawunder
9586a9567ddODY-1626: Added external libs for removed jdk supportFormer-commit-id: 579be6983c8fc368d5b99fd5061db658331ead62ODY-1626
Marco GrawunderMarco Grawunder
b1148a9bccbMMerge pull request #407 in ODY/odysseus from bugfix/104-bugfixes to development* commit '38b115cb11e1d2ac47b364d6f66b40e6a1a4753a [formerly 53c38a2748ce62b06601a5cf6acb6de5e1ca6a91]': (44 commits) Removed resources Fixed manifest file after merge OJ104: Added dependency to slf4j again. Reviewer removed it, but it is needed. FIX: Wrong plugin reference in feature Renamed folders (same name as projects now) Some fixes for the reader. Renamed graph lib bundles ...2 Jira issues
Marco GrawunderMarco Grawunder
9154e9bba8fMMerge remote-tracking branch 'origin/development' into bugfix/104-bugfixesConflicts: common/resources/de.uniol.inf.ei.oj104/META-INF/MANIFEST.MF Former-commit-id: bc67c9019f0e7a381ed0283763ab99397bb649df
Tobias BrandtTobias Brandt
1dfa44e17ccMMerge pull request #408 in ODY/odysseus from ODY-1612-create-feature-projects-for-resouces-bundles to development* commit 'ed208d4393ed8496de729571f4b6c721ec8cb59f [formerly 2ca0906c9126f51f7d001d59f451c78b42fb44a7]': Merge remote-tracking branch 'origin/development' into ODY-1612-create-feature-projects-for-resouces-bundles Removed resources from main repo (again) Lang3 dependency Updated reference to netzdatenstrom Updated feature refererence Updated plugin references tmp folder for remove...ODY-1612
Marco GrawunderMarco Grawunder
e58d166b23bMMerge remote-tracking branch 'origin/development' into ODY-1612-create-feature-projects-for-resouces-bundlesConflicts: common/resources/com.google.code.gson/.classpath common/resources/com.google.code.gson/META-INF/MANIFEST.MF common/resources/com.google.code.gson/build.properties server/spatiotemporal/de.uniol.inf.odysseus.spatiotemporal/META-INF/MANIFEST.MF Former-commit-id: 49a7c81f4eded682784dd0cb445f062fe6c6fe08ODY-1612
Marco GrawunderMarco Grawunder
5c841191c35MMerge remote-tracking branch 'origin/development' into ODY-1612-create-feature-projects-for-resouces-bundlesConflicts: server/graph/de.uniol.inf.is.odysseus.graph.server.feature/feature.xml Former-commit-id: cd0052d9740d9d54d9776eee94c51aa81ad63ad1ODY-1612
Michael BrandMichael Brand
c84536ead94MMerge branch 'development' into bugfix/104-bugfixes# Conflicts: # common/resources/de.uniol.inf.ei.oj104/META-INF/MANIFEST.MF Former-commit-id: c1fb50078fdfbb600b6b80e62c57505fefcafc57
Marco GrawunderMarco Grawunder
f447528f1f4MMerge pull request #406 in ODY/odysseus from test to ODY-1612-create-feature-projects-for-resouces-bundles* commit '0f03437aadc933ac89ab08af4d187c036fb0baad [formerly 9fcce41fe3e27a067d7f2143df220df455c4005d]': Lang3 dependency Updated reference to netzdatenstrom Updated feature refererence Updated plugin references tmp folder for removed src folders Updated target platform (new dropin location) GS-Stuff name update Former-commit-id: 13e82df37f3ff37e23fc19a8ce0d537b5efa107bODY-1612
Marco GrawunderMarco Grawunder
ffcf598d078tmp folder for removed src foldersFormer-commit-id: 696690390bd60696452320320ae38993f056b86b
Marco GrawunderMarco Grawunder
4d9fd5ea429MMerge pull request #405 in ODY/odysseus from ODY-1612-create-feature-projects-for-resouces-bundles to test* commit '5119ab0b34e3699de93799f6da19f60c3f89f5ca [formerly 8159b8de5b95fba80736a26cdc3696c8412286c1]': (77 commits) ODY-1612: Removed old restlet version ODY-1612: Removed merge conflicts ODY-1612: Working with new resources from update site ODY-1612: New target platform ODY-1612: Readmes for project changes ODY-1612: Removed Resources ODY-1612: Update to new target platform O...2 Jira issues
Marco GrawunderMarco Grawunder
1f33a47e14bMMerge branch 'development' of https://mgrawunder@git.swl.informatik.uni-oldenburg.de/scm/ody/odysseus.git into ODY-1612-create-feature-projects-for-resouces-bundlesConflicts: common/resources/com.mongodb.driver.feature/feature.xml common/resources/jama.feature/feature.xml common/resources/javax.validation.feature/feature.xml common/resources/org.apache.commons.net.feature/feature.xml Former-commit-id: 8421c4f73c83cfddf54fb6c5253021096983da01ODY-1612
Marco GrawunderMarco Grawunder
ef13730ea05ODY-1612: Readmes for project changesFormer-commit-id: 2b13c547b5927a54955860ea789c2420dab7c361ODY-1612
Marco GrawunderMarco Grawunder
79bad9c620bODY-1612: Disabled non OSGi projectsFormer-commit-id: 3e16263aa402b08fca31e5254f7effe1de0c52baODY-1612
Marco GrawunderMarco Grawunder
8038cb5a2d6MMerge pull request #389 in ODY/odysseus from development to master* commit 'b045ea0de337e579b1df3f1fd9fbc550848095bc [formerly 5c93028eb77f7b5978b8f548ea7d8b8b12c18f88]': ODY-1615: FIX for cases with no transport handler new MEP function that puts together an ASDU object out of its to parts, an DataUnitIdentifier and a list of IInformationObjects. new MEP function that puts together an ASDU object out of its to parts, an DataUnitIdentifier and a list of...ODY-1615