Bryan Kowal
|
21e8618852
|
Merge branch '11-Collaboration' into development
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9361f3eb94 [formerly f528e10391] [formerly f0e3b957e3 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]
Former-commit-id: f0e3b957e3
Former-commit-id: 1ee59eac71
|
2012-06-18 11:16:28 -05:00 |
|
Ben Steffensmeier
|
352648586a
|
Issue #704 various core changes to make things work smoothly in kml
Change-Id: I048f9dfdb411a95765410f48fddb54aa8eefbd16
Former-commit-id: 2c27ec20b5 [formerly d187436589] [formerly 58356c49cb [formerly faec1cb4e4e0ef6444da31971b937ad3ee79160a]]
Former-commit-id: 58356c49cb
Former-commit-id: e604271c54
|
2012-06-14 16:41:05 -05:00 |
|
Dave Hladky
|
a1a3a361dd
|
Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.
Former-commit-id: 42a12fa7a5 [formerly 1b7473572f] [formerly 5b7ecea866 [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]
Former-commit-id: 5b7ecea866
Former-commit-id: 61e31c62ff
|
2012-04-30 13:43:34 -05:00 |
|
Ben Steffensmeier
|
75f49627c8
|
Issue #176 Change plots to no longer require id in updates. Change thin client updates to request pdo's instead of redoTimeMatching, which grabs any updates, not just new resource times.
Change-Id: I23763bae287d5c49d3973707228e78144cc83ab1
Former-commit-id: 6194dc8210 [formerly 9cc983549d] [formerly 9254b762ff [formerly 94d4feb2973ed201d369a21126b3443606041179]]
Former-commit-id: 9254b762ff
Former-commit-id: 484a0f64f8
|
2012-01-30 17:04:47 -06:00 |
|
Matt Nash
|
82300ccdcf
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
|
2012-01-19 11:53:12 -06:00 |
|
root
|
8e80217e59
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
|
2012-01-06 08:55:05 -06:00 |
|