Max Schenkelberg
|
5729c0acc5
|
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 06ee0bbf6f [formerly 78e1bd2c62 ] [formerly 06ee0bbf6f [formerly 78e1bd2c62 ] [formerly 1f5abc6e20 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 2db836b296 [formerly 3ca8ca6f01 ]
Former-commit-id: 6cd18a09dc
|
2012-05-09 15:02:30 -05:00 |
|
Steve Harris
|
1d2ad9224a
|
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 572e1bb476 [formerly 27bc369818 ] [formerly 572e1bb476 [formerly 27bc369818 ] [formerly 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 9c9e01dbda [formerly 63ea8599d7 ]
Former-commit-id: 7978d3b640
|
2012-05-09 13:14:00 -05:00 |
|
Steve Harris
|
0c25458510
|
12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5 ] [formerly 4bfbdad17d [formerly 9f8cb727a5 ] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82 [formerly a28d70b5c5 ]
Former-commit-id: e5543a0e86
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
74b66d9683
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300 ] [formerly 750b7543dd [formerly 67a5a68300 ] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd ]
Former-commit-id: 8cd5974f4c
|
2012-04-18 15:18:16 -05:00 |
|
Bradley Gonzales
|
60d8ddce72
|
Issue #440 more descriptive login failure message
Former-commit-id: 391f8e4d58 [formerly 6fc14461ee ] [formerly 391f8e4d58 [formerly 6fc14461ee ] [formerly 74ce6f2140 [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]]]
Former-commit-id: 74ce6f2140
Former-commit-id: 2d7e2b456e [formerly c345b2614e ]
Former-commit-id: 7a125d179c
|
2012-04-04 16:26:58 -05:00 |
|
Max Schenkelberg
|
8e521d2c29
|
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
Former-commit-id: c56707c6bc [formerly 23d65caf2e ] [formerly c56707c6bc [formerly 23d65caf2e ] [formerly 753de872e0 [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]]
Former-commit-id: 753de872e0
Former-commit-id: c7165384f1 [formerly e3477c90ae ]
Former-commit-id: 5ebb709ef6
|
2012-04-02 16:15:21 -05:00 |
|
James Korman
|
0d4ccaf2e6
|
Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: ee20250305 [formerly 095ab0eeab ] [formerly ee20250305 [formerly 095ab0eeab ] [formerly d6003d1e71 [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]]]
Former-commit-id: d6003d1e71
Former-commit-id: 578594cdfd [formerly b29c262362 ]
Former-commit-id: 072c79a582
|
2012-03-14 10:24:17 -05:00 |
|
Steve Harris
|
034270857e
|
Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 608a0c17a0 [formerly f9baa1c98c ] [formerly 608a0c17a0 [formerly f9baa1c98c ] [formerly 46e1499e43 [formerly 2059372e90437312cf12f06de6c84d0824fb586c]]]
Former-commit-id: 46e1499e43
Former-commit-id: 63764220c4 [formerly 096ba6eb30 ]
Former-commit-id: 1328771113
|
2012-02-23 13:16:35 -06:00 |
|
Steve Harris
|
3433a1e31c
|
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: 07ac42866c [formerly c502603907 ] [formerly 07ac42866c [formerly c502603907 ] [formerly ecb38ba165 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]]
Former-commit-id: ecb38ba165
Former-commit-id: d83100c3df [formerly a9b900821a ]
Former-commit-id: 32fa2a28c5
|
2012-02-23 12:45:50 -06:00 |
|
Steve Harris
|
3aef320ffd
|
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 92084b3f20 [formerly d0bbbfefcc ] [formerly 92084b3f20 [formerly d0bbbfefcc ] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 92b7072b82 [formerly 3d511fe719 ]
Former-commit-id: ae9c52b012
|
2012-02-23 10:06:18 -06:00 |
|
Roger Ferrel
|
80b5a2049b
|
Issue #181
Changes from January ncep_cave
Former-commit-id: ae0981ac0f [formerly 7427aeaf29 ] [formerly ae0981ac0f [formerly 7427aeaf29 ] [formerly fa42f2dc60 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]]
Former-commit-id: fa42f2dc60
Former-commit-id: 9475b22c54 [formerly 376f6868b6 ]
Former-commit-id: 0d2ef82d19
|
2012-01-26 09:26:07 -06:00 |
|
Bryan Kowal
|
f0cdfeb9a8
|
Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: be0b6a87eb [formerly 5039d66b12 ] [formerly be0b6a87eb [formerly 5039d66b12 ] [formerly cf4d56d0a0 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]]
Former-commit-id: cf4d56d0a0
Former-commit-id: f6b08149ad [formerly 90c33ef882 ]
Former-commit-id: a5a50ccfe0
|
2012-01-23 13:25:11 -06:00 |
|
Bryan Kowal
|
7afea63245
|
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 971bf802ac [formerly 2142afe3f1 ] [formerly 971bf802ac [formerly 2142afe3f1 ] [formerly 2b5ee4b940 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: a1dbdff475 [formerly 2a7b92ec91 ]
Former-commit-id: 3bcecdfe66
|
2012-01-20 11:37:38 -06:00 |
|
Matt Nash
|
bcc32c10bc
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40 ] [formerly 580e2938d7 [formerly 66be3bec40 ] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484 ]
Former-commit-id: 21d2361f00
|
2012-01-19 11:53:12 -06:00 |
|
root
|
e2ecdcfe33
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712 ] [formerly a02aeb236c [formerly 9f19e3f712 ] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f ]
Former-commit-id: 377dcd10b9
|
2012-01-06 08:55:05 -06:00 |
|