xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4904 commits 31 branches 40 tags 3.8 GiB
Commit graph

4904 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lee Venable
6773d174ec Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1 
Former-commit-id: f078971b5d [formerly 5c256dc19c [formerly c75877624ab414c1a45bc7326c49aa99c8ec3021]]
Former-commit-id: 5c256dc19c
Former-commit-id: c7cfd49622
 2014-02-11 09:15:44 -06:00
Juliya Dynina
a90e5adb68 Merge "ASM #94" into asm_14.2.2 
Former-commit-id: 0ae2a064a3 [formerly e2479f4075 [formerly c2eb6022d788294a87a7878cdac6c325be1c1062]]
Former-commit-id: e2479f4075
Former-commit-id: 00d8dfb641
 2014-02-11 10:08:00 -05:00
Michael Gamazaychikov
7531090e3d ASM #94 
Change-Id: I97797a7adbd17532b261987caf2fdcaa1d39c9ed

Former-commit-id: b63053d8b4 [formerly 42399284ca [formerly 3c9c34c84ac1cd4962c3e6f877bd33b37aab705a]]
Former-commit-id: 42399284ca
Former-commit-id: 8cd5cce89e
 2014-02-11 01:32:37 +00:00
Nate Jensen
24bbf4949d Issue #2704 smarter thin client connectivity dialog and connection 
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: fd43d9e095 [formerly 75ca70fba6 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]
Former-commit-id: 75ca70fba6
Former-commit-id: c28085118f
 2014-02-10 16:48:29 -06:00
Juliya Dynina
619be4fd34 Merge "ASM #97" into asm_14.2.2 
Former-commit-id: 8b99350285 [formerly 2869c365bd [formerly 9b1f068e47b374d50760c388e1d9d45e8b896116]]
Former-commit-id: 2869c365bd
Former-commit-id: 2fae9cdb2d
 2014-02-10 16:01:58 -05:00
Max Schenkelberg
7de6ff30da Issue #2680 fixed samplers in structs issues with GLSL spec. 
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9

Former-commit-id: a8a67634f9 [formerly 7822511754 [formerly 4f3635fc682c2a1746e188dac0f371676c9e0be9]]
Former-commit-id: 7822511754
Former-commit-id: 3c1fafe328
 2014-02-10 13:43:16 -06:00
Kiran.Shrestha
41523b7569 ASM #97 
Change-Id: I4978b7ddba9ec714c4b2635fcb7e926447a3ff13

Former-commit-id: d54116125c [formerly e467e957d7 [formerly f4e1de7a38b8a25d735143fb6ffea710bf024c2a]]
Former-commit-id: e467e957d7
Former-commit-id: ba857c54d1
 2014-02-10 19:33:57 +00:00
Juliya Dynina
48a5acd6ee Merge "ASM #250" into asm_14.2.2 
Former-commit-id: 81f1d6cf12 [formerly d63bec582a [formerly a52178c96037755d72eb4b3f5d5f303d9c9ddf65]]
Former-commit-id: d63bec582a
Former-commit-id: 2cdba70b78
 2014-02-10 14:04:52 -05:00
Lee Venable
b90abb03c1 Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1 
Former-commit-id: 88a9d20316 [formerly 27be4297e6 [formerly 213ecfda92272947cda51d9c3d00b117a3d52a76]]
Former-commit-id: 27be4297e6
Former-commit-id: d6fa79f1a7
 2014-02-10 11:50:07 -06:00
Nate Jensen
fb8ce8da65 Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1 
Former-commit-id: a48c1c6783 [formerly 5c7c14a6c4 [formerly 1ae3057ce4fbbb5e60b27cf21d75de72b7e00c3e]]
Former-commit-id: 5c7c14a6c4
Former-commit-id: d16d679809
 2014-02-10 09:53:41 -06:00
Ron Anderson
40f316bcf8 Merge "Issue #2509: Fix baseline merge breakage to ifpIMAGE." into omaha_14.2.1 
Former-commit-id: 0476a288db [formerly 2170fb5615 [formerly ec8c9e963137ec7b7201558c5ddd00d2affb3aa3]]
Former-commit-id: 2170fb5615
Former-commit-id: 42850542af
 2014-02-10 08:31:31 -06:00
Mike Duff
c20018d0ba Issue #2453 - Notification Center refactor 
Former-commit-id: 2c9d603e50 [formerly eeb78f7f20 [formerly f570a3945ad8e9e8bc4f88989a0ec10da191856a]]
Former-commit-id: eeb78f7f20
Former-commit-id: 61c57d2254
 2014-02-07 16:50:50 -06:00
Ben Steffensmeier
e7baa5b186 Issue #2211 Fix data mapped sampling. 
Former-commit-id: 3d76d6655b [formerly 724bb85676 [formerly aec317f506eb940e843a0c3cf4ffa55a83eb186b]]
Former-commit-id: 724bb85676
Former-commit-id: d219a687c9
 2014-02-07 13:00:00 -06:00
David Gillingham
dc8f0dde25 Issue #2509: Fix baseline merge breakage to ifpIMAGE. 
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00

Former-commit-id: e8ffc73893 [formerly 03d36b8309 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]]
Former-commit-id: 03d36b8309
Former-commit-id: b12e29dd7c
 2014-02-07 09:51:42 -06:00
Rici.Yu
44656c81d9 ASM #102 
Change-Id: Idae87ce34f52bc79144742b92cff7e3537a84e99

Former-commit-id: 3bc070a8ec [formerly 4010ef5fd8 [formerly 6874b003afcebb837e11579eae048e2aa90cbfc7]]
Former-commit-id: 4010ef5fd8
Former-commit-id: 6c8fa82be2
 2014-02-07 10:43:29 -05:00
Brad Gonzales
c275da6725 Issue #2636 Changed EdexBandwidthManager startup scheduling to use the 
in-memory bandwidth manager to setup initial scheduling because it
is much faster.

Amend: updated log statement.
       fix for rescheduling of already scheduled BandwidthAllocations.

Change-Id: I5c6d6543bce8222cb746fde2951caf6439db5fa3

Former-commit-id: 704e466f28 [formerly 9c50fb29fd [formerly f1a4a7b24290b6e85380668563793ac529fc5b31]]
Former-commit-id: 9c50fb29fd
Former-commit-id: 9529c1d191
 2014-02-07 09:35:36 -06:00
Loubna.Bousaidi
1afff8be63 ASM #250 
Change-Id: I81033a3a597e63f1ad53a7a1cefc4a775297f513

Former-commit-id: 176de0262c [formerly 44e04ffef0 [formerly 0d1bad67bc93e356e26d2b0f3e411d3e751aa9f4]]
Former-commit-id: 44e04ffef0
Former-commit-id: 43d3e156a7
 2014-02-07 15:15:58 +00:00
Ben Steffensmeier
89105e1257 Issue #2762 Fix Satellite Data Access. 
Former-commit-id: ed2c1a0329 [formerly 2166b5b696 [formerly 4016e9366e8917225777b079da4b94dd1e6fde4a]]
Former-commit-id: 2166b5b696
Former-commit-id: a26a150a69
 2014-02-06 13:53:44 -06:00
Mike Duff
e69e8c4615 Issue #2636 - Fix for ncf spring config 
Former-commit-id: e84ae26421 [formerly 3f7defe563 [formerly 4308e8a45d61e9d6a67b6036e98ff1b8886d86f6]]
Former-commit-id: 3f7defe563
Former-commit-id: 3707a4eabd
 2014-02-06 09:29:20 -06:00
Richard Peter
8ad3c5857b Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1 
Former-commit-id: 36d3d21b57 [formerly 64f0cabaef [formerly daacb19de029a15f94338c84a85116d0435f79be]]
Former-commit-id: 64f0cabaef
Former-commit-id: 82fc0a2ed3
 2014-02-05 18:20:36 -06:00
Mike Duff
3691146e34 Issue #2677 - Don't do overlap checks when updating subs to deactivated. 
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: 6b01c2957f [formerly 101c08818d [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]
Former-commit-id: 101c08818d
Former-commit-id: bafe19bbd5
 2014-02-05 16:08:01 -06:00
Richard Peter
0ebd0009e5 Merge "Issue #2722 - Add auto refresh to sub manager dialog" into omaha_14.2.1 
Former-commit-id: 882544fec5 [formerly 7e69f192a5 [formerly 1e91683c1df918a7405c2f847a6dc7397dbcc473]]
Former-commit-id: 7e69f192a5
Former-commit-id: d1546d42ce
 2014-02-05 14:57:16 -06:00
Dave Hladky
1c8f6fb36d Issue #2686 Refactor of retrieval 
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 39f97723d6 [formerly 6172c83afc [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]
Former-commit-id: 6172c83afc
Former-commit-id: 7fb7e10cda
 2014-02-05 14:49:26 -06:00
Juliya Dynina
dd71746c6f Merge "ASM #114" into asm_14.2.2 
Former-commit-id: c6253811e8 [formerly 575ed3610d [formerly d719e88d510424020955f06d8b597d2df3573836]]
Former-commit-id: 575ed3610d
Former-commit-id: 3edd73f78c
 2014-02-05 10:42:30 -05:00
Steve Harris
66e76b7de6 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 74c87b95c3 [formerly f24bc49703 [formerly cee2e11f4b3d74bee3ab254267f156a846801087]]
Former-commit-id: f24bc49703
Former-commit-id: 1dbc316078
 2014-02-05 09:12:40 -06:00
Richard Peter
176bee122b Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1 
Former-commit-id: e5af004993 [formerly 8f844bc9ce [formerly a2536c180f68e5ea970e3406e3ef1f899650f3e2]]
Former-commit-id: 8f844bc9ce
Former-commit-id: 21b0a87d78
 2014-02-04 18:12:48 -06:00
Brian.Dyke
cd80c22b5c Issue #224 
Former-commit-id: dad6f2896b [formerly 3f86a80d7e [formerly 043faa447b4fc15a996dfe6108093bed5f1b6497]]
Former-commit-id: 3f86a80d7e
Former-commit-id: ed476a583f
 2014-02-04 17:05:12 -05:00
Brian.Dyke
6d35a4b1bc Issue #124 
Former-commit-id: 0cc11ddfd3 [formerly 439f053309 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]
Former-commit-id: 439f053309
Former-commit-id: 3ba93b175e
 2014-02-04 16:56:47 -05:00
Brian.Dyke
ea0a5bebfd Issue #179 
Former-commit-id: b23c6f59f7 [formerly a0626cdc00 [formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]]
Former-commit-id: a0626cdc00
Former-commit-id: 6b3ebc4fef
 2014-02-04 16:53:34 -05:00
Brian.Dyke
fc1aa5076a Issue #131 
Former-commit-id: 35b25ee2a9 [formerly bd5db64b5b [formerly 4167f33801ee2450502231438955e72c4428fbcc]]
Former-commit-id: bd5db64b5b
Former-commit-id: dea5f087d3
 2014-02-04 16:36:11 -05:00
Brian.Dyke
6510e6da5a Issue #88 
Former-commit-id: edccef5569 [formerly 643ef1a1a6 [formerly 66a1b2ba9933754b0d6d0324108268563e6381bc]]
Former-commit-id: 643ef1a1a6
Former-commit-id: d56bdce6ff
 2014-02-04 16:34:40 -05:00
Brian.Dyke
89422cef7c Issue #83 
Former-commit-id: fb15dd5dfb [formerly 484119f6b0 [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]
Former-commit-id: 484119f6b0
Former-commit-id: f2e56b268c
 2014-02-04 16:32:42 -05:00
Juliya Dynina
669c9447c8 Merge "ASM #235" into asm_14.2.2 
Former-commit-id: 67942aacf7 [formerly 08741ce6c4 [formerly 46beee6bbda9af256daecd64b4c7abf52e021ad3]]
Former-commit-id: 08741ce6c4
Former-commit-id: ad1ff832d2
 2014-02-04 15:55:59 -05:00
Mike Duff
75faeae7e4 Issue #2636 - Scheduling refactor. Single scheduling method now. 
Review comments

Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58

Former-commit-id: eb46191ba9 [formerly eee642ac9b [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]]
Former-commit-id: eee642ac9b
Former-commit-id: 2ca26aaa39
 2014-02-04 14:01:29 -06:00
Mike Duff
8d92217e94 Issue #2722 - Add auto refresh to sub manager dialog 
Former-commit-id: ab9621698f [formerly 04ee397f2b [formerly f678a39b37040bd637cf210f73aaef0841bda36e]]
Former-commit-id: 04ee397f2b
Former-commit-id: 227eb23157
 2014-02-04 12:45:33 -06:00
steve.naples
0f1a16498a ASM #235 
Change-Id: Ic3a6237b0a1f9ddf06621c984d2f11b7e08d7adb

Former-commit-id: 22808af7e2 [formerly c76099274a [formerly 678ad5b35f22b71f54200fbf5b88ebd9e4da9563]]
Former-commit-id: c76099274a
Former-commit-id: b7b5dc3497
 2014-02-04 18:23:46 +00:00
Richard Peter
57402adccf Merge "Issue #2769 Removed aggressive Hibernate session flushes" into omaha_14.2.1 
Former-commit-id: fb8d982ede [formerly 844f05e1ef [formerly b2edf70f6d9404ed4963ee874c3e03d13bf49303]]
Former-commit-id: 844f05e1ef
Former-commit-id: fe3963680d
 2014-02-04 12:22:19 -06:00
Brian.Dyke
4c6eb0c001 14.1.1-17 baseline 
Former-commit-id: 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]
Former-commit-id: 180d1356cd
Former-commit-id: f3d34b0c38
 2014-02-04 12:33:46 -05:00
Benjamin Phillippe
5de996ac4a Issue #2769 Removed aggressive Hibernate session flushes 
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216

Former-commit-id: fc589ed84d [formerly 1691c5a3ff [formerly 0440395a596d13bf8b4f1dda4857c185c6c8afa5]]
Former-commit-id: 1691c5a3ff
Former-commit-id: 3f4b92fffb
 2014-02-04 10:24:11 -06:00
Richard Peter
fa634d77b5 Merge "Issue #2745 - Don't display fulfilled or cancelled allocations" into omaha_14.2.1 
Former-commit-id: e16212d24d [formerly 995e0c538a [formerly d68e99735aab51fa7a5f335534e89141ba00c890]]
Former-commit-id: 995e0c538a
Former-commit-id: fb67e4410a
 2014-02-04 09:45:08 -06:00
Mike Duff
9c70fb3261 Issue #2745 - Don't display fulfilled or cancelled allocations 
Former-commit-id: c9b98868d2 [formerly f81772f4be [formerly 7b7f294622e886d7457d7abe0451d3e819568677]]
Former-commit-id: f81772f4be
Former-commit-id: 4d529f5051
 2014-02-03 16:57:03 -06:00
Ben Steffensmeier
fc0d044bd9 Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers. 
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834

Former-commit-id: 97a64f89f1 [formerly 8865177c6b [formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]]
Former-commit-id: 8865177c6b
Former-commit-id: 921401ffe9
 2014-02-03 14:07:07 -06:00
Stephen Gilbert
5b447b3861 VLab Issue #2916 - NSHARP Errors Swapping into main pane 
Fixed some widget management errors in the Show Text dialog's close
method.  Ensure Text Dislog's close method is called when swapping
Nsharp display.
    
Change-Id: I6e645aa552980b49e552a2830f9f148d95f27f3b

Former-commit-id: 3f6c7ef92c [formerly ba72d87f07 [formerly 0ff12f2c322d9cbed696f9ee4f2049d9efed7863]]
Former-commit-id: ba72d87f07
Former-commit-id: d849e051c8
 2014-02-03 14:55:25 -05:00
David Friedman
9caca1ee5a ASM #240 
Change-Id: Ie1e0b115e991c0bdc01e929a21d36a9f1413d940

Former-commit-id: 969c50b80f [formerly 611503cd96 [formerly e34ceb8c86f0814c1be7af3bbd2eadec8daf48aa]]
Former-commit-id: 611503cd96
Former-commit-id: 24ebf8854c
 2014-02-03 19:03:50 +00:00
Steve Harris
ab0609007c Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: eb9d4319dc [formerly b2032880ac [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]
Former-commit-id: b2032880ac
Former-commit-id: 131af8538e
 2014-02-03 10:26:11 -06:00
Juliya Dynina
0684b67260 Merge "ASM #290" into asm_14.2.2 
Former-commit-id: a3ac0236b0 [formerly 8cdc5b446a [formerly 3a31872714dbc04cfd7a0f1e353970b896b047a7]]
Former-commit-id: 8cdc5b446a
Former-commit-id: df338a3302
 2014-01-31 09:13:33 -05:00
Juliya Dynina
03bf37ec3a Merge "ASM #120" into asm_14.2.2 
Former-commit-id: 5867a062d7 [formerly 15c4ec933c [formerly 30a875b35b090132cc6ec8a2474b5877bb7c6042]]
Former-commit-id: 15c4ec933c
Former-commit-id: 060fb2bd00
 2014-01-31 09:12:20 -05:00
Brian.Dyke
8b06bfd2f9 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1 
Former-commit-id: 40ce5ccc2a [formerly 4e7b1b207f [formerly 0409f7045a797c8c051a353d69de1991b8c8b681]]
Former-commit-id: 4e7b1b207f
Former-commit-id: 89b824b846
 2014-01-31 08:28:09 -05:00
steve.naples
8aa160d694 ASM #290 
Change-Id: Id6160e628c4fe3c4c62ef58ccb2b7624268e64d4

Former-commit-id: d4a0b7a0d1 [formerly 6501c2c398 [formerly 53b6ac674a3b7bbce71ce2a81b5bb3715baeaa13]]
Former-commit-id: 6501c2c398
Former-commit-id: 7ecb7b027c
 2014-01-30 21:03:38 +00:00
steve.naples
f850a0f028 ASM #120 
Change-Id: I657d872f612475ccf21cdd3c08f8075180ec192a

Former-commit-id: b303d1ecbb [formerly 709dc589ce [formerly 656f31b7df8a805e7f38a02c29bce05a1bcff639]]
Former-commit-id: 709dc589ce
Former-commit-id: 56deadaa00
 2014-01-30 20:59:39 +00:00