Nate Jensen
|
f95cba545b
|
Merge "Issue #244 Localization of login data and removal of messanger and participant listeners." into 11-Collaboration
Former-commit-id: d40b15acc2 [formerly 9dc29b49a619cca5613e72858099029b4ffc724e]
Former-commit-id: d09c8a9383
|
2012-03-27 08:36:15 -05:00 |
|
Nate Jensen
|
8b06b02281
|
Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration
Former-commit-id: 978b76066c [formerly 096bb25790809f6f0919d518a29dca4f36bbd7f7]
Former-commit-id: ed44b0d93f
|
2012-03-27 08:32:19 -05:00 |
|
Roger Ferrel
|
8f75dd68de
|
Issue #244 Localization of login data and removal of messanger and participant listeners.
Change-Id: I247199030152575c82b8320fa0cbdeddb62fa662
Former-commit-id: b180f9b45e [formerly 4e4a705b98070d2e671133e6acc29dc72617505a]
Former-commit-id: 95d8d85fd0
|
2012-03-26 17:30:50 -05:00 |
|
James Korman
|
02bbe80c7c
|
Issue #232 - Added JAXB serialization support
Former-commit-id: 72e9c2eb52 [formerly dd4502d4e7d38df28ebd93340d978653b32cd5f5]
Former-commit-id: 221a5a65b0
|
2012-03-26 16:48:04 -05:00 |
|
Nate Jensen
|
e28fc62a56
|
Issue #427 event controllers use ISharedDisplaySession
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9
Former-commit-id: f6226a89d9 [formerly bf6cf477825be1d19081965ca9e958ebf423c0af]
Former-commit-id: cbf105015f
|
2012-03-26 16:37:44 -05:00 |
|
Nate Jensen
|
a1e2c3173d
|
Issue #427 fix xml serialization
Change-Id: I795fe5a47fc2ed678a431795a6242382b3ef6654
Former-commit-id: 7c6e0a41f7 [formerly eb39d19f3940ba57e1322a786d0dd535289b2a1e]
Former-commit-id: 2a1e40b2d5
|
2012-03-26 15:47:34 -05:00 |
|
Nate Jensen
|
62b16fef0d
|
Issue #427 initial role based event handling
Change-Id: I73d4df3f09c7cfa60025142ec5a4dccdad4423bb
Former-commit-id: 4d7a53c583 [formerly b752ced02d726771a6e11a9982967a892d2e55f3]
Former-commit-id: 619d19e24c
|
2012-03-26 13:05:01 -05:00 |
|
James Korman
|
e83de7447b
|
Issue #232 : Large refactor - Add command interfaces
Former-commit-id: e408ed1a28 [formerly e82a81cb465b07710b8b2cd6c99e87f97311d316]
Former-commit-id: d51a8521f8
|
2012-03-26 10:17:17 -05:00 |
|
Roger Ferrel
|
053c4ba597
|
Issue #244 Added participant even handler for SessionView and put in code to get groups(rosters).
Change-Id: I4a7501859f2681b290ad0babf4dab9cbca80e102
Former-commit-id: 04b5a92838 [formerly a264abfff059a9c5942ef1db91a6390fad12a110]
Former-commit-id: ce72b7b583
|
2012-03-22 16:57:30 -05:00 |
|
Nate Jensen
|
2801c4fdfb
|
Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c
Former-commit-id: 615962f5dd [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]
Former-commit-id: 0e214bcd7c
|
2012-03-22 09:39:59 -05:00 |
|
James Korman
|
9badd0fb07
|
Issue #232 - Delete files from original locations
Former-commit-id: 90b74b258a [formerly b34ddc7ead0853a152baa8b95c950f9c714a4ff7]
Former-commit-id: 55f269100c
|
2012-03-20 14:55:27 -05:00 |
|
James Korman
|
c5e9df26c1
|
Issue #232 - Considerable refactoring/event processing
Former-commit-id: 4ba4ccb404 [formerly 0b229e6992b40060d43ac560e0a3fa532635f5a1]
Former-commit-id: cc5cc2d409
|
2012-03-20 13:59:55 -05:00 |
|
Roger Ferrel
|
9f6642d572
|
Issue #244 Creted AbstarctSessonView and PeerToPeerView. Code clean up so CAVE exits properly.
Change-Id: Ibd5feeb0412e4afbe8e1f0eac79944bb059b4687
Former-commit-id: 1f4edd08e4 [formerly e92969cb1440f3f6477a7003b031faab6ed484fc]
Former-commit-id: a7f1fc18b1
|
2012-03-20 10:42:57 -05:00 |
|
Nate Jensen
|
8d78571942
|
Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration
Former-commit-id: 8f8e690470 [formerly 62d92c57d9d004427a74fc0353e2ca94411bf488]
Former-commit-id: dc62171533
|
2012-03-14 11:23:55 -05:00 |
|
Matt Nash
|
5b949aeacf
|
Issue #244 icons and login changes
Former-commit-id: e06101f9c3 [formerly ef2993a8545265adbc325080765baef0ee939923]
Former-commit-id: 2fd6e28569
|
2012-03-14 10:54:13 -05:00 |
|
James Korman
|
b29c262362
|
Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: 095ab0eeab [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]
Former-commit-id: d6003d1e71
|
2012-03-14 10:24:17 -05:00 |
|
Roger Ferrel
|
b21f1555e2
|
Issue #244 Close Session connction when view closed. Tighen up dialogs.
Change-Id: I874058fde36f521cfd4bbbf602798896b6887be5
Former-commit-id: 97a3884017 [formerly 486b2186014a14a845e48dac222c293a7891e39e]
Former-commit-id: c321d2aacf
|
2012-03-14 09:26:23 -05:00 |
|
Matt Nash
|
22eb44eb26
|
Issue #244 new icons for collaboration
Former-commit-id: 79f1cbec74 [formerly da2177babfe9fa8b7efbad9bf9d938e4ecb4313b]
Former-commit-id: 39bce3d793
|
2012-03-12 08:03:54 -05:00 |
|
Roger Ferrel
|
6c8db0d6a4
|
Issue #244 Bug Fix.
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c
Former-commit-id: be9fe19d9a [formerly 3ecb104c403decb5889cf9d97d3a1dd2b9114b85]
Former-commit-id: d17ef23899
|
2012-03-08 17:16:48 -06:00 |
|
Roger Ferrel
|
674cc116b2
|
Issue #244 Added join and refresh actions.
Change-Id: I85b9c07f73319fc9c7ff3c61cda452e6990e7f20
Former-commit-id: f492b082dc [formerly 4854c999ed0128c8b639f8b070ec4738591d9ff4]
Former-commit-id: f04f775a66
|
2012-03-08 12:37:56 -06:00 |
|
Matt Nash
|
4f35191a6b
|
Issue #244 added work on the chat for presence notifications
Former-commit-id: d264743199 [formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]
Former-commit-id: 6f354374d6
|
2012-03-08 09:08:41 -06:00 |
|
Matt Nash
|
7efd993e18
|
Merge "Issue #244 update" into 11-Collaboration
Former-commit-id: 04ae9b48ea [formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]
Former-commit-id: bbacd337b4
|
2012-03-08 08:33:32 -06:00 |
|
Roger Ferrel
|
1a2608a2fa
|
Issue #244 update
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105
Former-commit-id: c9459e2e8c [formerly 28969960d80066def0ef02930875e40d7693c234]
Former-commit-id: 2114b95a0b
|
2012-03-08 08:30:02 -06:00 |
|
James Korman
|
2fea86a591
|
Issue #232 Initial collaboration framework plugin checkin
Former-commit-id: 526a2633ce [formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]
Former-commit-id: 5a91d71c12
|
2012-03-07 15:38:20 -06:00 |
|
Nate Jensen
|
d0672cf2b6
|
Merge "Issue #244 Inital creation" into 11-Collaboration
Former-commit-id: f950b30463 [formerly 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3]
Former-commit-id: 412ceb9561
|
2012-03-06 14:27:15 -06:00 |
|
Roger Ferrel
|
ccfadae952
|
Issue #244 Inital creation
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4
Former-commit-id: c26e98376e [formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]
Former-commit-id: 3161380f4d
|
2012-03-06 14:08:39 -06:00 |
|
Steve Harris
|
c1e626d256
|
Merge branch 'ss_sync' (OB12.2.1) into 11-Collaboration
Former-commit-id: 7817380140 [formerly a606419ccbf3cc1503cbe058af2264d0448b31af]
Former-commit-id: fb9896b8c9
|
2012-02-28 09:55:05 -06:00 |
|
Steve Harris
|
a9b900821a
|
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: c502603907 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]
Former-commit-id: ecb38ba165
|
2012-02-23 12:45:50 -06:00 |
|
Steve Harris
|
5f6715ed05
|
Merge branch 'OB12.2.1_test' into ss_sync
Former-commit-id: 6f7f678590 [formerly 76967f2151dcfb275be389c04060ff34be4a5018]
Former-commit-id: 830038b0c6
|
2012-02-23 07:53:15 -06:00 |
|
Bryan Kowal
|
5ca7ce8373
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 9a63901c0e [formerly 979af119b4da4e99e0ee2f090b9c28c02db7f7a3]
Former-commit-id: cd35220cf7
|
2012-02-22 17:07:15 -06:00 |
|
Steve Harris
|
aaf2fbd05b
|
creating OB12.2.1 from ss_sync for testing
Former-commit-id: a7b68a50be [formerly 5ea9539870491d7ea3d1a050b700a17d18ecee1d]
Former-commit-id: 1fc25c6cb2
|
2012-02-22 13:06:47 -06:00 |
|
Steve Harris
|
4450cf8963
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]
Former-commit-id: 54be9660f1
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
aaead73ec5
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]
Former-commit-id: 9995d22e25
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
ff6c744fa7
|
Merge branch 'ss_sync' (OB12.1.2) into 11-Collaboration
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
Added
Former-commit-id: eca4aef9a8 [formerly d74a1285a30ce98a656668c93c71462e7dc51c2a]
Former-commit-id: e5a5b3eefa
|
2012-02-20 14:02:14 -06:00 |
|
Bryan Kowal
|
2ba23624b4
|
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]
Former-commit-id: 682c10767d
|
2012-02-17 12:17:14 -06:00 |
|
Steve Harris
|
65b22abd24
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]
Former-commit-id: b137302802
|
2012-02-17 10:55:02 -06:00 |
|
Steve Harris
|
db1e3b1215
|
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 7356d655da [formerly f3bac368dacad47036f9823243379fe6ed1d4869]
Former-commit-id: 1707b98721
|
2012-02-15 14:34:47 -06:00 |
|
Steve Harris
|
39b13d7102
|
Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: 5e47f8c33a [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]
Former-commit-id: a91b01bfbe
|
2012-02-15 12:54:54 -06:00 |
|
Steve Harris
|
a6b95a2e81
|
Merge "Issue #192 gitignore changes" into ss_sync
Former-commit-id: 4eef9c3c20 [formerly e019344c6f96c6db35ede5985779eab537df523c]
Former-commit-id: 35cc62582b
|
2012-02-08 09:09:28 -06:00 |
|
Matt Nash
|
380179f10d
|
Issue #192 gitignore changes
Former-commit-id: 5fdadf4333 [formerly 68f511221d4b198be50e1cf2a81723b8c3578a61]
Former-commit-id: 426da850d3
|
2012-02-03 15:03:21 -06:00 |
|
Nate Jensen
|
0b6bde1664
|
Merge "Issue #181 disable nctext-ingest" into 14-NCEP
Former-commit-id: 7490a7d0ed [formerly 0d01c3c0597e1be074d13c3a3e6ce188878e220f]
Former-commit-id: e4dc370101
|
2012-01-31 09:51:16 -06:00 |
|
Nate Jensen
|
50e735ce0c
|
Issue #181 disable nctext-ingest
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e
Former-commit-id: 1b32446288 [formerly a54d4b8e55c23411c0cb61eae8f57e8279c9f8e9]
Former-commit-id: f3ba2258df
|
2012-01-31 09:45:27 -06:00 |
|
Steve Harris
|
9587218b75
|
Merge "Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups." into 14-NCEP
Former-commit-id: 2cd9e2af22 [formerly 20c2f61be3e070a0223a94196ff91397de184d42]
Former-commit-id: 801f50b944
|
2012-01-30 16:12:23 -06:00 |
|
Steve Harris
|
05a088f9d1
|
Merge "Issue #202 - no longer build edex-ncep-nsharp for the ncep branch." into 14-NCEP
Former-commit-id: 028bc69fbb [formerly 0eb4e14fe793e94be2390693c2c06c29547d48a1]
Former-commit-id: 5216f0ff9e
|
2012-01-30 16:12:03 -06:00 |
|
Bryan Kowal
|
e9d85fc09c
|
Issue #202 - re-add awips2-cave-viz-ncep-nsharp to the yum groups.
Former-commit-id: 40c0e93995 [formerly 3038b2fc0d69236267db13eeb88e6f803cc6215a]
Former-commit-id: 7d21e3149e
|
2012-01-30 16:05:17 -06:00 |
|
Bryan Kowal
|
2745f9cac7
|
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
Former-commit-id: 998337f9f4 [formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]
Former-commit-id: 2554090d0d
|
2012-01-30 16:01:45 -06:00 |
|
Nate Jensen
|
ab7f9e5a56
|
Issue #181 fix ncep edex rpms
Change-Id: Iaf7778d9b32e8136f74caf4ed37892149e8392cf
Former-commit-id: 0301af999e [formerly 17f8151b148ad8d645c81760bfa4820dc421490a]
Former-commit-id: 50c6816fa9
|
2012-01-30 15:56:50 -06:00 |
|
Bryan Kowal
|
1f254d0e0f
|
Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: f0b31d25f6 [formerly b309c8b3d2726da589a057d31d2ae7592b82eb19]
Former-commit-id: 71d08b6916
|
2012-01-26 17:38:17 -06:00 |
|
Nate Jensen
|
29be9b82bd
|
Issue #181 fix ncep
Change-Id: If0e2947c33523ada50036212666867a7c5138c17
Former-commit-id: ca923b9475 [formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]
Former-commit-id: 15e0a5e68d
|
2012-01-26 17:28:06 -06:00 |
|
Nate Jensen
|
18540298b4
|
Issue #181 fix empty src dirs
Change-Id: If03015cf64f5791b4f5b340cc6aba4514a6a6d43
Former-commit-id: 6fabe216d8 [formerly 25ad3a67efb293afc2bf3ef9442ff2fc296bef18]
Former-commit-id: 638f900d41
|
2012-01-26 15:42:55 -06:00 |
|