Steve Harris
|
cfe2ba88ad
|
Merge branch 'master_13.5.2' (13.5.2-1) into omaha_13.5.2
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 5e0080743ae12b96d828451014a16ea118e25ce0
|
2013-08-28 09:03:09 -05:00 |
|
Steve Harris
|
542b2c3d18
|
13.5.2-1 baseline
Former-commit-id: a362ca91ee5972a1501a2842191fbe2e23feac9c
|
2013-08-28 09:43:48 -04:00 |
|
Steve Harris
|
119af8a466
|
Merge branch 'master_13.5.2' (13.5.1-18) into omaha_13.5.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
nativeLib/edexBridge/edexBridge.cpp
Former-commit-id: a3671ea2935178a28dce6d075dc2067a609e6725
|
2013-08-23 11:36:43 -05:00 |
|
Jonathan Sanchez
|
cf51ba9e9c
|
Issue #2176 Implemented emergency warning products.
Cherry picked from 13.6.1 67ce90c14a [formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85] to 13.5.2
Change-Id: I80623a63abd495baf3e0004625732f26453a30d9
Former-commit-id: be486757ed36916c1c3a1e56ddf98754b900b693
|
2013-08-22 12:25:42 -05:00 |
|
Jonathan Sanchez
|
321799e07b
|
Issue #2177 Improve county portion descriptions.
Change-Id: I9b2326e0b57b2bba7223032e3f08846f0d2f121d
Former-commit-id: a8e74ba813cc841c6cc6ff06df73080d1ce1fd8c
|
2013-08-22 10:49:09 -05:00 |
|
Steve Harris
|
0a7acf96c7
|
13.5.1-18 baseline
Former-commit-id: f407ad6db2f621a5be95939aea88f49d874d1ab6
|
2013-08-22 09:12:43 -04:00 |
|
Steve Harris
|
891f00d650
|
Merge branch 'omaha_13.5.1' (13.5.1-16) into development
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
nativeLib/edex_com/.cproject
Former-commit-id: e8580e78f408b796a1fea65167c43cc122a325bf
|
2013-08-15 12:50:08 -05:00 |
|
Steve Harris
|
a687da6075
|
Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 85cde5da231741012e611250a5c3490467aeef1b
|
2013-08-15 12:46:48 -05:00 |
|
Steve Harris
|
7ce0234d76
|
13.5.1-16 baseline
Former-commit-id: 2fcbcde58066c18ab423c94c37f446ab5e7f42da
|
2013-08-15 13:40:37 -04:00 |
|
Jonathan Sanchez
|
bc30396b63
|
Issue #2243 Resolved timing issues.
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34
Former-commit-id: 5833ecad04c31502b4e2991853e6aabeda4919f2
|
2013-08-15 10:56:37 -05:00 |
|
Richard Peter
|
a5383dbfa4
|
Issue #1977: Fix merge issue with WarngenDialog
Former-commit-id: ddfc06eb9753e893ece28e1718c5e4550e82b053
|
2013-08-14 15:33:02 -05:00 |
|
Richard Peter
|
2a9276c728
|
Merge branch 'omaha_13.5.1' (13.5.1-15) into development
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
Former-commit-id: e1aa1aa51e2325b005604aa971e842bccfcd8375
|
2013-08-14 15:23:18 -05:00 |
|
Richard Peter
|
ee6b9eb11a
|
Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3
|
2013-08-14 14:29:55 -05:00 |
|
Steve Harris
|
c6dc1817e7
|
13.5.1-15 baseline
Former-commit-id: dbf9107f9c775f9a1df759bc341c0722f5fc92f2
|
2013-08-14 10:24:26 -04:00 |
|
Jonathan Sanchez
|
fd0f2f1c09
|
Issue #2243 Resolved incorrect import.
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb
Former-commit-id: f79e7820ea010e0bc860b0033183147d7299221f
|
2013-08-13 20:47:49 -05:00 |
|
Jonathan Sanchez
|
49f488a58f
|
Issue #2243 Fixed update list bugs.
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f
Former-commit-id: 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee
|
2013-08-13 16:30:05 -05:00 |
|
Lee Venable
|
69645f03dc
|
Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: db71f51d18af219c2fdee6dcbe077be50d4e9e54
|
2013-08-08 16:40:59 -05:00 |
|
Jonathan Sanchez
|
dad0681ae0
|
Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e
Former-commit-id: a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26
|
2013-08-08 16:31:35 -05:00 |
|
Greg Armendariz
|
5577e686c1
|
13.5.1-13 baseline
Former-commit-id: 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4
|
2013-08-08 17:00:36 -04:00 |
|
Steve Harris
|
6e60cd9a79
|
13.5.1-9 baseline
Former-commit-id: 06a1dd45adedbe259f9c30ebf93f2f90017fe945
|
2013-08-01 09:20:23 -04:00 |
|
Jonathan Sanchez
|
67ce90c14a
|
Issue #2176 Implemented emergency warning products.
Change-Id: Icde169adbcfc5c409319649d63d222044a35dae2
Former-commit-id: 36df6339cc00afc5935746a4a47b0e9e8c641f85
|
2013-07-25 13:47:44 -05:00 |
|
Steve Harris
|
86ce1248c2
|
13.5.1-7 baseline
Former-commit-id: 4310ff14ffe9c7975574bb8b40bef668a90649e4
|
2013-07-18 12:07:22 -04:00 |
|
Greg Armendariz
|
ea7ac37930
|
13.5.1-5 baseline
Former-commit-id: e0157ab61ca5f2a62d78993a27893778fa119c4f
|
2013-07-03 12:20:27 -04:00 |
|
Steve Harris
|
3386330894
|
13.5.1-2 baseline
Former-commit-id: 36f4554f8f80812a5ffa0d243fe1a4ad6e330192
|
2013-06-17 15:01:22 -04:00 |
|
Steve Harris
|
fe872355a7
|
13.5.1-1 baseline
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
18b90226a2
|
13.4.1-14 baseline
Former-commit-id: 0e4ca3ea4159ea0256e22f9814f0de85180a41fb
|
2013-06-06 15:15:27 -04:00 |
|
Steve Harris
|
e53ada66b8
|
13.4.1-12 baseline
Former-commit-id: 398b25dee65cd6154c467b657ced5c9d2bada11a
|
2013-05-22 16:42:39 -04:00 |
|
Steve Harris
|
c0376ce9ed
|
13.4.1-11 baseline
Former-commit-id: e414ae01ab52b3940647e46e22bba3b89790c142
|
2013-05-21 09:19:25 -04:00 |
|
Steve Harris
|
aff41713f9
|
13.4.1-9 baseline
Former-commit-id: 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375
|
2013-05-16 11:12:07 -04:00 |
|
Steve Harris
|
8347bed50e
|
13.4.1-7 baseline
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
|
2013-05-13 12:58:10 -04:00 |
|
Steve Harris
|
16fe8cc5a2
|
13.4.1-6 baseline
Former-commit-id: f30c650b1c406889c38a5f82bbeda3605adbd9a5
|
2013-05-07 08:47:39 -04:00 |
|
Steve Harris
|
4ae0e2e858
|
13.4.1-5 baseline
Former-commit-id: 2d978fe3d2cf99e04040d191e040dbcb84a60b9a
|
2013-05-03 09:29:14 -05:00 |
|
Steve Harris
|
86e96f378c
|
13.4.1-3 baseline
Former-commit-id: 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd
|
2013-04-29 12:25:07 -05:00 |
|
Steve Harris
|
5ebd58a0b3
|
13.4.1-2 baseline
Former-commit-id: 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d
|
2013-04-24 17:22:10 -05:00 |
|
Steve Harris
|
00332e6305
|
13.4.1-1 baseline
Former-commit-id: c03222bb480d87c05982b4d49f863e615b5b5584
|
2013-04-24 17:15:55 -05:00 |
|
Steve Harris
|
446bec6f49
|
13.3.1-20 baseline
Former-commit-id: 91210030e50e7a19c3d8d4c9d377494de2bc83dd
|
2013-04-15 08:58:59 -05:00 |
|
Steve Harris
|
abaf9f12f9
|
13.3.1-19 baseline
Former-commit-id: ce855032b2b7235b2aea8dc66aff89ca7c54854a
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
a3fe998f8f
|
13.3.1-17 baseline
Former-commit-id: 0eb0081dbf1af625ca75e98ab775247c924c3527
|
2013-04-01 12:04:56 -05:00 |
|
Steve Harris
|
3066dd33e5
|
13.3.1-16 baseline
Former-commit-id: 18321f88c2efedf141b84e7de18c200e1037f740
|
2013-04-01 11:39:08 -05:00 |
|
Steve Harris
|
9fba973fd0
|
13.3.1-14 baseline
Former-commit-id: 0b52508caf520abeba4a75d38c9ed9130cc12c9e
|
2013-03-27 17:59:34 -05:00 |
|
Steve Harris
|
aaac0b51e5
|
13.3.1-12 baseline
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
f2b3fddfe2
|
13.3.1-9 baseline
Former-commit-id: 17276903ed005e17165649f236e6a99afa47b7fb
|
2013-03-19 14:22:56 -05:00 |
|
Steve Harris
|
2edca90902
|
13.3.1-4 baseline
Former-commit-id: 572c500b0c67d72405bdf533c43c68b1955ae90e
|
2013-03-05 10:39:59 -06:00 |
|
Steve Harris
|
8a64f142e5
|
13.3.1-3 baseline
Former-commit-id: dc9e245f83eb0136157f8ca71f80f7fb9eb04796
|
2013-02-25 10:24:53 -05:00 |
|
Steve Harris
|
3d115ed3be
|
13.3.1-2 baseline
Former-commit-id: 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e
|
2013-02-25 10:18:36 -05:00 |
|
Steve Harris
|
cabc8cf8b4
|
13.3.1-1 baseline
Former-commit-id: 841b0cf38549666c4f65f0d0cff3b92d76c9e795
|
2013-02-21 09:36:59 -05:00 |
|
Steve Harris
|
c86246ab4d
|
13.2.1-7 baseline
Former-commit-id: 132297ab4acf8e649e3cf9a3d54d4f4676b280be
|
2013-02-11 16:50:39 -05:00 |
|
Steve Harris
|
53adfb7345
|
13.2.1-6 baseline
Former-commit-id: 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0
|
2013-02-07 16:38:44 -05:00 |
|
Steve Harris
|
f99f99e2f5
|
13.2.1-5 baseline
Former-commit-id: 7a6958217f8b67edac937a23cb1c2ae8a89cedce
|
2013-02-04 16:36:29 -05:00 |
|
Steve Harris
|
1e77a6f0bd
|
13.2.1-4 baseline
Former-commit-id: 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee
|
2013-01-31 12:05:59 -05:00 |
|