Steve Harris
|
12c59e82df
|
Merge branch 'ss_builds' (12.10.1-4) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: bedc9569ca [formerly 04de1d5857 ] [formerly 29e7427dc3 ] [formerly bedc9569ca [formerly 04de1d5857 ] [formerly 29e7427dc3 ] [formerly 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]]
Former-commit-id: 04d9735c8f
Former-commit-id: 9d1f595fe6 [formerly e23b030dfd ] [formerly 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6 ]]
Former-commit-id: bd0ee0b429fad620ecf3eac1dfa68366ef64350e [formerly f80fb62837 ]
Former-commit-id: 30b0700044
|
2012-09-13 13:26:13 -05:00 |
|
Steve Harris
|
ed04125cd7
|
12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c ] [formerly fd19ca5624 ] [formerly 0d8d18d7e2 [formerly e38e81ab8c ] [formerly fd19ca5624 ] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5 ] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576 ]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec ]
Former-commit-id: e57e7237a9
|
2012-09-13 12:08:11 -05:00 |
|
Roger Ferrel
|
773136c54f
|
Issue #1155 changed default WMO id to 'blank'.
Change-Id: I1374b7584545e1510745882972e96011fd6db128
Former-commit-id: 758b90b2b3 [formerly 65b8cd58c3 ] [formerly d61f796f31 ] [formerly 758b90b2b3 [formerly 65b8cd58c3 ] [formerly d61f796f31 ] [formerly 00d7dea2eb [formerly d61f796f31 [formerly c68617688bebf943fba3f46ab4df200ee4f99cc8]]]]
Former-commit-id: 00d7dea2eb
Former-commit-id: 63725482a3 [formerly 1b76eec288 ] [formerly 610f75dddcd8f45283a33719f385e68b0ff42391 [formerly c6bbd04898 ]]
Former-commit-id: 9eeb2a2a1496fcdf0a51793d3211a8d4acf9af22 [formerly 789e5f513d ]
Former-commit-id: 731fcd6f3c
|
2012-09-12 14:55:15 -05:00 |
|
Richard Peter
|
d9d7723686
|
Merge "Issue #626 Changed satellite distribution file to only match on expected WMO headers TIC, TIG, and TIT" into development
Former-commit-id: 8dddc6338f [formerly c6be036eaf ] [formerly 9b4a60d1b5 ] [formerly 8dddc6338f [formerly c6be036eaf ] [formerly 9b4a60d1b5 ] [formerly e858b42697 [formerly 9b4a60d1b5 [formerly 281071d8f0fd51f5ef72598ddeed02a0dc47d4c8]]]]
Former-commit-id: e858b42697
Former-commit-id: 3f73c4f123 [formerly b5fd0f7116 ] [formerly e4cc02c28d87b9df34f8ffef36603611cb880b6c [formerly 08696bbdb6 ]]
Former-commit-id: 3f9778387f4cfc0ba0cd3f83c6b4bcf520c525b3 [formerly 3c84d0dbc0 ]
Former-commit-id: 60fbe9cfe1
|
2012-09-12 14:31:37 -05:00 |
|
Steve Harris
|
5ffa959e86
|
Merge branch 'ss_builds' (12.10.1-3 - better version) into development
Former-commit-id: ea4731bde5 [formerly 1c37242c8b ] [formerly 3338cabcb2 ] [formerly ea4731bde5 [formerly 1c37242c8b ] [formerly 3338cabcb2 ] [formerly ce5f09ec5c [formerly 3338cabcb2 [formerly 028c1bb9fe740017da11979d492eaec84d97a75f]]]]
Former-commit-id: ce5f09ec5c
Former-commit-id: 6d1247aedc [formerly cb1c6ecc5d ] [formerly 5891709b2b99eb2f869a95cff1ed1550026d80b5 [formerly 6ab33ffb07 ]]
Former-commit-id: 78023febf63aadc05de940b527a0c8f66b1f05d8 [formerly d7e6be52bc ]
Former-commit-id: a85d6b541a
|
2012-09-12 13:17:30 -05:00 |
|
Steve Harris
|
7a4eb9bf41
|
12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: bbc20f4a68 [formerly 22dac5c82e ] [formerly 077ced354e ] [formerly bbc20f4a68 [formerly 22dac5c82e ] [formerly 077ced354e ] [formerly fd5e214e72 [formerly 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]]]
Former-commit-id: fd5e214e72
Former-commit-id: 11421048fb [formerly 9f3bd0d4ec ] [formerly bdf8cbe13f96fe312d8ad014285d113e04c8d85a [formerly ba25027ea5 ]]
Former-commit-id: 669f728964989299c9646d57fbe148142a246f5f [formerly 2002a7cb8d ]
Former-commit-id: 6ce314ca65
|
2012-09-12 13:10:36 -05:00 |
|
Max Schenkelberg
|
1d31564f30
|
Issue #626 Changed satellite distribution file to only match on expected WMO headers TIC, TIG, and TIT
Change-Id: I2e6e538870c605675d8070d79786398adbf7dbcb
Former-commit-id: 863ecb1ad6 [formerly e1b01588d1 ] [formerly eabc8d684b ] [formerly 863ecb1ad6 [formerly e1b01588d1 ] [formerly eabc8d684b ] [formerly cc37173be9 [formerly eabc8d684b [formerly 42b8711fa44c85aee40070683729727192b62891]]]]
Former-commit-id: cc37173be9
Former-commit-id: c8d7d72fcb [formerly 69ba6f1ce1 ] [formerly 95fa4b0a40ddfb9e179dc5f25ed544f2ae347f2c [formerly ec9b3c56fb ]]
Former-commit-id: e75f755759751a0b003abbbe3b918016be694f23 [formerly 411a8d43a0 ]
Former-commit-id: fca4448458
|
2012-09-12 09:22:25 -05:00 |
|
Nate Jensen
|
8648c59a64
|
Merge "Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed." into development
Former-commit-id: 761795bbae [formerly 3c240d3269 ] [formerly 89fb0a5bee ] [formerly 761795bbae [formerly 3c240d3269 ] [formerly 89fb0a5bee ] [formerly bb68c93607 [formerly 89fb0a5bee [formerly 9b20aae000c7d4ac25dada94390eb3e8d70a6cc9]]]]
Former-commit-id: bb68c93607
Former-commit-id: 43c2ee4358 [formerly 4f457a34b9 ] [formerly 7b464ea25fc9ce3602bc4d975dce3f84fbefe8f3 [formerly 50c95b06f9 ]]
Former-commit-id: 09d667a8dc119e82e7596885f962ae423621fa14 [formerly 5b6f330da6 ]
Former-commit-id: 89447077ee
|
2012-09-12 09:18:24 -05:00 |
|
Richard Peter
|
fe8d1b40f7
|
Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
Former-commit-id: 5baaa6593f [formerly c8443cf85c ] [formerly 701960a246 ] [formerly 5baaa6593f [formerly c8443cf85c ] [formerly 701960a246 ] [formerly 60b21393fc [formerly 701960a246 [formerly 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6]]]]
Former-commit-id: 60b21393fc
Former-commit-id: f1d458e450 [formerly 9d1413ff28 ] [formerly 1caef7b52e6ad68e0ead7729ecc24930c9ffc1dc [formerly b5d3a41fb1 ]]
Former-commit-id: 5317efa78bec07bb182f7ff1944ef2332146ed46 [formerly c142137798 ]
Former-commit-id: 457cb5375e
|
2012-09-12 08:27:11 -05:00 |
|
Steve Harris
|
24dde5731f
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: eff949899d [formerly d39a318583 ] [formerly 503cddcc5e ] [formerly eff949899d [formerly d39a318583 ] [formerly 503cddcc5e ] [formerly adf25aa707 [formerly 503cddcc5e [formerly 6d859accd185300997d14e7daf17f3c3257c348d]]]]
Former-commit-id: adf25aa707
Former-commit-id: 1ce86f79cb [formerly 31c1998d08 ] [formerly ce66c34bbdf3a8a1520465c247af5fbfd7bd9f07 [formerly 865fd2f475 ]]
Former-commit-id: dc5aa9e2fb2cce6ca63b93113b6933be26786d6a [formerly dbd228eea2 ]
Former-commit-id: 2d3fdd9558
|
2012-09-11 17:06:26 -05:00 |
|
Steve Harris
|
e78abbb503
|
Merge branch 'ss_builds' (12.10.1-3) into development
Conflicts:
cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
cave/com.raytheon.uf.viz.kml.export.feature/build.properties
cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment
Former-commit-id: 2f57e328fe [formerly f94db138cd ] [formerly 64d4e2bded ] [formerly 2f57e328fe [formerly f94db138cd ] [formerly 64d4e2bded ] [formerly 012c526816 [formerly 64d4e2bded [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]]]]
Former-commit-id: 012c526816
Former-commit-id: 047003d8c0 [formerly b14d30591b ] [formerly bf5ba423a5556426548660494a7905779f996b28 [formerly 41c82361f7 ]]
Former-commit-id: 585e00c89332757d4df66cf4a92879c20bf9d63b [formerly bba73380ca ]
Former-commit-id: 3bec22460f
|
2012-09-11 16:57:03 -05:00 |
|
Max Schenkelberg
|
6b5b4197a0
|
Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d
Former-commit-id: 5e94274b98 [formerly a6cc869ada ] [formerly 7294025e26 ] [formerly 5e94274b98 [formerly a6cc869ada ] [formerly 7294025e26 ] [formerly 2f8f1ce9b2 [formerly 7294025e26 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]]]]
Former-commit-id: 2f8f1ce9b2
Former-commit-id: 1e81c703f1 [formerly 52e812ec0e ] [formerly 879019359ad23ac206937c8d749c606eda7eac91 [formerly c26d21d908 ]]
Former-commit-id: 0f1fad1da8c7a5d1787cda72eb269efb5b9cde6d [formerly 1badd11cdb ]
Former-commit-id: fbc35a39d4
|
2012-09-11 16:27:41 -05:00 |
|
Steve Harris
|
9d4e230e7a
|
12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2 ] [formerly 21f430062b ] [formerly 0403e7d0a9 [formerly de1639aea2 ] [formerly 21f430062b ] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db ] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd ]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529 ]
Former-commit-id: 5030894212
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
4ccea19158
|
12.10.1-2 baseline
Former-commit-id: bb190a66a1 [formerly dde1f4c54d ] [formerly 250f0ccac9 ] [formerly bb190a66a1 [formerly dde1f4c54d ] [formerly 250f0ccac9 ] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]]
Former-commit-id: a66f3f4b60
Former-commit-id: 406bde9fd0 [formerly ec74f638e5 ] [formerly f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d ]]
Former-commit-id: c8612b01cf2efa0937102321eb6c14dfe7097005 [formerly cc3c3dadee ]
Former-commit-id: 5684a84a46
|
2012-09-11 15:50:57 -05:00 |
|
Max Schenkelberg
|
5ecd46d9f5
|
Issue #1138 Added null check to base ProtectedFile object since will be null when called recursively first time when constructing the base object. Organized static functions together from member functions.
Change-Id: I5dbef82932c9dc8623061361fad64fd0e8706546
Former-commit-id: b5a198a27d [formerly ab120dfec6 ] [formerly fffe220e05 ] [formerly b5a198a27d [formerly ab120dfec6 ] [formerly fffe220e05 ] [formerly c4398c09a4 [formerly fffe220e05 [formerly edbff1f2b607d53e8247155a5526a7c21e40ac71]]]]
Former-commit-id: c4398c09a4
Former-commit-id: 197e66e51f [formerly 7d5c82ebfd ] [formerly e9cbdce4b29b44a0103e0ad9a4d1f9761738853d [formerly a513b5830a ]]
Former-commit-id: c5480b714cb10bcfa877019fbc22b08e3f70d4da [formerly 6c5d3637e1 ]
Former-commit-id: 3a0d62686a
|
2012-09-11 14:04:14 -05:00 |
|
Nate Jensen
|
bc128f06d5
|
Issue #1096 fixed sampling order
Change-Id: Ib5fa01c281a50f792abc6a813167455c51076bed
Former-commit-id: a6252ceab2 [formerly cb9dd60490 ] [formerly c6b07f3672 ] [formerly a6252ceab2 [formerly cb9dd60490 ] [formerly c6b07f3672 ] [formerly d58af3e377 [formerly c6b07f3672 [formerly 6274438941aef5d7e5ee284488ffe0300ee3a68e]]]]
Former-commit-id: d58af3e377
Former-commit-id: f4f6bca08c [formerly a899727652 ] [formerly 5fc5d72098aba57eb9f63c4a45e92548e73e8693 [formerly 54cf5ebca4 ]]
Former-commit-id: 526d69e4bf8f77d976294db2206c0218bb3eeda0 [formerly d0ba18435c ]
Former-commit-id: 346b652757
|
2012-09-11 13:11:23 -05:00 |
|
Lee Venable
|
983d22939a
|
Merge "Issue #1161 changed comparator" into development
Former-commit-id: 1a5f514d00 [formerly f731ae885c ] [formerly 802b43036e ] [formerly 1a5f514d00 [formerly f731ae885c ] [formerly 802b43036e ] [formerly a691386102 [formerly 802b43036e [formerly 2d9bf3e785e72e8bc3b3a04d186d3c76ddc1eebb]]]]
Former-commit-id: a691386102
Former-commit-id: 78a6ccd095 [formerly a5dde0e55d ] [formerly 57d821bd7ff0430e0c64e94dcdfb94505b76dd25 [formerly 9f1f054f4c ]]
Former-commit-id: 2fce521a2f088a450a7e079bccd506691bbd9047 [formerly aa256d89e5 ]
Former-commit-id: 9ab6370e0d
|
2012-09-11 10:02:21 -05:00 |
|
Dave Hladky
|
d99b1580a0
|
Issue #1161 changed comparator
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962
Former-commit-id: 70ccfe678a [formerly afb00feb6d ] [formerly c78fb26fbf ] [formerly 70ccfe678a [formerly afb00feb6d ] [formerly c78fb26fbf ] [formerly af27b562d7 [formerly c78fb26fbf [formerly 36748378cf53d2ab7c6ba1e49be195d90e2dc385]]]]
Former-commit-id: af27b562d7
Former-commit-id: ddd93c8f13 [formerly e30f36206f ] [formerly 0a71ddea9802f93622bdd8b3d213d5d6a1e152d1 [formerly 1c1ffc7793 ]]
Former-commit-id: a2e601b2d15274e3929723312879270894896255 [formerly 6c4495a7e6 ]
Former-commit-id: 47c4004123
|
2012-09-11 09:39:43 -05:00 |
|
Lee Venable
|
3835e1f717
|
Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development
Former-commit-id: c1d6d8e77a [formerly 1f86d2c4ba ] [formerly 056e74d3cf ] [formerly c1d6d8e77a [formerly 1f86d2c4ba ] [formerly 056e74d3cf ] [formerly 83fc018f38 [formerly 056e74d3cf [formerly 19dc13a0d5ef2b0fc41300815dd6be34d7001afd]]]]
Former-commit-id: 83fc018f38
Former-commit-id: b921d8300c [formerly 782593a118 ] [formerly fe0be8190662c7e6d90a9853e2d5697ccd2f90f4 [formerly 1d0bdbd25c ]]
Former-commit-id: 6767a793ca7535fee22938818e5325edd17c7876 [formerly 83c441319e ]
Former-commit-id: 4d0edf403e
|
2012-09-11 09:15:47 -05:00 |
|
Nate Jensen
|
43c79a395f
|
Merge "Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view." into development
Former-commit-id: bdbaa71575 [formerly 4d91b0a15a ] [formerly e61076b316 ] [formerly bdbaa71575 [formerly 4d91b0a15a ] [formerly e61076b316 ] [formerly 7c1bc79df7 [formerly e61076b316 [formerly 603632fbca6e67b9e1f3cd1f4a48026bca3f1f35]]]]
Former-commit-id: 7c1bc79df7
Former-commit-id: b859c18e1d [formerly 8d36456626 ] [formerly 86d8f9d6ef7dbf4b9521438792e20b0557afe5bb [formerly cc8fae1099 ]]
Former-commit-id: 52b0af166acbed3fa71101f1c5cb0e6a94744242 [formerly ab3f9e7847 ]
Former-commit-id: 8c89211dd7
|
2012-09-11 09:06:26 -05:00 |
|
Dave Hladky
|
b1ad95f547
|
Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
Change-Id: I23212f3281290d86621e72c88478b00d37336494
Former-commit-id: 7ea2655805 [formerly 33f222783d ] [formerly 28912552fe ] [formerly 7ea2655805 [formerly 33f222783d ] [formerly 28912552fe ] [formerly 6818408d40 [formerly 28912552fe [formerly 2088328c090d5a7d3f6218c42619fd3ab6d45dd9]]]]
Former-commit-id: 6818408d40
Former-commit-id: 566007c438 [formerly 02b00ddf47 ] [formerly 5f94e8ba51158c8fb39f7777f808e5c34c42b933 [formerly 655939bba7 ]]
Former-commit-id: a858f48eb5eeb7dd341dfe161a1c1d50ab169f85 [formerly 8f3447ff9b ]
Former-commit-id: 2114682424
|
2012-09-11 08:56:51 -05:00 |
|
Mike Duff
|
e09895120e
|
Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
Former-commit-id: 4180c20fbe [formerly 269d2831d9 ] [formerly bcafd807c5 ] [formerly 4180c20fbe [formerly 269d2831d9 ] [formerly bcafd807c5 ] [formerly 7825863940 [formerly bcafd807c5 [formerly 5504abfd272649dad36357ae7fdce83c75b3e3fa]]]]
Former-commit-id: 7825863940
Former-commit-id: 4a392f3a7e [formerly e443d5b5da ] [formerly a8d4d5f0957d84bdc382ed4bc60b15cf3078cc0b [formerly db6ac1594e ]]
Former-commit-id: 285bdfa5c621f5bfca306fe69d8dae2bae78fac0 [formerly 45e84531a6 ]
Former-commit-id: 195e71243f
|
2012-09-11 08:50:55 -05:00 |
|
Jonathan Sanchez
|
b0dd12e275
|
Issue #1006 fix supdirs
Former-commit-id: 6e1be0b967 [formerly d2f4487543 ] [formerly 09bdc765e5 ] [formerly 6e1be0b967 [formerly d2f4487543 ] [formerly 09bdc765e5 ] [formerly 44d21bfe36 [formerly 09bdc765e5 [formerly 09109d26f68e527f843013883dc7f3082f01dd7a]]]]
Former-commit-id: 44d21bfe36
Former-commit-id: 9230cfe187 [formerly f66eebab84 ] [formerly 75b68cce3258bf1f21ee4af293ccac45fc294059 [formerly b048808367 ]]
Former-commit-id: 14cdfa18531268a65a732b1c338c3255cfcc4ab9 [formerly ec0294864a ]
Former-commit-id: 5a0abaaa9e
|
2012-09-10 17:39:36 -05:00 |
|
Lee Venable
|
00b32ea829
|
Merge "Issue #1159 No longer wrap text pasted to empty text field." into development
Former-commit-id: 97a9c87490 [formerly 8f95f21e6a ] [formerly b22bd12fad ] [formerly 97a9c87490 [formerly 8f95f21e6a ] [formerly b22bd12fad ] [formerly 903c220ecb [formerly b22bd12fad [formerly bacccfd683e71eab49c69d815aafbef2e395e863]]]]
Former-commit-id: 903c220ecb
Former-commit-id: 94a11a269b [formerly 9d55815fcf ] [formerly 88289ac2565a1212c88972cd22af916ab8d4a31f [formerly f1a836d0bb ]]
Former-commit-id: 8e4e01abeb0e8b4a68c2e9bb3f92e5eeaf6c5f61 [formerly ef57279c96 ]
Former-commit-id: 8272ed7387
|
2012-09-10 15:13:47 -05:00 |
|
Roger Ferrel
|
2cc43fc135
|
Issue #1159 No longer wrap text pasted to empty text field.
Change-Id: I03cc61a4d6d158344c0dbdbbed8be7edeb9cc42d
Former-commit-id: 915ded00c4 [formerly fd1be035c3 ] [formerly ef9634dd96 ] [formerly 915ded00c4 [formerly fd1be035c3 ] [formerly ef9634dd96 ] [formerly e55c9ca0bd [formerly ef9634dd96 [formerly 0b418dc248fd3c2107f2d6c045c8da51f13f1faa]]]]
Former-commit-id: e55c9ca0bd
Former-commit-id: 15e9098529 [formerly 37cffe02b0 ] [formerly 61d473c04e628e251b126bfe9027d6acb028b5ac [formerly aa036adf6d ]]
Former-commit-id: e90c01cff6deebb1103ae3eac9b395e981a0c612 [formerly d9e4fdb6a3 ]
Former-commit-id: c77a82828b
|
2012-09-10 13:25:29 -05:00 |
|
Max Schenkelberg
|
376809e2b4
|
Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536
Former-commit-id: f7abe9ee39 [formerly 6d78afd423 ] [formerly 80439b309b ] [formerly f7abe9ee39 [formerly 6d78afd423 ] [formerly 80439b309b ] [formerly 84658dd03a [formerly 80439b309b [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]]]
Former-commit-id: 84658dd03a
Former-commit-id: 827ef7301b [formerly d2d74fac20 ] [formerly f9f8eef104b9eb8e02ca5321a8ca3396d4878105 [formerly 20f5d966db ]]
Former-commit-id: 9672b8f584873397fefa3457c0a7bc7d4ea457b1 [formerly 264bc403d6 ]
Former-commit-id: 29ab00a4cb
|
2012-09-10 10:45:37 -05:00 |
|
Brad Gonzales
|
a2d47dee93
|
Issue #1156 sort by ts_rank in the TimeSeriesDataManager ingestfilter query.
Former-commit-id: 87def306af [formerly 85961a3d6d ] [formerly f2b97d3170 ] [formerly 87def306af [formerly 85961a3d6d ] [formerly f2b97d3170 ] [formerly 1b028a6d54 [formerly f2b97d3170 [formerly ecbe261f768452fc30a6641d25f5303565d18cbb]]]]
Former-commit-id: 1b028a6d54
Former-commit-id: 39b0c07947 [formerly edaaac843d ] [formerly 74336a520ae88be3f8fbe7ecc497a8bb4f6942fd [formerly b7c9603d02 ]]
Former-commit-id: ab94e966d12a1332b65d12e68f6d6d66355aac0e [formerly 283f084c28 ]
Former-commit-id: e75a25b118
|
2012-09-10 09:24:28 -05:00 |
|
Roger Ferrel
|
e5427ade0d
|
Issue #1145 Modifications to AlarmDisplayWindow and CurrentAlarmQueue to handle accumualte like AWIPS 1.
Change-Id: Ib5a17f309a2c0ee832028ae1cc8677641e9a0377
Former-commit-id: 2a34cf0ac2 [formerly 3de56714fb ] [formerly ce5430a625 ] [formerly 2a34cf0ac2 [formerly 3de56714fb ] [formerly ce5430a625 ] [formerly caff5053cb [formerly ce5430a625 [formerly 8506d363eff80306d0413e942c52d90b977ea887]]]]
Former-commit-id: caff5053cb
Former-commit-id: 6a6f27bd44 [formerly 8926d7a65b ] [formerly 168a71f817820a049f75d0c76d54e15faab80e00 [formerly b287d102a7 ]]
Former-commit-id: 521236215f2f1f2db37e38ed178527cb29a58dfd [formerly dfc3f135ef ]
Former-commit-id: be580ea44c
|
2012-09-10 08:28:58 -05:00 |
|
David Gillingham
|
573eecfc85
|
Issue #1150: Fix regression caused by previous text product generation changes by ensuring all
directories get created.
Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0
Former-commit-id: fc39f37437 [formerly cff73c9e1d ] [formerly f192c8d115 ] [formerly fc39f37437 [formerly cff73c9e1d ] [formerly f192c8d115 ] [formerly 83681d1ff6 [formerly f192c8d115 [formerly 74e7d98c5bde7cefaedf354ecfbac147b2ff801a]]]]
Former-commit-id: 83681d1ff6
Former-commit-id: 75daa050de [formerly 64bf7f0613 ] [formerly 92c5f6a8e1768a660e1ac985fa2926880692a6db [formerly 9d13d3244d ]]
Former-commit-id: 2fed4e38d727109fd569711e98bd2489daa10535 [formerly 7bb5d95ac5 ]
Former-commit-id: 0497ffc0d8
|
2012-09-07 12:29:36 -05:00 |
|
Bryan Kowal
|
7ac0182778
|
Issue #1134 - edex will now use the same jep library that CAVE does
Former-commit-id: f3a273027c [formerly 3c63f21cfc ] [formerly ec89c440fe ] [formerly f3a273027c [formerly 3c63f21cfc ] [formerly ec89c440fe ] [formerly 04b574f56e [formerly ec89c440fe [formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]]]]
Former-commit-id: 04b574f56e
Former-commit-id: 0b7709663c [formerly 8a04029498 ] [formerly 64429dfda116bd48a4b498f09ed3888f7a1ee784 [formerly 84f7083b81 ]]
Former-commit-id: a8cbf0f9e03a755118150e51fc76053f10ef3864 [formerly 6f159f35de ]
Former-commit-id: c497827083
|
2012-09-07 10:28:51 -05:00 |
|
Lee Venable
|
d460e8ed0b
|
Merge "Issue #1144 Fixed sizing of Local Effects Area dropdown." into development
Former-commit-id: ad24a257a5 [formerly 8615be95bf ] [formerly 30e28997d2 ] [formerly ad24a257a5 [formerly 8615be95bf ] [formerly 30e28997d2 ] [formerly 7e32db36fb [formerly 30e28997d2 [formerly 822993b3728f939e7e57ca9cd1c6fa7b0737ea25]]]]
Former-commit-id: 7e32db36fb
Former-commit-id: 709cc7b734 [formerly 05cf3939d9 ] [formerly 79492dc54c5589beeda21b8d2a2005a26fb467f9 [formerly 2c6dd57186 ]]
Former-commit-id: f0ca3403e856828fb58a1070dfc1d651c1b6bd14 [formerly aed0c142c3 ]
Former-commit-id: 719b431edd
|
2012-09-07 07:35:15 -05:00 |
|
Ron Anderson
|
a457539c80
|
Issue #1144 Fixed sizing of Local Effects Area dropdown.
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5
Former-commit-id: 88ba04e791 [formerly 8ca431ab8b ] [formerly ee7985bd57 ] [formerly 88ba04e791 [formerly 8ca431ab8b ] [formerly ee7985bd57 ] [formerly 16260530e9 [formerly ee7985bd57 [formerly 3e7360c68b5f6cfdd2a7d79c10f22b2a4bfcc7f5]]]]
Former-commit-id: 16260530e9
Former-commit-id: 064d7a2afc [formerly e0e3e4a044 ] [formerly 22524cf34987f12d7db2178a5437262655f63666 [formerly 309196b6e1 ]]
Former-commit-id: b63148319d11f61113329e47c01d50715af7ae2f [formerly 86455f1e6a ]
Former-commit-id: 8f85204091
|
2012-09-06 17:44:00 -05:00 |
|
Greg Armendariz
|
048b902df6
|
Merge "Issue #1090 - pattern corrections" into development
Former-commit-id: 572a83adb7 [formerly 3cc51587c6 ] [formerly 8201f5346f ] [formerly 572a83adb7 [formerly 3cc51587c6 ] [formerly 8201f5346f ] [formerly 58b74d05e5 [formerly 8201f5346f [formerly 9dc5230757d9a09f718fdf1f802e698ac6dd21d2]]]]
Former-commit-id: 58b74d05e5
Former-commit-id: 2a1d21e17f [formerly e1851f370a ] [formerly 2f2f315c07c4f62a2d12dcf52754cec6dcca7ef5 [formerly 338f0ebd91 ]]
Former-commit-id: 5d18ed8f93b39baf6b4bb520bf85cbcfb060d6c6 [formerly 84b24812c2 ]
Former-commit-id: 2f1d6b3515
|
2012-09-06 13:50:36 -05:00 |
|
Steve Harris
|
a5a75f7c02
|
Issue #1141 - Adding JavaAPIforKml license file
Former-commit-id: bff568429e [formerly 262473a662 ] [formerly 7d7f20b388 ] [formerly bff568429e [formerly 262473a662 ] [formerly 7d7f20b388 ] [formerly 259bb4dfed [formerly 7d7f20b388 [formerly d84394c2f8f62406fee0e039ba0aa283bbbd857e]]]]
Former-commit-id: 259bb4dfed
Former-commit-id: e1fc93dfa6 [formerly 727899cc20 ] [formerly b5f2c0d43419e070c4bba708a58e58d3d8d0517c [formerly b9317a53c7 ]]
Former-commit-id: 2b8b4de76f47457438dc80ad600642b0bae28384 [formerly ab4d9d7b75 ]
Former-commit-id: ef706c6dd5
|
2012-09-06 11:09:24 -05:00 |
|
James Korman
|
0db16cedf0
|
Issue #1090 - pattern corrections
Former-commit-id: 5b2c527640 [formerly 78c7ce88ac ] [formerly be350dd763 ] [formerly 5b2c527640 [formerly 78c7ce88ac ] [formerly be350dd763 ] [formerly eb17151f74 [formerly be350dd763 [formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]]]]
Former-commit-id: eb17151f74
Former-commit-id: 77a4167bbe [formerly 85191cde31 ] [formerly 93eba3c470d03a96ea25c31692b39898165ffeb5 [formerly f36d089fd5 ]]
Former-commit-id: be4935f80f0e4b89c640f5626bbad1c47e7fcda8 [formerly 4b3126493d ]
Former-commit-id: f07942db71
|
2012-09-06 09:20:03 -05:00 |
|
Bryan Kowal
|
1bfa55285b
|
Issue #1141 - Merging KML into the Common Baseline
Former-commit-id: 2f7fae43cc [formerly 8d444b35d3 ] [formerly 3180ae0c57 ] [formerly 2f7fae43cc [formerly 8d444b35d3 ] [formerly 3180ae0c57 ] [formerly 7b45633097 [formerly 3180ae0c57 [formerly c3f584fdc5f53ecd62afe41c481aaa96cf532009]]]]
Former-commit-id: 7b45633097
Former-commit-id: c17cb133e0 [formerly 23c607980a ] [formerly 0b9e06862a6cbda27a651857f407897e0b354900 [formerly b63d426e0f ]]
Former-commit-id: 9e2bb30df2820dcdb86d7578eac6e182c2ae3240 [formerly 60c3fb248f ]
Former-commit-id: 675fdff183
|
2012-09-05 18:39:08 -05:00 |
|
Bryan Kowal
|
1c396e356a
|
Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 8444e742df [formerly 35aff16e89 ] [formerly 137b27d3ff ] [formerly 8444e742df [formerly 35aff16e89 ] [formerly 137b27d3ff ] [formerly 3e1556a981 [formerly 137b27d3ff [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]]]]
Former-commit-id: 3e1556a981
Former-commit-id: a10099b0a4 [formerly 7ec6eb66ab ] [formerly be92c88a0768d80b1afd3036de3111dbf50f3e10 [formerly a34225c4c9 ]]
Former-commit-id: aa15d0828c9d4b5dd037df90f420ad52b09ff334 [formerly 6494e3e627 ]
Former-commit-id: cc0821e0b0
|
2012-09-05 14:44:36 -05:00 |
|
Max Schenkelberg
|
e6344fb405
|
Issue #29 Changed how TileLevel calculate pixel density to make densities more consistent between granules on display. Changed TileSetRenderable level change threshold to smaller value so displays look less pixelated with new pixel density calculation. Fixed FileTreeView from throwing errors if two definitions with same name defined which came to light from NPP build
Change-Id: I66b556b74e1a856dace5447c4b9f090d026c493c
Former-commit-id: e06d1dabef [formerly a14d5d4c86 ] [formerly c183a0e614 ] [formerly e06d1dabef [formerly a14d5d4c86 ] [formerly c183a0e614 ] [formerly 28d6308444 [formerly c183a0e614 [formerly a4dd750d4bbdaae4a548c9a296436cc783d2d71a]]]]
Former-commit-id: 28d6308444
Former-commit-id: e7b2f69ff3 [formerly 45d6b7bcb5 ] [formerly b4ace038bdcc2b915892986d414af1d5d5480636 [formerly 87bcbdb4cc ]]
Former-commit-id: 5eefafca4bd5634f3cfc855808c975e58e51c2fe [formerly 4f86d1c819 ]
Former-commit-id: 9980bf4f49
|
2012-09-05 11:51:38 -05:00 |
|
Ben Steffensmeier
|
ac770a948b
|
Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8
Former-commit-id: 513bd44ba0 [formerly dc6f5805ef ] [formerly 4272f4c885 ] [formerly 513bd44ba0 [formerly dc6f5805ef ] [formerly 4272f4c885 ] [formerly c618ee9057 [formerly 4272f4c885 [formerly 5da7b54e1bff66ed46400bc624b9d881d0b967ce]]]]
Former-commit-id: c618ee9057
Former-commit-id: 49524b9109 [formerly 66e9b24e51 ] [formerly 1e8fa5942894142a7af4316bb2f69d7081706dc3 [formerly e0a4fe2c43 ]]
Former-commit-id: 2609f964204294c255f42e29c0b9fb07af09999d [formerly 64ef6f58f1 ]
Former-commit-id: 44d8021a72
|
2012-09-04 13:41:10 -05:00 |
|
Steve Harris
|
46d05b60a1
|
Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 319927240c [formerly 0e046d847a ] [formerly bba4eb12d0 ] [formerly 319927240c [formerly 0e046d847a ] [formerly bba4eb12d0 ] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]]
Former-commit-id: af106f1d29
Former-commit-id: 20e088a957 [formerly f224e3e8ad ] [formerly fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4 ]]
Former-commit-id: 3d9b8193220e5e34df1a2294f95f1fef387de77d [formerly e9582cb789 ]
Former-commit-id: f8e7459dfb
|
2012-09-04 12:11:03 -05:00 |
|
Steve Harris
|
bc97cf788a
|
12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c ] [formerly 195158c004 ] [formerly 7248f8b762 [formerly 0abf64b77c ] [formerly 195158c004 ] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]]
Former-commit-id: d708932029
Former-commit-id: 9f4fa7bf83 [formerly e720b8ed31 ] [formerly eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7 ]]
Former-commit-id: 93d844e1d6c245b4e49c2fcb70d3a7143c1fc5c2 [formerly d65f35ffe9 ]
Former-commit-id: a924a8347a
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
e38cbf019b
|
12.9.1-12 baseline
Former-commit-id: 6784576fc9 [formerly 4bf4f0043a ] [formerly 948766c387 ] [formerly 6784576fc9 [formerly 4bf4f0043a ] [formerly 948766c387 ] [formerly 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]]
Former-commit-id: 150bc967a5
Former-commit-id: 15fa63819d [formerly 782941ccc1 ] [formerly 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e ]]
Former-commit-id: 636b0752d8e9909d3f1d52f3fb2dd51e26dcd63d [formerly 38aa573545 ]
Former-commit-id: c1e601dc30
|
2012-09-04 11:47:38 -05:00 |
|
Steve Harris
|
e4a69a14b7
|
Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 9ff4f369a4 [formerly f52c8b374d ] [formerly 3a9d4961e2 ] [formerly 9ff4f369a4 [formerly f52c8b374d ] [formerly 3a9d4961e2 ] [formerly 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]]
Former-commit-id: 34cbde4124
Former-commit-id: a3a1864f56 [formerly ffe253196a ] [formerly b24c67b6e98e964ff9cd901ee9da994905e8a1b9 [formerly 3230e0b246 ]]
Former-commit-id: 0a6beb81edff0c6c84ef952189b7118ada94cdbd [formerly 5b4ee818b7 ]
Former-commit-id: b63855f152
|
2012-08-30 14:40:34 -05:00 |
|
Steve Harris
|
aec9addbfc
|
12.9.1-11 baseline
Former-commit-id: a2bb1dabe0 [formerly d07c18918d ] [formerly 6eb6b0909b ] [formerly a2bb1dabe0 [formerly d07c18918d ] [formerly 6eb6b0909b ] [formerly fc405efab7 [formerly 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]]]
Former-commit-id: fc405efab7
Former-commit-id: 503b7bf15c [formerly dc5ec3d16d ] [formerly aa38e16cc24dec9189539c27650c276ab78f3c78 [formerly a14374fcd4 ]]
Former-commit-id: eee5809bc6e00f9fe11f73224bc731077cdb1b5b [formerly f401755cde ]
Former-commit-id: 982804ee0e
|
2012-08-30 14:36:12 -05:00 |
|
Steve Harris
|
cba4faf995
|
12.9.1-10 baseline
Former-commit-id: 264d870cbf [formerly bdb45cdfae ] [formerly 3adc50a783 ] [formerly 264d870cbf [formerly bdb45cdfae ] [formerly 3adc50a783 ] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: c704490769 [formerly f43a5af47f ] [formerly eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a ]]
Former-commit-id: 8b8bb30a759783a20d278f5fb0049d2db76cb8dc [formerly 5bb474d33c ]
Former-commit-id: ede38c4b3f
|
2012-08-30 14:28:27 -05:00 |
|
Max Schenkelberg
|
4ae2b6c0e3
|
Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4
Former-commit-id: d0160a4aa9 [formerly 81531873e0 ] [formerly 00de2922e1 ] [formerly d0160a4aa9 [formerly 81531873e0 ] [formerly 00de2922e1 ] [formerly 0de737ad64 [formerly 00de2922e1 [formerly b9568b79f531250c859b77296115da32b628318d]]]]
Former-commit-id: 0de737ad64
Former-commit-id: e2e9969448 [formerly ef8ed151a9 ] [formerly 9a6b2c20c8248d78d8c7b88d4e7f58d9f1001bcb [formerly b75fad8e30 ]]
Former-commit-id: 60642ef433a57b99d1234624c93e7e1f8efaefed [formerly 48a74eba41 ]
Former-commit-id: f61b465148
|
2012-08-29 18:17:30 -05:00 |
|
Nate Jensen
|
5bb78e30fa
|
Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
Former-commit-id: a6afe463af [formerly 4c73903629 ] [formerly 96393309eb ] [formerly a6afe463af [formerly 4c73903629 ] [formerly 96393309eb ] [formerly b47baedad4 [formerly 96393309eb [formerly c06f87cd60290f34b0c9b1ac955f0b72f9de5c5b]]]]
Former-commit-id: b47baedad4
Former-commit-id: e313a785b0 [formerly 45134743b6 ] [formerly 692922c7e7a4bbe072430e65deae743517f3f114 [formerly e6661037f5 ]]
Former-commit-id: 88f501602fed0aa170abf9d76285e77d58ebfde3 [formerly 1c53c83f62 ]
Former-commit-id: 8f479985f3
|
2012-08-29 16:09:50 -05:00 |
|
Max Schenkelberg
|
0ece0757e3
|
Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9
Former-commit-id: e03e761b28 [formerly 04c3a1c678 ] [formerly f8aef2b067 ] [formerly e03e761b28 [formerly 04c3a1c678 ] [formerly f8aef2b067 ] [formerly 81f78fa819 [formerly f8aef2b067 [formerly 3ff192dfb09a0e4512287d45df864375e3900ca1]]]]
Former-commit-id: 81f78fa819
Former-commit-id: 50a53cf8b6 [formerly e593c9d56e ] [formerly c78f2cc0795ac993cd9b82670d6a70aae5a945ff [formerly 99c8b1a968 ]]
Former-commit-id: eea9f8aa0dac4119f9c198b6e6ea08d6f1c45801 [formerly d44378e259 ]
Former-commit-id: 85319c6284
|
2012-08-29 16:02:08 -05:00 |
|
Ben Steffensmeier
|
f88a15ae05
|
Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
Former-commit-id: 669d1023a8 [formerly e3bb8c80c9 ] [formerly 1f587e39f4 ] [formerly 669d1023a8 [formerly e3bb8c80c9 ] [formerly 1f587e39f4 ] [formerly 37d2411b26 [formerly 1f587e39f4 [formerly e3c5526f9b12ae38c12094e7ebf9f9d6823f3257]]]]
Former-commit-id: 37d2411b26
Former-commit-id: 80ffe1feff [formerly 68235d0744 ] [formerly a91944b28e23d60c494612c968dc56c1620456c7 [formerly 36dd387007 ]]
Former-commit-id: 81bcabc15f9c4f2b319eaab7338f813f16a88a56 [formerly b17f2973ca ]
Former-commit-id: 9c74b28080
|
2012-08-29 14:24:21 -05:00 |
|
Matt Nash
|
1071ff2049
|
Issue #1101 fix gfe keybindings for frame change in collaboration
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a
Former-commit-id: 04ce96d74e [formerly ba698ae69a ] [formerly 018f590c70 ] [formerly 04ce96d74e [formerly ba698ae69a ] [formerly 018f590c70 ] [formerly ada6ecf5f3 [formerly 018f590c70 [formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]]]]
Former-commit-id: ada6ecf5f3
Former-commit-id: d35027f45e [formerly cac1c2bb2e ] [formerly 5dd2067f359bb03dbe5cae64c69ba82ef563a1de [formerly 1242054a50 ]]
Former-commit-id: c580f22bd8cf1f202bf9fa6adf36dc991f847cf9 [formerly 5c568beda7 ]
Former-commit-id: 1b9d645810
|
2012-08-27 12:16:38 -05:00 |
|