Commit graph

31 commits

Author SHA1 Message Date
Brian Clements
175c675ac9 Omaha #1255 fixed collaboration colors
config.xml was not in build.properties
provided a fallback default if config is missing

Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6

Former-commit-id: c024dd86a1 [formerly aeb093ad95] [formerly 0d4cd4bab8] [formerly c024dd86a1 [formerly aeb093ad95] [formerly 0d4cd4bab8] [formerly da53d9ccc7 [formerly 0d4cd4bab8 [formerly 5ee2e28b8eb94174c7fce660cccc4a77345617a4]]]]
Former-commit-id: da53d9ccc7
Former-commit-id: 55c2c91ec9 [formerly 2cea766aed] [formerly 1a54c47307e1f8f59e93102d31d75908a974c968 [formerly e6e84d2c71]]
Former-commit-id: 69df56fbd21f5de41d96518bf209cc59acc31c5a [formerly 9a1bc8c521]
Former-commit-id: 2bebd393d8
2014-07-07 12:29:12 -05:00
Brian Clements
67ae3d92ac Omaha #1255 added collaboration specific color presets
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f

Former-commit-id: 6c381d53ed [formerly 08724fefd7] [formerly 8b5ad1ec33] [formerly 6c381d53ed [formerly 08724fefd7] [formerly 8b5ad1ec33] [formerly eac871eed7 [formerly 8b5ad1ec33 [formerly 87ed36851c390058ab4c92977ecc552cab869d26]]]]
Former-commit-id: eac871eed7
Former-commit-id: 2d1a994bfc [formerly ea1ac8ee8f] [formerly 0a47f310c2bc5e76e5ed2484684f46b47351e783 [formerly cd282ef018]]
Former-commit-id: 05bc19a3cf47dc045c80f93a19cbd2c2d220635e [formerly d066846c3f]
Former-commit-id: 2cd0d94e5d
2014-07-02 10:02:52 -05:00
Brian Clements
9f8aea91aa Omaha #1798 fixed collaboration drawing issues when leader shares new map
fixed cursor icon not updating properly
fixed attempting to draw to inactive layer

Change-Id: Ic0f29feddbd611d918ba9d7e5a515a7624bf72aa

Former-commit-id: 309900daab [formerly 0125117d9c] [formerly 88ba6b47ad] [formerly 309900daab [formerly 0125117d9c] [formerly 88ba6b47ad] [formerly fc70dbc86e [formerly 88ba6b47ad [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]]]
Former-commit-id: fc70dbc86e
Former-commit-id: 7ffa3c80c1 [formerly b186894f32] [formerly a1b5881328dc0f2810d69ead13548d6326a348b7 [formerly 44f8b3dce1]]
Former-commit-id: 90997d544f594bee31f8c51f3afea29977b1417d [formerly 0be4260b4c]
Former-commit-id: be0185379b
2014-06-30 15:57:58 -05:00
Ben Steffensmeier
24156d4084 Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore.
Former-commit-id: f5f6b5a31f [formerly 01379cd329] [formerly 748ecc5fac] [formerly f5f6b5a31f [formerly 01379cd329] [formerly 748ecc5fac] [formerly 8446ace149 [formerly 748ecc5fac [formerly bb8c1130a9da5cdb06590b20d7f5bde9e1d7c812]]]]
Former-commit-id: 8446ace149
Former-commit-id: 0f7ba1afa5 [formerly 2e88a0b800] [formerly b2c6edd65caf1b4176d193cc194ad5ab1ad18746 [formerly 82d9c403d2]]
Former-commit-id: a416f6e0840cf072c6117155143edd9080b9a848 [formerly 353b7c4090]
Former-commit-id: c347188e0a
2014-05-16 13:36:31 -05:00
Ben Steffensmeier
454b0c3ff7 Omaha #2697 Collaboration will no longer use local maps.
Former-commit-id: ebfa5f5daf [formerly 270e8805cc] [formerly 3e23857dcc] [formerly ebfa5f5daf [formerly 270e8805cc] [formerly 3e23857dcc] [formerly 1db137a21e [formerly 3e23857dcc [formerly 7e10b6d308a3bb17692abaefd9a8e84cc5016621]]]]
Former-commit-id: 1db137a21e
Former-commit-id: 99e30ac110 [formerly fc54a7f697] [formerly a29ef2071bfc276e3293b4a194e4b553a2d44b4c [formerly 759b1460d4]]
Former-commit-id: 7c3c2d0c45be3c2ea5c422c078df6d75bd45a3f3 [formerly e8813c2f24]
Former-commit-id: 1ac0aeacc5
2014-05-14 13:53:29 -05:00
Brian Clements
8bb6a1ac40 Issue #3076 added clear all to shared display sessions
Former-commit-id: 02c921ed12 [formerly 729e717be1] [formerly f545c548cc] [formerly 02c921ed12 [formerly 729e717be1] [formerly f545c548cc] [formerly 1432aa1302 [formerly f545c548cc [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]]
Former-commit-id: 1432aa1302
Former-commit-id: 0fbb5dc22a [formerly 8674841154] [formerly bcb942f3e18364de413f94465a2f8a874c91dc8e [formerly 5583c3903b]]
Former-commit-id: db57e64f5cb253ecb97388555bf76c0cac27eaf9 [formerly 3a60b0db05]
Former-commit-id: 89f3a0a1d2
2014-05-06 09:30:07 -05:00
Brian Clements
19d7cef419 Issue #2903 made xmpp reconnect an explicit action by user
moved non-session classes out of session package
connection classes moved to connection package
made separate classes for connection listeners
removed password from heap
login dialog remembers last server used
added reconnect handler to prompt user to re-login after disconnect


Former-commit-id: 3d8bcb8701 [formerly 6f7851d8c4] [formerly 8ab1bab974] [formerly 3d8bcb8701 [formerly 6f7851d8c4] [formerly 8ab1bab974] [formerly 6b22374046 [formerly 8ab1bab974 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]]
Former-commit-id: 6b22374046
Former-commit-id: 5b5669e1e1 [formerly ca5909e222] [formerly 3329c6cc7af41bc830f1a278385881ed9ff2d11c [formerly 7cf5f06f2a]]
Former-commit-id: 54da4997513795ce82cf53a0964eb73eee1095d9 [formerly 054b47951d]
Former-commit-id: 86081dda91
2014-04-15 15:12:33 -05:00
Nate Jensen
2feed8888a Issue #2968 improve efficiency by only compressing/serializing persisted
objects once

Change-Id: Iba90717d049571b801254852a7fd5a73202701f2

Former-commit-id: 0949264e48 [formerly 579584c346] [formerly e3df98635a] [formerly 0949264e48 [formerly 579584c346] [formerly e3df98635a] [formerly aaf2d3c8a4 [formerly e3df98635a [formerly a35a103be0818ec80c7e2d98a74782b8278b4383]]]]
Former-commit-id: aaf2d3c8a4
Former-commit-id: c557c6570a [formerly 45ccb7d7fe] [formerly a6b37f03d074f8bb7e3b6be39e76118f7884e57e [formerly 8cb284d2c2]]
Former-commit-id: 358a7f70cc06dacaf01c661c62b6e51041329f7c [formerly 773dad337d]
Former-commit-id: 65e26b4418
2014-04-08 12:59:16 -05:00
Nate Jensen
a99fd8dbbb Issue #2895 fixed telestration when leadership returns to a previous
leader

Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033

Former-commit-id: 1447abe995 [formerly 68b60eba47] [formerly e75d3dfb7c] [formerly 1447abe995 [formerly 68b60eba47] [formerly e75d3dfb7c] [formerly 2fc1030fad [formerly e75d3dfb7c [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]]]]
Former-commit-id: 2fc1030fad
Former-commit-id: 52e60a68a9 [formerly 8589374171] [formerly 389d920f6cf85e74cfa2b1864b84d9f952b0b23a [formerly ca1ec93450]]
Former-commit-id: 2113aab9642e8adaee09df90029c31ddc9b73949 [formerly 5cb38bd511]
Former-commit-id: 1125203c93
2014-03-18 12:52:01 -05:00
Brian Clements
ac70455dc6 Issue #2848 fixed session create, listen, join ordering
clients were missing events and messages because listeners weren't up before joining
collaboration connection needed to add to session map before joining the session
display containers needed to register with session event bus before joining the session
clients no longer send events to empty sessions


Former-commit-id: 9b6c283fc9 [formerly 2456c2308f] [formerly dc55cd5b5c] [formerly 9b6c283fc9 [formerly 2456c2308f] [formerly dc55cd5b5c] [formerly aee98ecfb0 [formerly dc55cd5b5c [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]]
Former-commit-id: aee98ecfb0
Former-commit-id: 67db5cb4f8 [formerly 3486f1f241] [formerly eb63cfebccc689b3ac62c518759624fc43c5c7b9 [formerly 4f9a2577f2]]
Former-commit-id: 6188fed145573399f401e7319702f154913b200b [formerly 6245b550aa]
Former-commit-id: c4e9aff9fc
2014-03-10 14:06:45 -05:00
Nate Jensen
8086172968 Issue #2826 fix collaboration mosaic image disposed issue
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614

Former-commit-id: 95bc80c8d0 [formerly d9af17287d] [formerly 7fa8bf636f] [formerly 95bc80c8d0 [formerly d9af17287d] [formerly 7fa8bf636f] [formerly 7bfad8ce17 [formerly 7fa8bf636f [formerly 50b3e6bb7fcee54f1199b78354d404f325b32773]]]]
Former-commit-id: 7bfad8ce17
Former-commit-id: 488451e9aa [formerly cb81644412] [formerly 41f274281fde4fea1d15e1e1d46e9ffa39d95f5d [formerly 04d7ef0e7a]]
Former-commit-id: 8fdf2bb6022e36b9b68b7b679abfa23d5a4fd59e [formerly 69bdf2bd60]
Former-commit-id: 45ff104294
2014-03-06 18:07:40 -06:00
Ben Steffensmeier
424d4da21f Issue #2843 Harden recycle.
Former-commit-id: 291d5f55df [formerly 22adc336df] [formerly 26c1a8e494] [formerly 291d5f55df [formerly 22adc336df] [formerly 26c1a8e494] [formerly 3cd6b29e75 [formerly 26c1a8e494 [formerly 364b818dbd055b13fd8d5bb9f40c16f730f30b53]]]]
Former-commit-id: 3cd6b29e75
Former-commit-id: be60a9564d [formerly ed0ec90407] [formerly 202049adf2dd36c8c9f4cee72fdf77a6f408f169 [formerly af1bdf1b53]]
Former-commit-id: 8c49c3bbe4c3c8e4454bff4e5d906233823d63d5 [formerly 2c687a4064]
Former-commit-id: 4b966138f6
2014-03-05 11:16:12 -06:00
Brian Clements
e9604a9700 Issue #2756 implemented HTTP public key auth scheme
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly d8e283e1b4 [formerly ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]]
Former-commit-id: d8e283e1b4
Former-commit-id: 43c19f09ba [formerly f56cbac9fb] [formerly effe9ab4a85983edf2b983ee5e4b964df8a78343 [formerly edd72cbde4]]
Former-commit-id: 667a1021c89300b5befe11701d18fc1d06fbb6bb [formerly 6d4abdc37c]
Former-commit-id: f00f8eb1d9
2014-02-28 16:15:17 -06:00
Brian Clements
db0299b3e6 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: 9597ce5cd9 [formerly 3f0e9d7a77] [formerly eef242194a] [formerly 9597ce5cd9 [formerly 3f0e9d7a77] [formerly eef242194a] [formerly 3d365a4cd2 [formerly eef242194a [formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]]]
Former-commit-id: 3d365a4cd2
Former-commit-id: 408b834fc6 [formerly 1f5d296314] [formerly afda13c403f6099ee52fb2149ecc71798cd4f1b6 [formerly 473fcda0cf]]
Former-commit-id: 9c79444c16264820ee6b7c394c120d181facc068 [formerly a102e927b1]
Former-commit-id: 1001ef1ec2
2014-02-25 09:17:36 -06:00
Brian Clements
fcc6c7f221 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: a173972437 [formerly 9217ba24c5] [formerly 3f362519aa] [formerly a173972437 [formerly 9217ba24c5] [formerly 3f362519aa] [formerly 386e9cc96a [formerly 3f362519aa [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]]]
Former-commit-id: 386e9cc96a
Former-commit-id: 743c6cd74b [formerly 73cb7b7313] [formerly 83e8dc39015b780c38746e7cdc688605acdb3a6e [formerly b9c9be4c4f]]
Former-commit-id: 65eb8626f8a0c635e873b499175028ece670e6f8 [formerly 4abf737852]
Former-commit-id: 48cfc3c933
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
18980e6a8c Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: 152980350c [formerly 780dc19fac] [formerly 70ae372303] [formerly 152980350c [formerly 780dc19fac] [formerly 70ae372303] [formerly e08d4f77c3 [formerly 70ae372303 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]]
Former-commit-id: e08d4f77c3
Former-commit-id: d27c21b9f6 [formerly 7aca322faa] [formerly c293b1124e59af7c01e948de86093eee22fbb5d9 [formerly a6bf896593]]
Former-commit-id: 38003672caef259cf47e8867a401b32fc9add635 [formerly 7e29aa25a9]
Former-commit-id: 07ffe9f711
2014-02-21 17:37:19 -06:00
Brian Clements
cbef95a1bb Issue #2751 implemented room/topic ownership transfer
Former-commit-id: 4e165aba58 [formerly a8ff1effc1] [formerly c3cadff705] [formerly 4e165aba58 [formerly a8ff1effc1] [formerly c3cadff705] [formerly ab72938246 [formerly c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]]
Former-commit-id: ab72938246
Former-commit-id: 08a0e5baf2 [formerly 9d00fe2bab] [formerly d96f62f0208dbdcb69677a9d6b014fc0a7761a39 [formerly d9ac2c0037]]
Former-commit-id: e46a572ae9fd237caee1e14f1bd4825f8f3b942b [formerly d218686d1f]
Former-commit-id: 9b0fd74f5b
2014-02-20 11:10:14 -06:00
Brian Clements
c420979556 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: abc01f5475 [formerly 06c16118e1] [formerly dc074a9650] [formerly abc01f5475 [formerly 06c16118e1] [formerly dc074a9650] [formerly 3a135b8eac [formerly dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 30027665ac [formerly 77bb396c9a] [formerly 7c130f893c124249133b51cb750375f7ea62663d [formerly bee7cdb71a]]
Former-commit-id: 2bd4a38066d755ff2faaae6125ca4744d0e08564 [formerly ddc0945e40]
Former-commit-id: b47b194564
2014-02-19 08:32:26 -06:00
Brian Clements
c0da4f94d4 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: 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 5b4f1e8288 [formerly f6b2827434 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 74d08f1d19 [formerly 02319f36e4] [formerly 9b1edc285732dbc80b9bea2223564bca70eef005 [formerly a1d9e40bd4]]
Former-commit-id: 30b1054d786354e5944fa7b6968a4b2cddf1c07a [formerly 5889341612]
Former-commit-id: f866ac4365
2014-02-18 10:03:12 -06:00
Nate Jensen
4c3bdc0dfb Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly a85575a763 [formerly e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]]
Former-commit-id: a85575a763
Former-commit-id: 740e71adba [formerly 139479b4e1] [formerly 759372ba16bb02e06f0e8472c362cf3299be0ff5 [formerly 11fb06810f]]
Former-commit-id: fe5669f9eeae8061972d1a92d1593cd4aea98162 [formerly 70285796ac]
Former-commit-id: 65068869e1
2014-02-13 15:35:53 -06:00
Brian Clements
85c67054ae 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: 01653c76de [formerly 16ed18e0c6] [formerly ef52908906] [formerly 01653c76de [formerly 16ed18e0c6] [formerly ef52908906] [formerly 0ac7ff81cf [formerly ef52908906 [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]]]
Former-commit-id: 0ac7ff81cf
Former-commit-id: 21b1a6844a [formerly e6de3a118d] [formerly 01dac7e88270bd83aeb03bd3e6b701e82c5f1b0b [formerly 3ec3ad0543]]
Former-commit-id: f2dc7cf04af4442851840305e26a4b79ceb9be1d [formerly 1cc21dc160]
Former-commit-id: aa06f65038
2014-02-13 13:51:39 -06:00
Brian Clements
3c70c9ff9c Issue #2698 added handles to venues
venues now handle identity differently with VenueParticipant instead of UserId
fixed alias bug due to roster entry change


Former-commit-id: bd410b2529 [formerly 4e2cb3f7ae] [formerly 3e585945d6] [formerly bd410b2529 [formerly 4e2cb3f7ae] [formerly 3e585945d6] [formerly 3250eb34f5 [formerly 3e585945d6 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]]]
Former-commit-id: 3250eb34f5
Former-commit-id: 35b53a61cd [formerly 4190b13ae2] [formerly 15ea8433323667869df6df396f6377d11f2a7079 [formerly 4f4d5c5d69]]
Former-commit-id: bfcea1a4566d36807b6744b7f53ddc0082dc12da [formerly e04cb11154]
Former-commit-id: cf8b85f3d2
2014-01-31 09:44:31 -06:00
Brian Clements
32e12b3094 Issue #2698 made sessions private and invite only
removed venue info because you can't get it for private rooms
improved error handling for existing room when attempting to create
fixed default compression config


Former-commit-id: 190400fc34 [formerly 1f1be20d41] [formerly c498307b30] [formerly 190400fc34 [formerly 1f1be20d41] [formerly c498307b30] [formerly 5b9f694930 [formerly c498307b30 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]]]
Former-commit-id: 5b9f694930
Former-commit-id: a225d12692 [formerly 07452b7778] [formerly ceb8a89c7f4c8cc41774e50c75969cbdacc6d919 [formerly 4a0682a9e8]]
Former-commit-id: 3c20002e1f0607d8975953734b488dccf3a7b829 [formerly 76ec4d56c8]
Former-commit-id: 96e89d9f83
2014-01-29 10:16:15 -06:00
Brian Clements
5ab073884a Issue #2562 moved session data from chat to packet extension
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used


Former-commit-id: c2b759b38e [formerly 2c20a87634] [formerly 80650337ce] [formerly c2b759b38e [formerly 2c20a87634] [formerly 80650337ce] [formerly ce0a34b53c [formerly 80650337ce [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]]
Former-commit-id: ce0a34b53c
Former-commit-id: 64dda165db [formerly d58f8d7134] [formerly 698a51437531736c124a805026ea7ca5cd199699 [formerly 4015dc23ee]]
Former-commit-id: 29642bf8db563174d87d99cd43c522c3dc419a43 [formerly aa8d869635]
Former-commit-id: 5ede797e27
2013-12-19 12:08:21 -06:00
Brian Clements
1197d89ded Issue #2561 removed ECF from collaboration
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list


Former-commit-id: d0d14ec091 [formerly 5d1d44b60d] [formerly 8ece30944a] [formerly d0d14ec091 [formerly 5d1d44b60d] [formerly 8ece30944a] [formerly e6c4b39aca [formerly 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]]
Former-commit-id: e6c4b39aca
Former-commit-id: 4d04f6edbf [formerly 5a7fca6352] [formerly ea97705eee929964d9b775519d5de735e490a0d4 [formerly b8df043202]]
Former-commit-id: ebcbc592123de417dee62c72e2708e136768fd8e [formerly 0cf7b822ce]
Former-commit-id: d7ddaa295d
2013-12-06 17:07:16 -06:00
Ben Steffensmeier
a15afe6f6c Issue #2491 Fix collaboration Xml.
Former-commit-id: 0bcf7f77c0 [formerly a5f970e238] [formerly 3d36cec7be] [formerly 0bcf7f77c0 [formerly a5f970e238] [formerly 3d36cec7be] [formerly fdeff81da2 [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]]
Former-commit-id: fdeff81da2
Former-commit-id: d27369f59b [formerly 89c999410e] [formerly 6d36de8b83b8bd6d75e28507dfdb4314d2a89f81 [formerly 49ffb7e92c]]
Former-commit-id: 8474d807f157d7a0e7fc99090b358e9a371bb8fe [formerly a0e805ded6]
Former-commit-id: a92af46f59
2013-10-31 14:06:37 -05:00
Ben Steffensmeier
e193ba7f0f Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly 27a392f90e [formerly 5b395f7417 [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]]
Former-commit-id: 27a392f90e
Former-commit-id: 8ec09e8f61 [formerly 78efdb7572] [formerly 08cc956d9a9abcf58a33328430ea1253b6f6e00d [formerly 418c259567]]
Former-commit-id: a33b0178c5a7309ae9c12ac4f7b2267997da8f07 [formerly 9d87eb50e2]
Former-commit-id: 02b9133d50
2013-10-29 17:35:55 -05:00
Ben Steffensmeier
5ac77f7f76 Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]]
Former-commit-id: 44a6f05986
Former-commit-id: 2400380daf [formerly 0e3cf8b47f] [formerly 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]]
Former-commit-id: d4c767bc5d9a92f47044beb03900b35fdf1a24a2 [formerly 0c3bb6ef3e]
Former-commit-id: 47d3fb8249
2013-10-28 10:14:08 -05:00
Ben Steffensmeier
c903521884 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 2ca86633d6 [formerly f46686a6e2 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 4936191404 [formerly 334af0001b] [formerly fa7abe8431fbbdea60e6504cd61a867956d20856 [formerly 5068b18c6a]]
Former-commit-id: 387e3e95805ed9aa6efd193b1112d4ae6d8ac95a [formerly 0778375180]
Former-commit-id: 866c873f71
2013-02-28 17:00:56 -06:00
Steve Harris
3e63f280a2 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
8794e3b599 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
2012-10-16 13:27:07 -05:00