BGBM BDI Projects / cdmlib.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fix merge problems
[cdmlib.git] / cdmlib-remote-webapp /
2016-08-01 Andreas Müller#5751 Partly redo r28780, tree | commitdiff
2016-08-01 Andreas Müller#5751 further redo r28776, add cdmlib-db to persistence... tree | commitdiff
2016-07-07 Patrick PlitznerMerge branch 'develop' into csvExport csvExport origin/csvExport root/branches/cdmlib/csvExport tree | commitdiff
2016-07-06 jenkinsUpdating develop poms back to pre merge state attic/branches/cdmlib/develop/28643 tree | commitdiff
2016-07-06 jenkinsupdating develop poms to master versions to avoid merge... tree | commitdiff
2016-07-06 jenkinsMerge branch 'release/4.2.0' root/tags/cdmlib/4.2.0 root/trunk/cdmlib 4.2.0 tree | commitdiff
2016-07-06 jenkinsupdating poms for branch'release/4.2.0' with non-snapsh... tree | commitdiff
2016-07-06 jenkinsupdating poms for 4.3.0-SNAPSHOT development tree | commitdiff
2016-06-02 jenkinsUpdating develop poms back to pre merge state tree | commitdiff
2016-06-02 jenkinsUpdating develop poms to hotfix version to avoid merge... tree | commitdiff
2016-06-02 jenkinsMerge branch 'hotfix/4.1.1' root/tags/cdmlib/4.1.1 4.1.1 tree | commitdiff
2016-06-02 jenkinsupdating poms for branch'hotfix/4.1.1' with non-snapsho... tree | commitdiff
2016-06-01 jenkinsupdating poms for 4.1.1 branch with snapshot versions tree | commitdiff
2016-05-31 jenkinsUpdating develop poms back to pre merge state tree | commitdiff
2016-05-31 jenkinsupdating develop poms to master versions to avoid merge... tree | commitdiff
2016-05-31 jenkinsMerge branch 'release/4.1.0' root/tags/cdmlib/4.1.0 4.1.0 tree | commitdiff
2016-05-31 jenkinsupdating poms for branch'release/4.1.0' with non-snapsh... tree | commitdiff
2016-05-31 jenkinsupdating poms for 4.2.0-SNAPSHOT development tree | commitdiff
2016-05-03 jenkinsUpdating develop poms back to pre merge state tree | commitdiff
2016-05-03 jenkinsupdating develop poms to master versions to avoid merge... tree | commitdiff
2016-05-03 jenkinsMerge branch 'release/4.0.0' root/tags/cdmlib/4.0.0 4.0.0 tree | commitdiff
2016-05-03 jenkinsupdating poms for branch'release/4.0.0' with non-snapsh... tree | commitdiff
2016-05-02 jenkinsupdating poms for 4.1.0-SNAPSHOT development tree | commitdiff
2016-04-28 Andreas MüllerUpdate test H2 after model update to 4.0 tree | commitdiff
2016-04-21 Andreas Kohlbeckerremoving unused old swagger-ui files tree | commitdiff
2016-04-21 Andreas Kohlbecker#5730 base url detection fixed tree | commitdiff
2016-04-07 Katja LutherMerge branch 'develop' of ssh://dev.e-taxonomy.eu/var... tree | commitdiff
2016-04-06 Katja Lutherfix possibility to connect with mgd server tree | commitdiff
2016-03-22 Andreas Kohlbecker#5657 futher fixes for the static swagger doc tree | commitdiff
2016-03-21 Andreas Kohlbecker#5657 incomplete static swagger documentation fixed tree | commitdiff
2016-03-14 Katja Lutherfix the taxeditor tests tree | commitdiff
2016-03-02 Andreas MüllerUpdate cdmlib version from 3.13.0-SNAPSHOT to 4.0.0... tree | commitdiff
2016-02-25 Andreas Kohlbeckernoone should ever have a bin folder in the project... tree | commitdiff
2016-02-25 Andreas Kohlbeckerjava spring configuration for remoting services tree | commitdiff
2016-02-24 Andreas Kohlbeckerremoving all (almost all) spy6 references and dependencies tree | commitdiff
2016-02-24 Andreas Kohlbeckernew ide launcher tree | commitdiff
2016-02-24 Andreas Kohlbeckerupdating data in swagger doc tree | commitdiff
2016-02-24 Katja Lutherremote webapp pom fixed for windows tree | commitdiff
2016-02-24 Andreas Kohlbeckersetting maven test scope for cdmlib-test again tree | commitdiff
2016-02-24 Andreas Kohlbeckereasier string profile selection tree | commitdiff
2016-02-23 Andreas Kohlbeckerremoving test dependencies from java doc tree | commitdiff
2016-02-23 Andreas Kohlbeckerfixing spring profiles setup tree | commitdiff
2016-02-23 Andreas Kohlbeckeradding jackson dependencies again to default scope tree | commitdiff
2016-02-23 Andreas Kohlbeckeradding missing dependencies to launchers and adding... tree | commitdiff
2016-02-22 Andreas Kohlbeckerserving swagger api doc in production mode (default... tree | commitdiff
2016-02-18 Andreas Kohlbeckerexcluding database drivers from cdmlib-remote-webapp.war tree | commitdiff
2016-02-17 Andreas Kohlbeckerremoving c3p0 jar from cdmlib-remote-webapp.war tree | commitdiff
2016-02-15 jenkinsMerge branch 'hotfix/3.12.4' into develop tree | commitdiff
2016-02-12 jenkinsupdating poms for branch'hotfix/3.12.4' with non-snapsh... tree | commitdiff
2016-02-12 jenkinsupdating poms for branch'hotfix/3.12.4' with non-snapsh... attic/tags/cdmlib/3.12.4/27239 tree | commitdiff
2016-02-11 jenkinsupdating poms for 3.12.4 branch with snapshot versions tree | commitdiff
2016-02-10 Andreas KohlbeckerMerge branch 'hotfix/3.12.3' into develop tree | commitdiff
2016-02-10 jenkinsMerge branch 'hotfix/3.12.3' root/tags/cdmlib/3.12.3 3.12.3 tree | commitdiff
2016-02-10 jenkinsupdating poms for branch'hotfix/3.12.3' with non-snapsh... tree | commitdiff
2016-02-03 jenkinsupdating poms for 3.12.3 branch with snapshot versions tree | commitdiff
2016-01-20 Andreas Kohlbeckerswitching remoting on in eclipse launcher tree | commitdiff
2016-01-20 Andreas Kohlbeckersolving probelms with running the jetty-maven plugin: tree | commitdiff
2016-01-20 Andreas MüllerAdapt log4j.properties to hibernate deprecated logging... tree | commitdiff
2016-01-12 Andreas Kohlbeckerlowering jetty-maven-plugin version to 9.1.3.v20140225... tree | commitdiff
2016-01-11 jenkinsMerge branch 'hotfix/3.12.2' root/tags/cdmlib/3.12.2 3.12.2 tree | commitdiff
2016-01-11 jenkinsupdating poms for branch'hotfix/3.12.2' with non-snapsh... tree | commitdiff
2016-01-11 jenkinsupdating poms for 3.12.2 branch with snapshot versions tree | commitdiff
2016-01-11 Andreas Kohlbeckerfixing project versions root/tags/cdmlib/3.12.1 3.12.1 tree | commitdiff
2016-01-11 Andreas KohlbeckerMerge branch 'hotfix/3.12.1' into develop tree | commitdiff
2016-01-08 jenkinsupdating poms for 3.12.1 branch with snapshot versions tree | commitdiff
2015-12-21 Andreas Kohlbeckerresolving conflicts after merge of ticket_4716 into... tree | commitdiff
2015-12-21 jenkinsUpdating develop poms back to pre merge state tree | commitdiff
2015-12-21 jenkinsupdating develop poms to master versions to avoid merge... tree | commitdiff
2015-12-21 jenkinsMerge branch 'release/3.12.0' root/tags/cdmlib/3.12.0 3.12.0 tree | commitdiff
2015-12-21 jenkinsupdating poms for branch'release/3.12.0' with non-snaps... tree | commitdiff
2015-12-18 jenkinsupdating poms for 3.13.0-SNAPSHOT development tree | commitdiff
2015-12-17 Andreas Kohlbeckerreverting failed attempt to fix maven resources filteri... tree | commitdiff
2015-12-17 Andreas MüllerRevert remote-webapp changes partly to test what the... tree | commitdiff
2015-12-17 Andreas Müllertry to fix remote-webapp test tree | commitdiff
2015-12-17 Andreas MüllerChange remote-webapp pom to work under windows tree | commitdiff
2015-12-14 Andreas Kohlbecker#5397 exclusion of paths in swagger config fixed tree | commitdiff
2015-12-14 Andreas Kohlbecker#5397 swagger-ui web application working, layout fixed tree | commitdiff
2015-12-12 Andreas Kohlbecker#5397 support for menu instead of select in springfox-ui tree | commitdiff
2015-12-11 Andreas Kohlbecker#5397 replacing swagger-ui by springfox-swagger-ui tree | commitdiff
2015-12-11 Andreas Kohlbecker#5397 replacing swagger-springmvc by springfox-swagger2 tree | commitdiff
2015-12-09 Andreas Kohlbecker#4716 reduicing clutter in the lucene index and solving... tree | commitdiff
2015-12-04 Andreas Kohlbeckeradding note with link to the cdmlib-remote-webapp confi... tree | commitdiff
2015-11-26 Andreas Kohlbeckerfirst steps to make lucene working again tree | commitdiff
2015-11-26 Andreas Kohlbecker#4716 fixing setup of cdmlib-remote-webapp tree | commitdiff
2015-11-24 Andreas Kohlbecker#4716 upgrading maven jetty plugin to latest, requires... tree | commitdiff
2015-11-24 Andreas MüllerRemove spring version from remote-webapp pom #4716 tree | commitdiff
2015-11-23 Andreas MüllerHibernate, lucene and search upgradet to 4.3.11, 4... tree | commitdiff
2015-11-23 Andreas MüllerUpgrade jaxb version and to new glassfish implementatio... tree | commitdiff
2015-11-12 Andreas Kohlbeckerremoving obsoltete version definition in submodule... tree | commitdiff
2015-10-30 Cherian MathewAdd datasource for unit tests to launch configuration tree | commitdiff
2015-10-20 Cherian MathewAdd os dependent file separator tree | commitdiff
2015-10-20 Cherian MathewRevert back early commit since it breaks jetty tests tree | commitdiff
2015-10-20 Katja Lutherfix the pom of remote-webapp for windows tree | commitdiff
2015-10-07 Andreas MüllerMerge branch 'develop' into ticket-5066 tree | commitdiff
2015-09-28 Andreas KohlbeckerUpdating develop poms back to pre merge state tree | commitdiff
2015-09-28 Andreas KohlbeckerUpdating develop poms to hotfix version to avoid merge... tree | commitdiff
2015-09-28 Andreas KohlbeckerMerge branch 'hotfix/3.11.1' root/tags/cdmlib/3.11.1 3.11.1 tree | commitdiff
2015-09-28 Andreas Kohlbeckerupdating poms for branch'hotfix/3.11.1' with non-snapsh... tree | commitdiff
2015-09-28 Andreas Kohlbeckerresolving conficts in project versions after hotfixrelease tree | commitdiff
2015-09-28 Andreas KohlbeckerMerge branch 'hotfix/3.11.1' tree | commitdiff
next