Commit graph

2723 commits

Author SHA1 Message Date
Nate Jensen
34d3fc8290 Merge "Issue #2651 Synchronize ResourceList.removeRsc." into development
Former-commit-id: aff68ba134 [formerly d6862c2b02] [formerly 888d81edf429e0f9db860ba01ea462d2db99dee6 [formerly e2dfdb01b7]] [formerly 0bf6222d1e [formerly e2dfdb01b7 [formerly af27de2a1e1d613da2b75519f4679762e32ff7d3]]]
Former-commit-id: 0bf6222d1e
Former-commit-id: e526a8b4b05cbced58e5a091e619c30885fbca42 [formerly 83c27d7025]
Former-commit-id: dcd1906332
2014-01-20 09:23:24 -06:00
Mike Duff
5097ed2ad7 Issue #2459 - Remove unscheduled status from UI
Former-commit-id: e6efbf5663 [formerly 0cfa9ee36c] [formerly 93cb80cfc7] [formerly 25d1d39fc2 [formerly 93cb80cfc7 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]]]
Former-commit-id: 25d1d39fc2
Former-commit-id: 77ea703f0626d7ff1caa2689bf5deb3e8b0b0c00 [formerly a04430e334]
Former-commit-id: a492ec6a4d
2014-01-17 15:34:48 -06:00
Ben Steffensmeier
18d5f8e758 Issue #2651 Synchronize ResourceList.removeRsc.
Former-commit-id: 63ad599a0e [formerly 15c08d7209] [formerly a580fc74b7] [formerly d8263b358d [formerly a580fc74b7 [formerly f0ecb93ab2934edaab06409b04b21d40ed6e5ff8]]]
Former-commit-id: d8263b358d
Former-commit-id: b2ba0007c44eefdeb638bd1e2c75c45504ab281b [formerly 18437701d9]
Former-commit-id: a4ce57502c
2014-01-17 11:58:00 -06:00
Nate Jensen
081ad146af Merge "Issue #2313 Image canvas rendering. Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417" into development
Former-commit-id: a20f8e437d [formerly 1bf74c5919] [formerly a431fa2bd9] [formerly 2d5dede634 [formerly a431fa2bd9 [formerly f343371577210225865239aef14a40b529de86ad]]]
Former-commit-id: 2d5dede634
Former-commit-id: 504cabc0959eb05d51ee736967b2bf5aa9280980 [formerly 1405fb3376]
Former-commit-id: 4aa2dbfbc5
2014-01-17 11:36:30 -06:00
Nate Jensen
2db509e59f Merge "Issue #2646 Fix Drawing layer NPE." into development
Former-commit-id: ab73bcad2d [formerly 211f7a1bf0] [formerly bad984f103] [formerly f85f54d2ae [formerly bad984f103 [formerly c8975c8b00feb8ab5dfa97d8f78bf54ab7290b90]]]
Former-commit-id: f85f54d2ae
Former-commit-id: ca0ca62010ed05466c5c5eefad134115c938c427 [formerly edc2c700c8]
Former-commit-id: e8bfb55387
2014-01-17 10:50:38 -06:00
Ben Steffensmeier
6df6690785 Issue #2646 Fix Drawing layer NPE.
Former-commit-id: 6ed57a4326 [formerly f31f7dc53a] [formerly 068a9c6efb] [formerly 5cbe38aade [formerly 068a9c6efb [formerly 1e5f3e1375ec3d9485863b38e6926e95e7b3921e]]]
Former-commit-id: 5cbe38aade
Former-commit-id: 60e91275a1e27856c383678c6751b198b8bedd38 [formerly e1fe6136ee]
Former-commit-id: d43a97c51e
2014-01-17 10:41:53 -06:00
Ben Steffensmeier
331b49ee85 Issue #2313 Image canvas rendering.
Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417

Former-commit-id: 7656304906 [formerly 76414243ba] [formerly 625aac3ed3] [formerly 16c350f0c6 [formerly 625aac3ed3 [formerly 0f8d0c52093a14d16a36ce353c2587633474007d]]]
Former-commit-id: 16c350f0c6
Former-commit-id: f4c38ab8bac2347fb297605b675187a44fc3e2c2 [formerly 1973e5e015]
Former-commit-id: 19930b7c8b
2014-01-16 17:05:16 -06:00
gerritcm
c1df3eb55c 14.1.1-16 baseline
Former-commit-id: 57472968be [formerly 9e935404d8] [formerly 6be938e6eb] [formerly b84f7d4203 [formerly 6be938e6eb [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]]]
Former-commit-id: b84f7d4203
Former-commit-id: 8a149ceb12545503e179389c0569fad3eefaed15 [formerly 644da23327]
Former-commit-id: b72cd19055
2014-01-16 16:43:05 -05:00
Lee Venable
1f51e0e218 Issue #2691 - Fixed null pointer exception when closing MPE perspective.
Former-commit-id: 7369e58fad [formerly 24a4cafd0c] [formerly 8405e235e6] [formerly b435fd3050 [formerly 8405e235e6 [formerly fa5315a2874b91acaac4f5eb58142804a6a09ef8]]]
Former-commit-id: b435fd3050
Former-commit-id: 3e9e28a9e6d59237117b55c63bbb1de8dbd573e0 [formerly bc07967e3b]
Former-commit-id: a859b50881
2014-01-16 10:35:12 -06:00
Nate Jensen
d0b3c3bc48 Merge "Issue #2661 Use only u,v to represent vector grids in derived parameters and D2D. Change-Id: I7ea007f0f919017e8212716cc15712c7ed611e69" into development
Former-commit-id: 1d1f4175d0 [formerly 65306a503e] [formerly a71ef7b581] [formerly 518a3165e4 [formerly a71ef7b581 [formerly 56fd57c3e00926c95ab05297772161e960586e8f]]]
Former-commit-id: 518a3165e4
Former-commit-id: 8ecb1e7f45b5b32d1ad43a493b683b92b14d074a [formerly 104a0a2de2]
Former-commit-id: d4db973df1
2014-01-16 09:06:10 -06:00
Ben Steffensmeier
84b00e0970 Issue #2661 Use only u,v to represent vector grids in derived parameters and D2D.
Change-Id: I7ea007f0f919017e8212716cc15712c7ed611e69

Former-commit-id: 6c2d88015f [formerly 8b23f32311] [formerly ee11e5d13c] [formerly ac33fb9463 [formerly ee11e5d13c [formerly a8bcec4a2fa9ddd49dc300ebd63aebfdfb41723e]]]
Former-commit-id: ac33fb9463
Former-commit-id: 991162dcb72a27484a63e9f7e13632171f60ae34 [formerly be163ebf2a]
Former-commit-id: b2b2136868
2014-01-16 09:03:50 -06:00
Nate Jensen
9f4360fdda Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: 26ce19331e [formerly 9028260386] [formerly ae10129713] [formerly 9d529b3b21 [formerly ae10129713 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]]
Former-commit-id: 9d529b3b21
Former-commit-id: 194b6af74ffb08201bff51fb4de3ff2d6d3448d9 [formerly 1be41d69c6]
Former-commit-id: 98e1bf9194
2014-01-15 17:36:30 -06:00
Nate Jensen
c1e42e49e9 Merge "Issue #2630 added away timeout for collaboration inactivity" into development
Former-commit-id: 181994548e [formerly 8420f87348] [formerly 70fbdbfd0bcaaf3ddbadf5bfde88aa15020dae99 [formerly bdb4d8bdeb]] [formerly eafe61cd37 [formerly bdb4d8bdeb [formerly 14d419fdd187e4e1e537590e626ec33d3f5b071f]]]
Former-commit-id: eafe61cd37
Former-commit-id: 0bddc08432f572efd0ebc61e9e5e47a4becfcea3 [formerly 46dfbe9334]
Former-commit-id: 5504ec1efd
2014-01-15 13:48:13 -06:00
Nate Jensen
472cf2905c Issue #2359 printout connection exceptions to aid in diagnosing
connectivity problems

Change-Id: I957abb82cd3a736485f289a266b00cdbd89a578c

Former-commit-id: aa0639a878 [formerly ccaa9dbde1] [formerly fc6b31c1c0] [formerly 5f39322d59 [formerly fc6b31c1c0 [formerly 8d7445a4ba4b76335166569de32c00bac1a2a84b]]]
Former-commit-id: 5f39322d59
Former-commit-id: 6ed8c7d69c73010ecba0450f2c9d1203bc9f3ab4 [formerly deb57e3b35]
Former-commit-id: 4533642f26
2014-01-15 13:39:28 -06:00
Brian Clements
998e8ca8c2 Issue #2630 added away timeout for collaboration inactivity
eclipse job in connection subscriber
preferences added to collaboration prefs page


Former-commit-id: b9c1e59353 [formerly 7e952c5ba8] [formerly 24190efb75] [formerly 57fb953b8d [formerly 24190efb75 [formerly c6fded1429e44033bb989c1d9caaac87c72eb440]]]
Former-commit-id: 57fb953b8d
Former-commit-id: e2a3bebef2dc240ed45242a0f8d5e55ec133f6ab [formerly 53273c4e5a]
Former-commit-id: 7410c36783
2014-01-15 13:20:25 -06:00
Brian Clements
46c751d7da Issue #2630 fixed status parsing bug
status from preference store wasn't being parsed correctly
changed connection data to store as Mode object instead of string
added parse method to collaboration utils


Former-commit-id: e3f615b2b7 [formerly 45b5df24d4] [formerly 79446d983b] [formerly bf6cf2f2ee [formerly 79446d983b [formerly 0176ba7963a5ff5bbd37b2e0867cbf97f4a3ef66]]]
Former-commit-id: bf6cf2f2ee
Former-commit-id: 053ba48475681c6ca6bde16071dbe1d6807e277a [formerly 1219713128]
Former-commit-id: bfbcbf382a
2014-01-15 10:24:09 -06:00
Mike Duff
c5f28e0f37 Issue #2459 - Refactor the subscription status
Former-commit-id: 43810aa5f5 [formerly d03c012a54] [formerly f94593867e] [formerly 245d76358e [formerly f94593867e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]
Former-commit-id: 245d76358e
Former-commit-id: ebd7027d07dcf26d5e0b30ecd0d661a72afa18e1 [formerly d96a9d2937]
Former-commit-id: 9a45b95db6
2014-01-15 09:21:30 -06:00
Brian Clements
d53024b73f Issue #2594 added low memory warning job
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files


Former-commit-id: 8d6a469928 [formerly c63c8e2fc6] [formerly f9a8b68da5] [formerly 0076ec9aaf [formerly f9a8b68da5 [formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]]]
Former-commit-id: 0076ec9aaf
Former-commit-id: 99fc908864fba07455340f77fae46faf16981fcf [formerly e420ae009d]
Former-commit-id: 496d15d77f
2014-01-14 17:05:28 -06:00
Ron Anderson
46735c9afe Merge branch 'master_14.1.1' into solutions
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]
Former-commit-id: 62c445d872
Former-commit-id: 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e]
Former-commit-id: dca7f21f7b
2014-01-13 17:45:20 -06:00
Nate Jensen
8101a9fb70 Merge "Issue #2594 made heap status monitor default on launch" into development
Former-commit-id: e65c983653 [formerly 8d4d024617] [formerly 542bbd88bc] [formerly 09082cc89e [formerly 542bbd88bc [formerly 0907626a01c547a49d89d6cf15f479271dd0e0fe]]]
Former-commit-id: 09082cc89e
Former-commit-id: 42dd2d0efa21b3ab92b9121fca34f516371e73da [formerly 4d6bb9a75d]
Former-commit-id: 86d6e78d17
2014-01-13 13:01:29 -06:00
Nate Jensen
70035635ec Merge "Issue #2620 Reordered developer feature.xml to match p2-build.xml" into development
Former-commit-id: 10b6341adb [formerly 02f7b23f72] [formerly aba4acf355] [formerly bd44fec4eb [formerly aba4acf355 [formerly 2c9ce82cec838ac27153cfa1227b7bf787c1964b]]]
Former-commit-id: bd44fec4eb
Former-commit-id: 6ab8eb314426f4b3bc9fdde253d7d7e3cb7267d7 [formerly 708c77878f]
Former-commit-id: 4b9411854e
2014-01-13 09:33:26 -06:00
Richard Peter
1e10acc664 Merge "Issue #2452 - Add label stating all lat/lons will be converted to easting." into omaha_14.2.1
Former-commit-id: 434c05b458 [formerly bc4ad18fe9] [formerly 7bbefddcc1] [formerly e6d7acb609 [formerly 7bbefddcc1 [formerly 1855c0e2d601fd3c5b20d8ba58d157e9fb993b8b]]]
Former-commit-id: e6d7acb609
Former-commit-id: 08b064f5627b0585a3df75b960a722fde7817d6f [formerly 527408ddd4]
Former-commit-id: 5b687c7bd5
2014-01-10 15:42:48 -06:00
Brian Clements
42e259b83c Issue #2594 made heap status monitor default on launch
Former-commit-id: 3333d3b926 [formerly 4f37164fc5] [formerly 6ba1eb0edb] [formerly 4a62eb90dc [formerly 6ba1eb0edb [formerly 1ba7ebb59e28ba93bb752c32ffce937a4455d478]]]
Former-commit-id: 4a62eb90dc
Former-commit-id: 0c8dc064b7186b1457f6e9bd47835cc2ba812b79 [formerly 3d196a00dd]
Former-commit-id: cde78c4006
2014-01-10 14:54:14 -06:00
Mike Duff
c8885b34f1 Issue #2452 - Add label stating all lat/lons will be converted to easting.
Former-commit-id: 2e6173b619 [formerly 67f6311354] [formerly 69ca0dd0d2] [formerly 7081c26823 [formerly 69ca0dd0d2 [formerly 84bff804bc089aefcf126a586539eab590e1d04a]]]
Former-commit-id: 7081c26823
Former-commit-id: e5367b16239e543229d0aace6c8f70b5970faf5e [formerly 17d19cc0bb]
Former-commit-id: b616f34af2
2014-01-10 12:05:30 -06:00
Mike Duff
5f19ccc46e Issue #2642 - Update header comment
Former-commit-id: b70c96297f [formerly 5d669a97af] [formerly 101d9939d6] [formerly 28114764a5 [formerly 101d9939d6 [formerly 389426adddf3a78d9859f704ecc2241e453b5dc2]]]
Former-commit-id: 28114764a5
Former-commit-id: 32bb19308f502de6a22ca9009876c463c872be8c [formerly 7d25b33cb6]
Former-commit-id: 12c47ea375
2014-01-10 10:57:18 -06:00
Max Schenkelberg
6fa1f6cc12 Issue #2620 Reordered developer feature.xml to match p2-build.xml
Change-Id: I15a073d17b1e6df21c9c34245b373bc091cc5e67

Former-commit-id: a3495d01dc [formerly 13172879fd] [formerly ae7eb39380] [formerly 73c022da20 [formerly ae7eb39380 [formerly ea87ef4868b35b4fa89d519478ade9fb9468cca8]]]
Former-commit-id: 73c022da20
Former-commit-id: 5235d6c097888869951204c434aba9265b112a4a [formerly 8abc1ec611]
Former-commit-id: 59586b673b
2014-01-10 10:39:07 -06:00
Richard Peter
a25ad86347 Merge "Issue #2642 - Make shared sub deletions remove the site from the list" into omaha_14.2.1
Former-commit-id: 102bbe3e15 [formerly b37d6e9c91] [formerly 8ca1217f03] [formerly 52850fe95a [formerly 8ca1217f03 [formerly f5e5e1e66bf7264408e31b95ebf73d083b3cff0f]]]
Former-commit-id: 52850fe95a
Former-commit-id: 766dc3d39c99f73f010de1c29095aef2b852645e [formerly 690f1b15dd]
Former-commit-id: b833c4333c
2014-01-09 16:58:39 -06:00
Richard Peter
a2eef48cfb Merge "Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible." into omaha_14.2.1
Former-commit-id: a39f2bff20 [formerly 0bd52b65e7] [formerly b711c35c68] [formerly f45a281935 [formerly b711c35c68 [formerly 8f3f97302417e256cd110feb4ed56ca366cb1db8]]]
Former-commit-id: f45a281935
Former-commit-id: 8e88f0da68170bd6d7f37b03b43ebe72c7b0e3e4 [formerly 0459cd237e]
Former-commit-id: f4108b8be2
2014-01-09 16:53:52 -06:00
Ben Steffensmeier
05ebc3eece Issue #2647 Fix window focus problems.
Former-commit-id: eebab1d33f [formerly 13da8899de] [formerly 206754a3f8eac1e2ede760acafef51f7d6fa12a4 [formerly 2b9e9a41db]] [formerly 488d5e45b1 [formerly 2b9e9a41db [formerly 4b0053b20060ead87b34895ee7d03a4b6317c8fc]]]
Former-commit-id: 488d5e45b1
Former-commit-id: 7b56714a7309f567fe16d1c7a70ee9741297c5dc [formerly 0ada0c6d3f]
Former-commit-id: 1aa018e5b7
2014-01-09 15:14:38 -06:00
Nate Jensen
7b17f4eabf Merge "Issue #2563 added user server add/remove functionality" into development
Former-commit-id: c2a2a657bf [formerly f7adb31fc5] [formerly 7d0fc33055] [formerly 6fdf4361f8 [formerly 7d0fc33055 [formerly f343c7bc294f4c89c4ac75630910f153e61d24a3]]]
Former-commit-id: 6fdf4361f8
Former-commit-id: 9b4895ed93f0a2ae2e0b94f8d502c98a45ed7a60 [formerly 0351c26443]
Former-commit-id: aeffb73883
2014-01-09 13:44:24 -06:00
Brian Clements
9a28a4e067 Issue #2563 added user server add/remove functionality
now persists user entered servers to localization


Former-commit-id: 7279fbf6b3 [formerly af9292ea71] [formerly 487aa58778] [formerly c8cfc788f3 [formerly 487aa58778 [formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]]]
Former-commit-id: c8cfc788f3
Former-commit-id: a779f96749690d34c737ced63e146304783cc395 [formerly 0c5b0eaf69]
Former-commit-id: a8f746f794
2014-01-09 13:19:59 -06:00
Mike Duff
2a94a50ec8 Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible.
Former-commit-id: 41ac6a70dd [formerly e4f56affd3] [formerly 16a8f16ee4] [formerly 9b5adfaba2 [formerly 16a8f16ee4 [formerly 87dd0df07a9ef0e7881ed0cf7b8aa1d41f0c9d4d]]]
Former-commit-id: 9b5adfaba2
Former-commit-id: c5a413c1f93f4b03121d44e01630e558a6904c48 [formerly 7a1712acd6]
Former-commit-id: d2f74b6238
2014-01-09 13:02:08 -06:00
Max Schenkelberg
4085a38f94 Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b

Former-commit-id: 037cd48c62 [formerly 5d488d27b9] [formerly 83c600ada9] [formerly f4765d1577 [formerly 83c600ada9 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]
Former-commit-id: f4765d1577
Former-commit-id: 078c53e38b0dfbb2d2f1efc3df9341d3b037960b [formerly e4de3defec]
Former-commit-id: f10dcc6de3
2014-01-09 11:26:19 -06:00
Mike Duff
ff76fa081c Issue #2643 - Fixed the mouse checking on DD maps
Former-commit-id: 3d962a5425 [formerly 7b8964d9b2] [formerly 4fe2dc76af] [formerly 56499a77c3 [formerly 4fe2dc76af [formerly 775e99924e098387e4ca5042823ef20d1a0d2afe]]]
Former-commit-id: 56499a77c3
Former-commit-id: 276825c6d8c7a85fe6b1be0854404a47fc47b5c8 [formerly 09c5f29395]
Former-commit-id: 1c3b700563
2014-01-09 10:18:34 -06:00
Mike Duff
1c60e6e7cc Issue #2642 - Make shared sub deletions remove the site from the list
Former-commit-id: 7720852347 [formerly 0cb61d4d50] [formerly 6cff7aaf0c] [formerly 4e6b4eaa4c [formerly 6cff7aaf0c [formerly a8f57c338a8a06c6d40842f56c329fd9f215bc5b]]]
Former-commit-id: 4e6b4eaa4c
Former-commit-id: 87757eade8f87fee23058c260317eed10f66609c [formerly fdef5e97e2]
Former-commit-id: 0e081e8ee2
2014-01-09 10:15:48 -06:00
Nate Jensen
02a60c86ff Merge "Issue #2563 fixed room id creation" into development
Former-commit-id: 701efd5de9 [formerly 537dc6c8cc] [formerly f1533b069a94fcd70602fe9d0d8551219afef11e [formerly cbad156c05]] [formerly a8e9db0dde [formerly cbad156c05 [formerly a5d7f0a46a5304defe6ebde0b73418c0da168437]]]
Former-commit-id: a8e9db0dde
Former-commit-id: 1b9b5174b8f31578073feb91a2f11b6ec67ff985 [formerly 5beb950218]
Former-commit-id: 432a89c0fc
2014-01-07 13:50:41 -06:00
Brian Clements
e7602389b6 Issue #2563 fixed room id creation
room ids were being generated with the hostname used to connect to the server
they needed to be generated with what the server calls itself


Former-commit-id: 40763433f0 [formerly a78b1d96af] [formerly 82716fa147] [formerly 66df912a4e [formerly 82716fa147 [formerly 99fb102b270baa5c45f1c9963f47344ede93a34a]]]
Former-commit-id: 66df912a4e
Former-commit-id: ce480f2f3d00e3ac778f4d35236875333682e387 [formerly 649483d3fd]
Former-commit-id: 12c7371565
2014-01-07 13:04:24 -06:00
Nate Jensen
15c555bd0e Merge "Issue #2563 fixed default xmpp port" into development
Former-commit-id: 2de703f6e8 [formerly 26f37a2fd4] [formerly 92e1df8856] [formerly 87876790f8 [formerly 92e1df8856 [formerly 4aa2f1689442ce630c94b73ad6747acd93a9c1ff]]]
Former-commit-id: 87876790f8
Former-commit-id: 7d4ac4c2b24db7918d4a19a0abd00db4ed4b6787 [formerly 365c11c9db]
Former-commit-id: 527e0197be
2014-01-07 12:39:46 -06:00
Brian Clements
0193a9db0f Issue #2563 fixed default xmpp port
The default port for postgres was there by mistake


Former-commit-id: ea63496cc3 [formerly e08c5ea04c] [formerly e263cdb63a] [formerly dfcf6e9ade [formerly e263cdb63a [formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]]]
Former-commit-id: dfcf6e9ade
Former-commit-id: 44850ca1b4681434bdd6bef977c019dc3e5fc792 [formerly 27b4ec6df6]
Former-commit-id: 373feec7f5
2014-01-07 10:52:50 -06:00
Slav Korolev
679b61deea Issue #2653. Corrected decoding of SNOW monitor data.
Former-commit-id: 696728bafd [formerly 5bbb774073] [formerly 714fd018ef] [formerly ab7fc816b4 [formerly 714fd018ef [formerly 050f002ff7af3e68c31f5c1949ff5f82fa2e7a9b]]]
Former-commit-id: ab7fc816b4
Former-commit-id: 5aa04e4abf5d9d29b644d2a212f6393c065cce96 [formerly 0fb9810e91]
Former-commit-id: eb5ec35275
2014-01-07 11:48:13 -05:00
Nate Jensen
8cb9853117 Merge "Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins." into development
Former-commit-id: 49a892b402 [formerly 6969518530] [formerly 6c5b954cf1] [formerly 23b4da6615 [formerly 6c5b954cf1 [formerly 8b4fb3f49556903dba6e0459adddd8850a373960]]]
Former-commit-id: 23b4da6615
Former-commit-id: 0919175dd8e25d11fa16d9abfc144bbb47e10bf3 [formerly 72e77fc4b1]
Former-commit-id: 1568132e22
2014-01-07 08:46:02 -06:00
Max Schenkelberg
257553461b Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: 30059d255c [formerly b3aed99142] [formerly 16046a4dde] [formerly cc2080449c [formerly 16046a4dde [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]
Former-commit-id: cc2080449c
Former-commit-id: d612c358920d902e7385e86659fc1d050de57dd4 [formerly f58795f460]
Former-commit-id: 0ceaa43902
2014-01-06 17:03:45 -06:00
Ben Steffensmeier
4b43971a78 Issue #2537 Split modelsounding into common/edex plugins.
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8

Former-commit-id: 08c9b54e49 [formerly f516a684d4] [formerly f520a26fbd] [formerly d79f804d4e [formerly f520a26fbd [formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]]
Former-commit-id: d79f804d4e
Former-commit-id: b2807282541cba1b6dadcac12cda1996f7292656 [formerly fac9fd296f]
Former-commit-id: 9913e51429
2014-01-06 16:02:59 -06:00
Brian Clements
bed3b77948 Issue #2563 modified server config parsing to allow for custom port
Replaced parsing code that assumed no colon in the server name, which prevented connecting to servers that didn't use the default XMPP port.


Former-commit-id: 9102b08053 [formerly 4f2aa49807] [formerly cea12a1a1d] [formerly b01e6f0c98 [formerly cea12a1a1d [formerly b995fe2036d4c0e26e25edd7f4bffd956d82921f]]]
Former-commit-id: b01e6f0c98
Former-commit-id: 4ae9dcc3fd65cda97138587d88156c3cc3a8281c [formerly d64d95d0c6]
Former-commit-id: 74c6fdc613
2014-01-06 14:14:38 -06:00
Steve Harris
188b12a1b0 14.1.1-15 baseline
Former-commit-id: c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly d8e5799328 [formerly 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]
Former-commit-id: d8e5799328
Former-commit-id: 390c383ede3823f4b855f6230e3fad20d31e0e07 [formerly 35d8f5a281]
Former-commit-id: 282d10fe6d
2014-01-06 14:08:08 -05:00
Steve Harris
4a516444b6 14.1.1-14 baseline
Former-commit-id: 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 0c5e0a197ceb1a6b84da775143e65603564a8877 [formerly 43cc501e0d]
Former-commit-id: 0989c17710
2014-01-06 14:02:30 -05:00
Brian Clements
95c30dbe0f Issue #2563 fixed label issue for non-grouped roster entry
the old code assumed that the username was populated in the roster object
new code uses the userId which is always populated


Former-commit-id: 0124fbd68d [formerly 0ce560149e] [formerly 73347283b6] [formerly d07bc465d4 [formerly 73347283b6 [formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]]]
Former-commit-id: d07bc465d4
Former-commit-id: 59f71ff2ec1502a0ff12db79de7f3fc00a2159bd [formerly 0f4be44a23]
Former-commit-id: 5dcaa98110
2013-12-20 14:40:00 -06:00
Brian Clements
f084679410 Issue #2563 roster updates for stock servers
added functionality that makes the contact list compatible with server rosters that could be modified with other clients
added support for roster entries that aren't in a local or server group


Former-commit-id: b41eadd0be [formerly b120d74099] [formerly 2b8668a4eb] [formerly e4bd8a3e2c [formerly 2b8668a4eb [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]]
Former-commit-id: e4bd8a3e2c
Former-commit-id: 35a2c84384d4302036ad4c4d8408a681edbf9e81 [formerly 4b4c7ba50c]
Former-commit-id: 0882672686
2013-12-20 12:03:04 -06:00
Brian Clements
5dcd524fa1 Issue #2563 compatibility features for stock xmpp servers
added more listener handling for venue events and server disconnection
added capability to connect to a different server from UI
added better error messages for failed connection/login to server
fixed assumptions that server always sends HTTP url and has feed chatroom


Former-commit-id: 24b3713680 [formerly 621a8536e6] [formerly 09c0267237] [formerly af83c0cf87 [formerly 09c0267237 [formerly b3173727f3f685119be3668779eb5da7e075df50]]]
Former-commit-id: af83c0cf87
Former-commit-id: f24abb8dd24a72ce76ad2bc6b3b272f81b4d74ad [formerly 43021ae281]
Former-commit-id: 917d8dffee
2013-12-20 10:41:13 -06:00
Nate Jensen
41bd7c47da Merge "Issue #2562 moved session data from chat to packet extension" into development
Former-commit-id: ee5e00e6d6 [formerly ab5de71978] [formerly 54a986613a] [formerly 67ba8bb713 [formerly 54a986613a [formerly 2bfedeebc2051fa8f1be5277224cafa598796bdf]]]
Former-commit-id: 67ba8bb713
Former-commit-id: f70ab4d6017a4ef18430da4722a242c647fc775f [formerly c61ac618ea]
Former-commit-id: 2ceb8c2051
2013-12-19 12:41:32 -06:00