Mike Duff
02fa0d3c59
Issue #2632 - Implement buddy pounce (Contact Notifiers)
...
Review comments
Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7
Former-commit-id: 5440ff64d15440ff64d15f433b4f6bee06fc58b5
2014-02-28 13:23:34 -06:00
Brian Clements
4abf737852
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: 3f362519aa3f362519aa386e9cc96ab9c9be4c4f
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
7e29aa25a9
Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
...
Former-commit-id: 70ae37230370ae372303e08d4f77c3a6bf896593
2014-02-21 17:37:19 -06:00
Richard Peter
0951bec15c
Merge "Issue #2828 Added purge cron to Central SBN Simulator." into development
...
Former-commit-id: e923639fb1e923639fb158a3aac09d5937649085
2014-02-21 11:26:26 -06:00
Nate Jensen
d75023418b
Merge "Issue #2631 - Set preference defaults in the Activator. Removed unused file." into development
...
Former-commit-id: 9a3f60a2169a3f60a216dd00fd14457b1cf570f4
2014-02-20 17:55:35 -06:00
Brad Gonzales
675477ed66
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: 12e22752c212e22752c2bd25ec4cd908c4d1afea
2014-02-20 16:31:16 -06:00
Mike Duff
5014499431
Issue #2631 - Set preference defaults in the Activator.
...
Removed unused file.
Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e
Former-commit-id: ed5cb91406ed5cb91406a7b1e79d2dd90f4495c2
2014-02-20 15:09:10 -06:00
Ron Anderson
2eb6cb45e3
Issue #2824 Registered with SiteAwareRegistry so we can stop fetching when site is deactivated.
...
Change-Id: I4e277656a971e7927aa2321e91ba7304351f9405
Former-commit-id: 6a7e4a147d6a7e4a147d6ccf6a56e7d63ad1b1de
2014-02-20 12:32:31 -06:00
Brian Clements
e3973b9fc7
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: aaa2de20f4aaa2de20f489a48c3f6b4b7ba54dc3
2014-02-20 11:50:54 -06:00
Brian Clements
d218686d1f
Issue #2751 implemented room/topic ownership transfer
...
Former-commit-id: c3cadff705c3cadff705ab72938246d9ac2c0037
2014-02-20 11:10:14 -06:00
Ron Anderson
32b8cc8a8e
Merge "Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used" into development
...
Former-commit-id: c13942140ac13942140a6f4a63000dc07544b904
2014-02-20 09:55:56 -06:00
Ron Anderson
7897be61e2
Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used
...
Change-Id: I9a100fe3b1a9c8dc94639029d6380f36f5ba4da7
Former-commit-id: 6b6aa14e596b6aa14e5908a1be844d1571b9a8eb
2014-02-20 09:34:18 -06:00
Nate Jensen
9e261c9c22
Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
...
Former-commit-id: 3078b692733078b692735856957c575412b72c57
2014-02-19 17:22:00 -06:00
Nate Jensen
8f73511086
Merge "Issue #2761 add region level to localization" into development
...
Former-commit-id: 9011e1b31e9011e1b31e6e59175ce4b1e2788958
2014-02-19 17:18:24 -06:00
Nate Jensen
dafb323edb
Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
...
Former-commit-id: df376abcb7df376abcb7f99cf7df478b152a8027
2014-02-19 16:19:27 -06:00
Ron Anderson
db9cc1e6b5
Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
...
Former-commit-id: 98d2417f9498d2417f94b8c00d8ead7e7f0abfdc
2014-02-19 15:39:56 -06:00
Mike Duff
92d356f4f0
Issue #2631 - Add sound preference for users joining a room.
...
review comments
Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207
Former-commit-id: 663ea8decd663ea8decd95fcee385a3100a71f34
2014-02-19 15:26:14 -06:00
Mike Duff
06b243a7fd
Issue #2628 - Change cast from short to int for MPE colorbar
...
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c
Former-commit-id: 682c6af456682c6af456183657fb3386fce9d547
2014-02-19 15:20:29 -06:00
Nate Jensen
696937bfcc
Merge "Issue #2751 fixed chat room bugs" into development
...
Former-commit-id: 4b4cca776f4b4cca776fc72e2be9697099b45023
2014-02-19 14:52:24 -06:00
Lee Venable
67f6df9784
Merge "Issue #2734 - default time range to 24 hours." into development
...
Former-commit-id: 8e967e8e598e967e8e59e204b350ee9cb8925e51
2014-02-19 12:33:46 -06:00
Ron Anderson
b0a4b63689
Issue #2819 Removed more unnecessary .clone() calls
...
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 5258aecf455258aecf45419e9d0b8d8a41723ba6
2014-02-19 11:55:11 -06:00
Slav Korolev
f09add5f92
Issue #2652 . Fixed issue with edex-text-ingest log. Deleted unused code.
...
Change-Id: Id84e813047342a49988f78c1c9e13c356305e11b
Former-commit-id: a597ac0989a597ac09893b1ea13cb18ec2d02f52
2014-02-19 12:01:06 -05:00
Mike Duff
e6fb8413b9
Issue #2734 - default time range to 24 hours.
...
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d
Former-commit-id: 19033601bf19033601bf0b316f7bd97710724c5a
2014-02-19 10:23:48 -06:00
Matt Nash
3b39e1d2bc
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: 2d20e84f6a2d20e84f6a1835019567bb10484bd0
2014-02-19 10:01:25 -06:00
Brian Clements
ddc0945e40
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: dc074a9650dc074a96503a135b8eacbee7cdb71a
2014-02-19 08:32:26 -06:00
Lee Venable
875ebbd2e1
Merge "Issue #2596 - Add check for null coordinates." into development
...
Former-commit-id: 6e60748b416e60748b41c871e4c872d62b4e7621
2014-02-18 18:08:10 -06:00
Nate Jensen
93458ab911
Merge "Issue #2672 Fix radar dataaccess from pure python." into development
...
Former-commit-id: 698a4f827d698a4f827d713ec598c379cbb8d79a
2014-02-18 17:35:39 -06:00
Mike Duff
7ba61e6b53
Issue #2596 - Add check for null coordinates.
...
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75
Former-commit-id: a6509aad8ca6509aad8c9754f0d8ddecb0d45b24
2014-02-18 17:32:32 -06:00
Nate Jensen
3c9ebe52d3
Merge "Issue #2756 new collaboration openfire plugin and http service" into development
...
Former-commit-id: 020d54c48a020d54c48ab08d96b1e8a6bb05f2e3
2014-02-18 14:51:13 -06:00
Ben Steffensmeier
4e57fcf1f2
Issue #2672 Fix radar dataaccess from pure python.
...
Former-commit-id: 3e0cba04c03e0cba04c0e19b4518ef399e3d3f07
2014-02-18 13:57:28 -06:00
Lee Venable
3d2cbdcd21
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: adec7acc7cadec7acc7cd9bccda1518b8c5d2258
2014-02-18 12:21:30 -06:00
Ron Anderson
97e125cbd2
Merge "Issue #2758 Fix MHSEmulator to pass small files" into development
...
Former-commit-id: a860ff3e6ea860ff3e6e7ab79d8b3a33adfffab9
2014-02-18 12:12:25 -06:00
Nate Jensen
b1dc1e8849
Merge "Issue #2793 improved collaboration disconnect handling" into development
...
Former-commit-id: c63289fa14c63289fa14b3c45b303c173c646576
2014-02-18 11:22:19 -06:00
Brian Clements
3bf2a08c57
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: a28fcf0dc5a28fcf0dc57028f7fd4d510c39713f
2014-02-18 11:11:33 -06:00
Brian Clements
5889341612
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: f6b2827434f6b28274345b4f1e8288a1d9e40bd4
2014-02-18 10:03:12 -06:00
Brian Clements
a8dfacc21b
Issue #2755 removed subscription plugin jar from rpms
...
Former-commit-id: d4f3fe7629d4f3fe7629248db98ddf5faad2ccca
2014-02-18 09:00:21 -06:00
Nate Jensen
a08dea4b08
Merge "Issue #2751 fixed blocked icon for roster entries" into development
...
Former-commit-id: e70f0d21abe70f0d21abaa7413fd4cf1b7bf1c2a
2014-02-18 08:48:00 -06:00
Brian Clements
6574733eba
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: a94b366e26a94b366e263307f5ea5e476d0c3257
2014-02-17 17:11:36 -06:00
Brian Clements
cd7abc37fc
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: 3b5648c0553b5648c0553dfd8fbafb9dc2967e3f
2014-02-17 16:39:43 -06:00
Bryan Kowal
f5e65b5e56
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: f5afe830a7f5afe830a7e0b0d88e46d4ce52459e
2014-02-17 14:41:10 -06:00
Nate Jensen
e4fb5e0067
Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
...
Former-commit-id: 56758699065675869906f4260a617e96014c806d
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
47c3c6845b
Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
...
Former-commit-id: 937b3071d4937b3071d4ca901378010f6f60a132
2014-02-17 14:02:57 -06:00
Nate Jensen
a5bf31934f
Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
...
Former-commit-id: 30632fbd8430632fbd84063d85ee22996663ccee
2014-02-17 11:22:53 -06:00
Max Schenkelberg
d06e5fc107
Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
...
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc
Former-commit-id: acad670229acad6702296a2a33abe191f707537b
2014-02-17 11:07:45 -06:00
Nate Jensen
4963b3cc23
Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
...
Former-commit-id: 723ff23ee9723ff23ee9f3d107580fdbc420e917
2014-02-14 10:50:38 -06:00
Max Schenkelberg
d374fc9f5d
Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
...
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df
Former-commit-id: 6309f9b34b6309f9b34bc8e93190f23571135645
2014-02-14 10:47:42 -06:00
Ron Anderson
650818a98c
Issue #2758 Fix MHSEmulator to pass small files
...
Change-Id: I760be79c1119708bdcc0ed472b575d9f88fd5707
Former-commit-id: 43090169484309016948acf250cf4dd7170d1ea8
2014-02-13 15:53:15 -06:00
Nate Jensen
70285796ac
Issue #2751 first cut of transfer leadership
...
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9
Former-commit-id: e05f1eae96e05f1eae96a85575a76311fb06810f
2014-02-13 15:35:53 -06:00
Nate Jensen
3fb847a74c
Merge "Issue #2700 fixed subscribe request group input" into development
...
Former-commit-id: 2643d01b742643d01b74d8e2d2837eb31470f7e3
2014-02-13 14:02:55 -06:00
Nate Jensen
0b24e2ca7c
Merge "Issue #2751 user identity refactor" into development
...
Former-commit-id: ee5b9b65bfee5b9b65bf38bd5b3d5234906d5464
2014-02-13 14:01:53 -06:00
