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
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
Brian Clements
1cc21dc160
Issue #2751 user identity refactor
...
VenueParticipant no longer a subtype of UserId
New interface for both
refactored base classes to be generic for user types
Former-commit-id: ef52908906ef529089060ac7ff81cf3ec3ad0543
2014-02-13 13:51:39 -06:00
Brian Clements
8b618ea95b
Issue #2700 fixed subscribe request group input
...
user was being added to roster twice, the second time overwrote the group info
changed dialog to pass group info back so we only add once
Former-commit-id: 579f7c826d579f7c826dcaa8360ac7bafe2972a4
2014-02-13 09:47:02 -06:00
Ben Steffensmeier
9cc950cf06
Issue #2672 Fix problems encountered in data access layer.
...
Former-commit-id: 41983df7a041983df7a0835bcc695dd85014e363
2014-02-12 18:37:02 -06:00
Nate Jensen
78f8a9fbe3
Merge "Issue #2799 fixed double click chat not working for roster entries" into development
...
Former-commit-id: 6093312861609331286194b8b7eb04b9e027059f
2014-02-12 17:34:27 -06:00
Nate Jensen
423510ca06
Merge "Issue #2648 Add AlertMessage output. Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e" into development
...
Former-commit-id: b79e5e02f9b79e5e02f9fe139ac87f8ee9d781a2
2014-02-12 17:34:15 -06:00
Ben Steffensmeier
27165c51b8
Issue #2648 Add AlertMessage output.
...
Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e
Former-commit-id: f45ec64979f45ec64979c96be7613c4cffeac65f
2014-02-12 17:08:23 -06:00
Brian Clements
5b95f2a058
Issue #2799 fixed double click chat not working for roster entries
...
Former-commit-id: 1bf3a090561bf3a090569d7490a158f22268295e
2014-02-12 17:06:44 -06:00
Brian Clements
57dd054176
Issue #2797 fixed presence bug
...
a defensive copy was needed when sending presence to rooms
Former-commit-id: 81ddf87b0481ddf87b0423e203902809859bdee9
2014-02-12 16:54:46 -06:00
Richard Peter
06e025de7d
Merge "Issue #2655 fix textlightning distribution regex" into development
...
Former-commit-id: 70e9bef75070e9bef7503feee2cf50ca851b6d2e
2014-02-12 15:34:43 -06:00
Nate Jensen
6e33812072
Merge "Issue #2793 improved error handling for packet extension" into development
...
Former-commit-id: eec72c5956eec72c59565e6656581b7247d69202
2014-02-12 15:06:43 -06:00
Nate Jensen
72330e9b62
Issue #2655 fix textlightning distribution regex
...
Change-Id: Ia8900e8baa05d831c984fbf355034ca189364d99
Former-commit-id: a6c562d3f0a6c562d3f016d6a29bb93b918cee5f
2014-02-12 15:03:45 -06:00
Brian Clements
73241ebeb7
Issue #2793 improved error handling for packet extension
...
any exception thrown while parsing packets disconnects stream
changed to logging parsing problems and returning empty payload so we stay connected
added null check when sending to topic
Former-commit-id: e381edcd60e381edcd60b0714ba6594406477877
2014-02-12 14:22:33 -06:00
Brian Clements
8e9f1136ae
Issue #2699 require non blank handle
...
previously defaulted to userid if handle left blank
now reprompts for handle
preferences now default to userid to pre-fill handle
Former-commit-id: 0765451a9d0765451a9dddf5b2a3effab4fea177
2014-02-12 09:13:48 -06:00
Slav Korolev
a7d8cfb651
Issue #2763 . Made LFCR correction of input data.
...
Former-commit-id: 43802c3a5f43802c3a5f47fc09a684239f37f467
2014-02-11 14:48:07 -05:00
Ben Steffensmeier
38c9773f38
Issue #2672 Allow One extra null byte in RemoteRequestRouteWrapper.
...
Former-commit-id: 3d08979eee3d08979eee40bc9df420a0227d2c4e
2014-02-10 17:39:32 -06:00
Nate Jensen
9f07a9431d
Merge "Issue #2778 fix bug in JUtilHandler.py where size was None. Also made the registrations an OrderedDict for falling back so we can order how we fall back" into development
...
Former-commit-id: 93c84e2f9593c84e2f9506679bbd46733c21051c
2014-02-10 11:26:10 -06:00
Matt Nash
053615e387
Issue #2778 fix bug in JUtilHandler.py where size was None. Also made the registrations an OrderedDict for falling back so we can order how we fall back
...
Change-Id: I31120de5d206ddcade83e2c5455742deb1d6598a
Former-commit-id: 4252e589924252e589921ecc4541cff300282a22
2014-02-10 08:40:25 -06:00
Brian Clements
014b59e1a1
Issue #2699 removed over cautious handle validation
...
xmpp does not limit the characters that can go in a handle
fixed id from room parsing to account for special characters
Former-commit-id: 7d6e116b9f7d6e116b9f6518b88fe58742be3a13
2014-02-07 10:06:06 -06:00
Ben Steffensmeier
32c8f9f149
Issue #2672 Handle envelopes in data access requests of points and lightning.
...
Change-Id: Id9a56e9f8027a2f489561c241e2f34dd92dce400
Former-commit-id: 25ad0e327c25ad0e327cec8514000f19cb907ac8
2014-02-06 14:04:14 -06:00
Ben Steffensmeier
1be7b9c7dc
Issue #2672 Fix serialization of jts envelopes.
...
Former-commit-id: 97eef922ef97eef922efa068650e4343df5b25d9
2014-02-06 11:27:07 -06:00
Nate Jensen
e342242032
Merge "Issue #2672 Handle envelopes in data access requests of gridded types. Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c" into development
...
Former-commit-id: d863bf208cd863bf208cf00d4c54d88feed9aadf
2014-02-05 17:09:17 -06:00
Ben Steffensmeier
70cbd6c61d
Issue #2672 Handle envelopes in data access requests of gridded types.
...
Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c
Former-commit-id: 9c439866d59c439866d5dc5b5526a302a0874646
2014-02-05 15:57:08 -06:00
Slav Korolev
65ea06a366
Issue #2757 . Added filter for removed stations and cleaned code.
...
Change-Id: I9998cf3bd20b2ec43956284257ee3dfcb8b52534
Former-commit-id: c7c40a3467c7c40a3467fa59172d874ec22d9530
2014-02-04 15:21:22 -05:00
Brian Clements
9370df47fe
Issue #2699 fixed assumption that usersearch was exact
...
usersearch returns matches for any part of string
added method to restrict to exact matches only
Former-commit-id: cfa3c9e0e8cfa3c9e0e86ea009a2e1aff354a3d7
2014-02-03 15:34:58 -06:00
Greg Armendariz
ac169b4f24
Issue #2754 - Fix import
...
Former-commit-id: e611dbe912e611dbe9122e7965841723f17b3f63
2014-02-03 14:45:47 -06:00
Lee Venable
e65a289e97
Merge "Issue #2757 . Fixed issues in Area Configuration Dialogs." into development
...
Former-commit-id: 19b883a40719b883a407c44b12017615f94a61b5
2014-02-03 14:31:28 -06:00
Nate Jensen
5c4a0f61be
Merge "Issue #2699 added handle config to prefs" into development
...
Former-commit-id: 0c569ed4070c569ed407f796e81400486702d99e
2014-02-03 14:23:23 -06:00
Brian Clements
671bfaa75c
Issue #2699 added handle config to prefs
...
default handle autofills session dialogs
is also used to connect to feed venue (error popup if already taken)
Former-commit-id: 1ff4ed1ae91ff4ed1ae916c1aaed3e7c867338c8
2014-02-03 12:59:57 -06:00
Greg Armendariz
b06cf0eb70
Merge "Issue #2754 - Remove commons logging calls" into development
...
Former-commit-id: 4926d89aec4926d89aec0b8031caa81f41ea93a4
2014-02-03 12:24:20 -06:00
