Slav Korolev
b8e48e1740
Issue #2652 . Fixed issue with edex-text-ingest log.
...
Former-commit-id: 6d4cf7476fa34b1196b75087a0154dbfa84e65ec5087a0154dbfa84e65ec40b4bf6e8e0566c86a6c
2014-02-25 15:23:22 -05:00
Brian Clements
408b834fc6
Issue #2751 fixed webDAV path issue
...
webDAV needs every part of the path created individually
made the userid portion of the url use the entire id URL encoded
Former-commit-id: 9597ce5cd93f0e9d7a77eef242194a3d365a4cd2eef242194a3d365a4cd2473fcda0cf1f5d296314
2014-02-25 09:17:36 -06:00
Brian Clements
743c6cd74b
Issue #2751 fixed leader transfer infinite loop, added event validation
...
added username to paths in http urls to prevent old events from being picked up with new leader
added simple check to prevent invalid leader change events from being processed
Former-commit-id: a1739724379217ba24c53f362519aa386e9cc96a3f362519aa386e9cc96ab9c9be4c4f73cb7b7313
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
d27c21b9f6
Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
...
Former-commit-id: 152980350c780dc19fac70ae372303e08d4f77c370ae372303e08d4f77c3a6bf8965937aca322faa
2014-02-21 17:37:19 -06:00
Richard Peter
c410157f33
Merge "Issue #2828 Added purge cron to Central SBN Simulator." into development
...
Former-commit-id: c06007eb9b66d3fce57de923639fb158a3aac09de923639fb158a3aac09d59376490859ba35d60bd
2014-02-21 11:26:26 -06:00
Nate Jensen
7e1f0c83f0
Merge "Issue #2631 - Set preference defaults in the Activator. Removed unused file." into development
...
Former-commit-id: f4b3acbac0c1f4fbfbd49a3f60a216dd00fd14459a3f60a216dd00fd14457b1cf570f462596de046
2014-02-20 17:55:35 -06:00
Brad Gonzales
1b59fc4647
Issue #2828 Added purge cron to Central SBN Simulator.
...
Amend: Removed comment accidentally merged from other branch.
Moved logging to outer loop and log count of purged files for each dir.
Change-Id: I7038e7f76d09576903d35a54e733cd6986a4d1c6
Former-commit-id: 3052b2d9c7290a38171512e22752c2bd25ec4cd912e22752c2bd25ec4cd908c4d1afeabef4e8ee53
2014-02-20 16:31:16 -06:00
Mike Duff
5754117aad
Issue #2631 - Set preference defaults in the Activator.
...
Removed unused file.
Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e
Former-commit-id: 9eafacaac2a96a833f51ed5cb91406a7b1e79d2ded5cb91406a7b1e79d2dd90f4495c2f98eec12b9
2014-02-20 15:09:10 -06:00
Ron Anderson
e2bd1327b4
Issue #2824 Registered with SiteAwareRegistry so we can stop fetching when site is deactivated.
...
Change-Id: I4e277656a971e7927aa2321e91ba7304351f9405
Former-commit-id: bb3577ef37e4aeaa79f16a7e4a147d6ccf6a56e76a7e4a147d6ccf6a56e7d63ad1b1de1dcaf2b790
2014-02-20 12:32:31 -06:00
Brian Clements
e7584f3a49
Issue #2751 collab menu icons, fixed NPE
...
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog
Former-commit-id: 8bbf2bb6bda2bdfa25ccaaa2de20f489a48c3f6baaa2de20f489a48c3f6b4b7ba54dc304697836b8
2014-02-20 11:50:54 -06:00
Brian Clements
08a0e5baf2
Issue #2751 implemented room/topic ownership transfer
...
Former-commit-id: 4e165aba58a8ff1effc1c3cadff705ab72938246c3cadff705ab72938246d9ac2c00379d00fe2bab
2014-02-20 11:10:14 -06:00
Ron Anderson
81b8bf2374
Merge "Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used" into development
...
Former-commit-id: e1585c58e1810ad594a1c13942140a6f4a63000dc13942140a6f4a63000dc07544b904ee5658f9d9
2014-02-20 09:55:56 -06:00
Ron Anderson
e1a346790e
Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used
...
Change-Id: I9a100fe3b1a9c8dc94639029d6380f36f5ba4da7
Former-commit-id: 6645688ff42bfa521e7d6b6aa14e5908a1be844d6b6aa14e5908a1be844d1571b9a8eb0ee3625c50
2014-02-20 09:34:18 -06:00
Nate Jensen
08ede8e9f3
Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
...
Former-commit-id: adb51300d84563e38db23078b692735856957c573078b692735856957c575412b72c57c936a659a5
2014-02-19 17:22:00 -06:00
Nate Jensen
8a564e9987
Merge "Issue #2761 add region level to localization" into development
...
Former-commit-id: f939d93d7f3782880dac9011e1b31e6e59175ce49011e1b31e6e59175ce4b1e27889589394879520
2014-02-19 17:18:24 -06:00
Nate Jensen
eeac24c773
Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
...
Former-commit-id: f545a8a74da241472c34df376abcb7f99cf7df47df376abcb7f99cf7df478b152a8027d3ec0da1bb
2014-02-19 16:19:27 -06:00
Ron Anderson
efbe57d909
Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
...
Former-commit-id: dab0ebc99e8703c4393798d2417f94b8c00d8ead98d2417f94b8c00d8ead7e7f0abfdcb9904edc3a
2014-02-19 15:39:56 -06:00
Mike Duff
a723f69ad9
Issue #2631 - Add sound preference for users joining a room.
...
review comments
Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207
Former-commit-id: 659cb1f2a0e2a6251a6b663ea8decd95fcee385a663ea8decd95fcee385a3100a71f3489c4a3e04b
2014-02-19 15:26:14 -06:00
Mike Duff
10765884a3
Issue #2628 - Change cast from short to int for MPE colorbar
...
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c
Former-commit-id: 8a29af489448a0b34b5f682c6af456183657fb33682c6af456183657fb3386fce9d5478be2622f85
2014-02-19 15:20:29 -06:00
Nate Jensen
7f1665f2eb
Merge "Issue #2751 fixed chat room bugs" into development
...
Former-commit-id: 72acab26c3b4ac1867284b4cca776fc72e2be9694b4cca776fc72e2be9697099b450235ef747c703
2014-02-19 14:52:24 -06:00
Lee Venable
a0d9fe6f20
Merge "Issue #2734 - default time range to 24 hours." into development
...
Former-commit-id: 5582282777de102f4e948e967e8e59e204b350ee8e967e8e59e204b350ee9cb8925e51404a4c3149
2014-02-19 12:33:46 -06:00
Ron Anderson
84bea14340
Issue #2819 Removed more unnecessary .clone() calls
...
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 5f3248574f663cb4cb625258aecf45419e9d0b8d5258aecf45419e9d0b8d8a41723ba6908e43039e
2014-02-19 11:55:11 -06:00
Slav Korolev
164665bbac
Issue #2652 . Fixed issue with edex-text-ingest log. Deleted unused code.
...
Change-Id: Id84e813047342a49988f78c1c9e13c356305e11b
Former-commit-id: 39e49448baf7a6a6c613a597ac09893b1ea13cb1a597ac09893b1ea13cb18ec2d02f5206d55c28f4
2014-02-19 12:01:06 -05:00
Mike Duff
bac3c86658
Issue #2734 - default time range to 24 hours.
...
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d
Former-commit-id: c7e22b7b3bbc180503b119033601bf0b316f7bd919033601bf0b316f7bd97710724c5a06ed3db690
2014-02-19 10:23:48 -06:00
Matt Nash
9cb0b6d530
Issue #2761 add region level to localization
...
Amend : Change comment now that we do not get file from localization
Change-Id: I864f2b4e1c84261ada3bf6169dbd3389d9b61ae2
Former-commit-id: 1d6e1d443c3f67324d7c2d20e84f6a18350195672d20e84f6a1835019567bb10484bd0ae1d36b6d0
2014-02-19 10:01:25 -06:00
Brian Clements
30027665ac
Issue #2751 fixed chat room bugs
...
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client
Former-commit-id: abc01f547506c16118e1dc074a96503a135b8eacdc074a96503a135b8eacbee7cdb71a77bb396c9a
2014-02-19 08:32:26 -06:00
Lee Venable
32141b0655
Merge "Issue #2596 - Add check for null coordinates." into development
...
Former-commit-id: 0db46dd5fb1620d0fb226e60748b41c871e4c8726e60748b41c871e4c872d62b4e7621110557f42c
2014-02-18 18:08:10 -06:00
Nate Jensen
ce2568b36b
Merge "Issue #2672 Fix radar dataaccess from pure python." into development
...
Former-commit-id: dd821703b682fde2011c698a4f827d713ec598c3698a4f827d713ec598c379cbb8d79a05edfb90d5
2014-02-18 17:35:39 -06:00
Mike Duff
5b1250208e
Issue #2596 - Add check for null coordinates.
...
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75
Former-commit-id: a370e81065283b0c670ca6509aad8c9754f0d8dda6509aad8c9754f0d8ddecb0d45b2440b0540830
2014-02-18 17:32:32 -06:00
Nate Jensen
2f1c0109b1
Merge "Issue #2756 new collaboration openfire plugin and http service" into development
...
Former-commit-id: 961239e181ac0a10678b020d54c48ab08d96b1e8020d54c48ab08d96b1e8a6bb05f2e34bb0997749
2014-02-18 14:51:13 -06:00
Ben Steffensmeier
3b183b18f0
Issue #2672 Fix radar dataaccess from pure python.
...
Former-commit-id: 804bf6a8edadd98f22b13e0cba04c0e19b4518ef3e0cba04c0e19b4518ef399e3d3f072be385e6b8
2014-02-18 13:57:28 -06:00
Lee Venable
29dbb922b8
Merge "Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now." into development
...
Former-commit-id: 03d23a194e7f3b6413e6adec7acc7cd9bccda151adec7acc7cd9bccda1518b8c5d2258e74e805bb6
2014-02-18 12:21:30 -06:00
Ron Anderson
317494f1c6
Merge "Issue #2758 Fix MHSEmulator to pass small files" into development
...
Former-commit-id: 9c9696faaffc5aa71b86a860ff3e6e7ab79d8b3aa860ff3e6e7ab79d8b3a33adfffab95c08871d87
2014-02-18 12:12:25 -06:00
Nate Jensen
61ec0df1c9
Merge "Issue #2793 improved collaboration disconnect handling" into development
...
Former-commit-id: d4cc8b18271738248facc63289fa14b3c45b303cc63289fa14b3c45b303c173c6465762e468e9ec1
2014-02-18 11:22:19 -06:00
Brian Clements
0d7ae9a2ff
Issue #2793 improved collaboration disconnect handling
...
collaboration was being shutdown even though smack was trying to reconnect
changed to notify of disconnect, but not shutdown until reconnect fails
Former-commit-id: 1c8f5dd5799095a1584fa28fcf0dc57028f7fd4da28fcf0dc57028f7fd4d510c39713f9d9c4c7c27
2014-02-18 11:11:33 -06:00
Brian Clements
74d08f1d19
Issue #2756 new collaboration openfire plugin and http service
...
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML
Former-commit-id: 68fac79fe7f0c89ef6c6f6b28274345b4f1e8288f6b28274345b4f1e8288a1d9e40bd402319f36e4
2014-02-18 10:03:12 -06:00
Brian Clements
b4f07d06d8
Issue #2755 removed subscription plugin jar from rpms
...
Former-commit-id: fa44883db0944a874c5bd4f3fe7629248db98ddfd4f3fe7629248db98ddf5faad2ccca08bffb26ca
2014-02-18 09:00:21 -06:00
Nate Jensen
f348686037
Merge "Issue #2751 fixed blocked icon for roster entries" into development
...
Former-commit-id: 35b4de06400228d24f1de70f0d21abaa7413fd4ce70f0d21abaa7413fd4cf1b7bf1c2ac3756326a6
2014-02-18 08:48:00 -06:00
Brian Clements
f5a25c9030
Issue #2751 fixed blocked icon for roster entries
...
previous refactor broke type check for blocked icon logic
moved blocked icon logic to subclass that handles roster tree labels
Former-commit-id: ab8f47413fe894019715a94b366e263307f5ea5ea94b366e263307f5ea5e476d0c325702d3a9ae7e
2014-02-17 17:11:36 -06:00
Brian Clements
430832e3e5
Issue #2800 added equals/hashcode to classes used in roster tree
...
tree view uses hashmap to decide if a node is new
tree was collapsing groups/sessions on refresh since it thought they were new nodes
Former-commit-id: ca8869b8ef6d716863323b5648c0553dfd8fbafb3b5648c0553dfd8fbafb9dc2967e3f0d07e417fc
2014-02-17 16:39:43 -06:00
Bryan Kowal
dc3c609086
Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now.
...
Amend: add a default value for localization site in the pure overrider.
Change-Id: I6056c274a10def96ba69786b58ba284146e49160
Former-commit-id: 8493f0581fbb3a067f93f5afe830a7e0b0d88e46f5afe830a7e0b0d88e46d4ce52459eb5d4574294
2014-02-17 14:41:10 -06:00
Nate Jensen
7ad4c20f9c
Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
...
Former-commit-id: a416577b252367c79c1c5675869906f4260a617e5675869906f4260a617e96014c806d1639f43f50
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
028bfc35f6
Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
...
Former-commit-id: 386b6a24992cf496ca84937b3071d4ca90137801937b3071d4ca901378010f6f60a132fb5b367ecc
2014-02-17 14:02:57 -06:00
Nate Jensen
0f317fd808
Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
...
Former-commit-id: ed76393cd80fe984258230632fbd84063d85ee2230632fbd84063d85ee22996663ccee1169f85a3b
2014-02-17 11:22:53 -06:00
Max Schenkelberg
748a81d884
Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
...
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc
Former-commit-id: 554e0caec51de140a526acad6702296a2a33abe1acad6702296a2a33abe191f707537bff9fdc63b0
2014-02-17 11:07:45 -06:00
Nate Jensen
d3c66cb748
Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
...
Former-commit-id: fa87ba313856aa06888f723ff23ee9f3d107580f723ff23ee9f3d107580fdbc420e917b1c976ac17
2014-02-14 10:50:38 -06:00
Max Schenkelberg
db72c9efca
Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
...
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df
Former-commit-id: 38aae37f014d656b5d066309f9b34bc8e93190f26309f9b34bc8e93190f23571135645b311aba5d5
2014-02-14 10:47:42 -06:00
Ron Anderson
c77d1c7e95
Issue #2758 Fix MHSEmulator to pass small files
...
Change-Id: I760be79c1119708bdcc0ed472b575d9f88fd5707
Former-commit-id: 0f73b51155027cb2ef914309016948acf250cf4d4309016948acf250cf4dd7170d1ea8dabeb6272d
2014-02-13 15:53:15 -06:00
Nate Jensen
740e71adba
Issue #2751 first cut of transfer leadership
...
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9
Former-commit-id: 47b27c602f63d5f94cbbe05f1eae96a85575a763e05f1eae96a85575a76311fb06810f139479b4e1
2014-02-13 15:35:53 -06:00
Nate Jensen
2772ad3c9c
Merge "Issue #2700 fixed subscribe request group input" into development
...
Former-commit-id: ec6d8585e1f2b32fa1ae2643d01b74d8e2d2837e2643d01b74d8e2d2837eb31470f7e31f3c4090a0
2014-02-13 14:02:55 -06:00
