Commit Graph
2917 Commits
Author SHA1 Message Date
Axel Uhl efb545574f Merge branch 'master' into prod
Conflicts:
	java/pom.xml
2011-06-10 22:00:56 +02:00
Axel Uhl 4a4ac9aaa9 Merge branch 'master' into test
Conflicts:
	java/pom.xml
2011-06-10 22:00:02 +02:00
Axel Uhl e05e271d9f Merge branch 'master' of ssh://localhost:12347/home/trac/git 2011-06-10 21:50:23 +02:00
Simon Pamies 0bae880ae6 Merge branch 'master' of ssh://195.227.10.246/home/trac/git 2011-06-10 21:49:50 +02:00
Axel Uhl 2578c084cb switch top-level pom.xml to non-proxy operations (probably the default in our set-up?) 2011-06-10 21:49:49 +02:00
Axel Uhl 687d524171 added regression test for bug fixed by 20a3aa6c2d 2011-06-10 21:49:10 +02:00
Axel Uhl 989fa4258c added regression test for bug fixed by 20a3aa6c2d 2011-06-10 21:46:59 +02:00
Axel Uhl 56e99d863e merged old java/TODO in top-level TODO 2011-06-10 21:21:34 +02:00
Axel Uhl d9aaab2027 implemented removewind REST API in admin app 2011-06-10 21:17:34 +02:00
Simon Pamies 76363154a8 Removed class files - seems that they were accidently committed 2011-06-10 21:15:53 +02:00
Axel Uhl 2e2a450fcf longer timeout in declination tests; formatting changes 2011-06-10 17:49:10 +02:00
Axel Uhl a1cfab3e4c fixed maven repository path 2011-06-10 17:38:55 +02:00
Axel Uhl d6fc4b571b deploy into maven-repositories/prod 2011-06-10 17:38:35 +02:00
Axel Uhl 3e47186a53 deploy into maven-repositories/test 2011-06-10 17:38:06 +02:00
Axel Uhl aa6a4aa78d moved Maven repositories on server from ~trac/maven-repository to ~trac/maven-repositories/<branch-name> 2011-06-10 17:34:46 +02:00
Axel Uhl fe88efcce5 adjusted to new java/ directory 2011-06-10 17:22:51 +02:00
Simon Pamies b03d9185eb moved all Java stuff to java/ subdir 2011-06-10 16:39:27 +02:00