AuthorCommitMessageCommit dateIssues
Marco GrawunderMarco Grawunder
6658c4f1741MMerge branch 'master' of https://git.swl.informatik.uni-oldenburg.de/scm/oi/image
Marco GrawunderMarco Grawunder
041139298acMMerge branch 'development'
Marco GrawunderMarco Grawunder
4814670cc6fbatch updates
Marco GrawunderMarco Grawunder
232ae07da01MPull request #6: Dependency cleanupMerge in OI/image from development to master * commit '40f22afa1862f902c086df0dbac7fc6b724baf21': Dependency cleanup
Marco GrawunderMarco Grawunder
40f22afa186Dependency cleanup
Marco GrawunderMarco Grawunder
f0e295d10ecMMerge branch 'development'
Marco GrawunderMarco Grawunder
19514ead718Update of extension for tycho
Marco GrawunderMarco Grawunder
462f4003ca3Removed Exec Env
Marco GrawunderMarco Grawunder
ae85b0d8726MMerge branch 'development'
Marco GrawunderMarco Grawunder
797816c5578RemovedWarnings
Marco GrawunderMarco Grawunder
7b3eaa6bd66MPull request #5: DevelopmentMerge in OI/image from development to master * commit '2f3d746b9bbe9f6cefb8b82a41305734269baf1c': Submodule update Revert "Removed functions" Removed functions Added product features
Marco GrawunderMarco Grawunder
2f3d746b9bbSubmodule update
Marco GrawunderMarco Grawunder
619a5b9a653Revert "Removed functions"This reverts commit 3d237a29a2a3d0e091a9503316dd9af0a551cc98.
Marco GrawunderMarco Grawunder
3d237a29a2aRemoved functions
Marco GrawunderMarco Grawunder
88dd0592923Added product features
Marco GrawunderMarco Grawunder
eaa8d52c34fMPull request #4: Update of submoduleMerge in OI/image from development to master * commit '66f18749ee8b1e8ab186282fa02cc064d79d5ccc': Update of submodule
Marco GrawunderMarco Grawunder
66f18749ee8Update of submodule
Marco GrawunderMarco Grawunder
3e3b383663aMMerge pull request #3 in OI/image from development to master* commit '414021d5816178b072e09392499378f1468f37f1': slf4j handling
Marco GrawunderMarco Grawunder
414021d5816slf4j handling
Marco GrawunderMarco Grawunder
c03d76be274MMerge branch 'development'
Marco GrawunderMarco Grawunder
08180b2333cadded solobuild profile
Tobias BrandtTobias Brandt
d24432749dcMMerge pull request #2 in OI/image from development to master* commit 'f53748a54dbe9a7e79ff5f91cace7996f08ad319': maven preparation
Tobias BrandtTobias Brandt
f53748a54dbmaven preparation
Marco GrawunderMarco Grawunder
6d52d18e3a4MMerge pull request #1 in OI/image from development to master* commit 'ccb6c921b3bf9341c4267461f212d33c9eaf6490': update of category, versions odysseus_dev update
Marco GrawunderMarco Grawunder
ccb6c921b3bupdate of category, versions
Marco GrawunderMarco Grawunder
41e81c56709odysseus_dev update
Marco GrawunderMarco Grawunder
f9cac5ba1cfodysseus_dev update
Marco GrawunderMarco Grawunder
b472f36ab03maven preparations
Marco GrawunderMarco Grawunder
1f75e92c1a6maven preparations
Marco GrawunderMarco Grawunder
0883f494791Maven buildable
Marco GrawunderMarco Grawunder
01d62c324e1maven preparations
Marco GrawunderMarco Grawunder
8704692195emaven preparations
Tobias BrandtTobias Brandt
f5787ddfea8Added submodules
Tobias BrandtTobias Brandt
f59fdfb467dInitial commit
Tobias BrandtTobias Brandt
03bf074dcbbCommit removals
Marco GrawunderMarco Grawunder
d831c675f20MMerge branch 'development' of https://git.swl.informatik.uni-oldenburg.de/scm/ody/odysseus into development
Marco GrawunderMarco Grawunder
aeed8ccc3f9Moved rcp, keyvalue and trust to core
Marco GrawunderMarco Grawunder
d723145fd1fMMerge pull request #23 in ODY/odysseus from RemoveOutdatedProjects to development* commit '3d2fa6bc9c7a4d0bff86ff1fbdbb186c8995e011': Removed outdated projects
Marco GrawunderMarco Grawunder
26be403fefeMMerge 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
3f9a92c8162Moved bundles to module folders
Marco GrawunderMarco Grawunder
b5e43a0c34cMMerge pull request #3 in ODY/odysseus from feature/ODY-1631-totimestampfromstring to development* commit 'b8853c65eab722300f8d0c3f25f2a26dec3c61a7': ODY-1631: implemented functionODY-1631
Marco GrawunderMarco Grawunder
9acd5b9d9b7removed version .qualifier --> manual update of version number required now
Marco GrawunderMarco Grawunder
b4c935a3e97MMerge 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
e6d5b1affe0MMerge 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
72c1e36c3b2MMerge 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
fea36a71cc1MMerge 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
b494cc6dd71MMerge 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
f07dfac2314MMerge 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
c4fbf61420dMMerge 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
8081b24b464MMerge 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