Commit graph

445 commits

Author SHA1 Message Date
Matt Nash
02ab07f89a Issue #440 fixes in group view
Former-commit-id: 414c552462 [formerly ad3f6cd8ad] [formerly 414c552462 [formerly ad3f6cd8ad] [formerly 7065ea8107 [formerly c4123b42e9078f2c5975da38d2aa6737348afa8a]]]
Former-commit-id: 7065ea8107
Former-commit-id: dbcb9b7b87 [formerly 2f7a2747aa]
Former-commit-id: 77b210c155
2012-05-30 16:13:21 -05:00
Nate Jensen
3bbdc214e0 Merge "Issue #595 - only the "Create Shared Display Session" checkbox will be disabled and unchecked until the httpd collaboration configuration information is received. Changed the checkbox description to read "Create Shared Display Session"." into 11-Collaboration
Former-commit-id: 06970f4d82 [formerly 8eb5665591] [formerly 06970f4d82 [formerly 8eb5665591] [formerly ac95fde3e5 [formerly 34be3aaf6ea41ae8366d072723c3beb8151d1f84]]]
Former-commit-id: ac95fde3e5
Former-commit-id: 71d38a3598 [formerly d4ba003ce0]
Former-commit-id: e4e9a8b6ba
2012-05-29 17:23:56 -05:00
Max Schenkelberg
6739195793 Issue #665 fixed bug with lat/lon vs pixel space for inspect
Change-Id: I038f9fec306e81725932ed5a17db885d251fed73

Former-commit-id: 71fe0a468a [formerly 1934bfa28c] [formerly 71fe0a468a [formerly 1934bfa28c] [formerly 76e99b4037 [formerly 2be9620b338140fa27efba037d0cc321558bec62]]]
Former-commit-id: 76e99b4037
Former-commit-id: 4c65ff8c20 [formerly 8f377d3fb8]
Former-commit-id: 01a1c14349
2012-05-29 15:15:05 -05:00
Max Schenkelberg
925845cff9 Issue #665 Made MPEGageResource use bulk rendering for strings and points for faster shared display rendering
Change-Id: I7a734784895d406ba769f558d4b321dfe3b8dbf9

Former-commit-id: fe9de50746 [formerly 34a71dbee8] [formerly fe9de50746 [formerly 34a71dbee8] [formerly c28a586d84 [formerly 18ca6f058d810781d93ea2d0bad9b2daa161fa3a]]]
Former-commit-id: c28a586d84
Former-commit-id: ddfb7e038a [formerly 2cde39bc63]
Former-commit-id: e3ad085501
2012-05-29 15:00:42 -05:00
Bryan Kowal
584d3c0319 Issue #595 - only the "Create Shared Display Session" checkbox will be disabled and unchecked until the httpd collaboration configuration information is received. Changed the checkbox description to read "Create Shared Display Session".
Change-Id: Ie7e419bc47a2451eef5a25456fa767fc0156cc27

Former-commit-id: af04bfc6d8 [formerly 14386ad818] [formerly af04bfc6d8 [formerly 14386ad818] [formerly 25b2361923 [formerly 904a05e94386bd9d71a357e374ed3c757dc08016]]]
Former-commit-id: 25b2361923
Former-commit-id: 961d5976d1 [formerly 0692230344]
Former-commit-id: 27cd0fe325
2012-05-29 13:06:36 -05:00
Max Schenkelberg
efa296956a Issue #663 Removed references from ISerializableObject file
Former-commit-id: d071f7ea11 [formerly 76db032da7] [formerly d071f7ea11 [formerly 76db032da7] [formerly fec288d4bd [formerly 95da08aeabcc06f5ab46963cf4be4fb54457ff43]]]
Former-commit-id: fec288d4bd
Former-commit-id: 643c262998 [formerly 5e8f886155]
Former-commit-id: fbc5c4cfda
2012-05-29 09:10:48 -05:00
Max Schenkelberg
761ea9a414 Issue #663 Fixed key binding issue, added cursor icon change when tool is selected
Change-Id: I9040da01355e64208ef54ccc6d8452ab57c9d3c5

Former-commit-id: 04c9f3a1c8 [formerly 8c9c33ef9f] [formerly 04c9f3a1c8 [formerly 8c9c33ef9f] [formerly 2058b7f0ea [formerly 5c240b5224ee93a36c5e05ddb15b373645222081]]]
Former-commit-id: 2058b7f0ea
Former-commit-id: ea408d8f42 [formerly 11cb7bafb0]
Former-commit-id: 0222587b96
2012-05-25 16:28:53 -05:00
Max Schenkelberg
6e5e2b500e Issue #663 Commented out drawing tool loading from group view and removed transfer role code
Change-Id: Ie910b19d477a1281231486bc8f96083ea7598a0b

Former-commit-id: f7183f8212 [formerly 7bae56e8b5] [formerly f7183f8212 [formerly 7bae56e8b5] [formerly 854f41eb7f [formerly 209d658e61d7b595d4effbfb87f65b87a5f196a9]]]
Former-commit-id: 854f41eb7f
Former-commit-id: e4350ca0ae [formerly d380895c56]
Former-commit-id: 079a247ee5
2012-05-25 15:24:18 -05:00
Max Schenkelberg
b12e6a3add Issue #663 Fixed clearing of display in D2D, resources can now be specified to be readded when unloaded during a session
Change-Id: I77b448ad4af60bf8d1afb3b50a5575ad82c4ae22

Former-commit-id: 2838c08685 [formerly 8773dbdf62] [formerly 2838c08685 [formerly 8773dbdf62] [formerly f6f2e1a4fb [formerly d15821c57b49090863e9c22455d06c94da6fcaf9]]]
Former-commit-id: f6f2e1a4fb
Former-commit-id: c2c035a2e0 [formerly dec7ce3551]
Former-commit-id: 8fd526dcf3
2012-05-25 14:37:25 -05:00
Bryan Kowal
e5fd40d59e Issue #595 - openfire will now supply the httpd-collaboration port when a user successfully logs in. The port will be stored as part of the CAVE configuration. Change-Id: I76c8ce94ef140d8bb8b608dd07b59b89f1607d16
Change-Id: I5350ed2293b78a743fc0e5b4cd9bcd6f02eafbd1

Former-commit-id: 8ee68911fb [formerly a808bc245f] [formerly 8ee68911fb [formerly a808bc245f] [formerly 0f0bab6e54 [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]]]
Former-commit-id: 0f0bab6e54
Former-commit-id: b817484c67 [formerly 0211167d87]
Former-commit-id: e7f2ec38b5
2012-05-24 16:51:35 -05:00
Max Schenkelberg
e80b6c8dce Issue #239 Got IColormapShadedShapeExtension implemented
Change-Id: Idb2b5a894530b739cd8b00f8f3b294f186d5143f

Former-commit-id: c98b6e28c7 [formerly ae8236aa21] [formerly c98b6e28c7 [formerly ae8236aa21] [formerly 1c11323103 [formerly 6ddfe51e93d62145678d87ed3db208e90d3146e3]]]
Former-commit-id: 1c11323103
Former-commit-id: d0d619b048 [formerly 696c2f4894]
Former-commit-id: f2bd302796
2012-05-23 09:14:21 -05:00
Max Schenkelberg
2d9ccfe9ce Issue #239 Moved initialization code in GFE resources so recycle() works properly
Change-Id: I3a4e1f18a7246af504a6d1ce791bd94ab1f721d5

Former-commit-id: 4c0a18894c [formerly e81a9ee935] [formerly 4c0a18894c [formerly e81a9ee935] [formerly 52a78af98c [formerly 1f092691e6e43bd8f6d10c2b8fab0a68eca38992]]]
Former-commit-id: 52a78af98c
Former-commit-id: da46b6efc0 [formerly 7b7e708092]
Former-commit-id: 4e9971aac6
2012-05-22 09:56:27 -05:00
Max Schenkelberg
501783794b Issue #239 Cleaned up DispatchingWireframeShape code to send world coordinates separate from pixel coordinates
Change-Id: I1c7eb9b19ea8d816eb3e81901ecf5574877a5212

Former-commit-id: 950f857a5f [formerly 9c1f14a0a6] [formerly 950f857a5f [formerly 9c1f14a0a6] [formerly 2bc9a18957 [formerly 0a3d69b5bb8ca31d8db8148225f7e1ef85778919]]]
Former-commit-id: 2bc9a18957
Former-commit-id: 49f1572bc5 [formerly 084511ab6a]
Former-commit-id: 7a65366028
2012-05-21 14:57:37 -05:00
Matt Nash
dfd6052201 Issue #642 match longest keyword
Former-commit-id: 116ba7901f [formerly 94746c169e] [formerly 116ba7901f [formerly 94746c169e] [formerly eabc2032b4 [formerly 1dc9f3ad1f5c68dbe6a515eb990f23a8f20139d6]]]
Former-commit-id: eabc2032b4
Former-commit-id: 1021c62d04 [formerly b6134f482f]
Former-commit-id: 194e764541
2012-05-21 11:12:52 -05:00
Matt Nash
86e480a245 Issue #642 change font changer to FontDialog
Former-commit-id: bfd11e6a96 [formerly f1301645e7] [formerly bfd11e6a96 [formerly f1301645e7] [formerly 8b71b3058b [formerly 8f4c3b9d9769bf34e7c4744dd80b603d445b6270]]]
Former-commit-id: 8b71b3058b
Former-commit-id: 62ecdebb9c [formerly a438a35943]
Former-commit-id: 506953db0f
2012-05-21 10:39:03 -05:00
Matt Nash
87f766e7a9 Issue #642 fix for finding double instances of words
Former-commit-id: 35713ca625 [formerly 253b5fe2e8] [formerly 35713ca625 [formerly 253b5fe2e8] [formerly bed5ec6876 [formerly 5d3001a8bdd5ab6b89efe54e7d3c6b3266e880ec]]]
Former-commit-id: bed5ec6876
Former-commit-id: ada80acb0a [formerly bb957ec167]
Former-commit-id: bcb561b87b
2012-05-21 08:43:37 -05:00
Max Schenkelberg
b783bc6f79 Issue #239 Added support for rectangle drawing
Change-Id: I38c086a9a80652ce9e5da3ed4db1776877cc4635

Former-commit-id: fc8ddc8613 [formerly da7b6ceb27] [formerly fc8ddc8613 [formerly da7b6ceb27] [formerly cb4b153cad [formerly e4417a1f938ceddcc4d44d45af60b0f2d1b580fd]]]
Former-commit-id: cb4b153cad
Former-commit-id: 84c93c7d12 [formerly c5fe70a6b0]
Former-commit-id: 1dc156d196
2012-05-18 14:17:43 -05:00
Max Schenkelberg
c68c963327 Issue #239 Added drawing of lines so baslines would work
Change-Id: Id8ca06b2fc38ab0db5b167d33aeae5af974c30cc

Former-commit-id: 83ea7d24ae [formerly 80828b8441] [formerly 83ea7d24ae [formerly 80828b8441] [formerly 0c92536bb3 [formerly 063e7ac34a6b5a6c43cf7927a1a2980f79efb24c]]]
Former-commit-id: 0c92536bb3
Former-commit-id: 7f107eb4e3 [formerly c0a5e5bc81]
Former-commit-id: 0effe502c8
2012-05-18 12:34:00 -05:00
Matt Nash
b93d955212 Issue #642 remove debugging code
Former-commit-id: b83871cec2 [formerly ca6731acfc] [formerly b83871cec2 [formerly ca6731acfc] [formerly 385d7e3d7f [formerly 23669c3d390b3cc0aeb6228247ea0b0512bdfb80]]]
Former-commit-id: 385d7e3d7f
Former-commit-id: 4b7887c400 [formerly 92765ecd1c]
Former-commit-id: c2ae09c45f
2012-05-18 11:02:27 -05:00
Matt Nash
73d137b452 Issue #642 add ability for keywords in collaboration
Former-commit-id: eeb82184d0 [formerly d8e64039dc] [formerly eeb82184d0 [formerly d8e64039dc] [formerly 4e9b3ca786 [formerly 098e51414d1c148e55e6dd17b0f7b8d579f204fd]]]
Former-commit-id: 4e9b3ca786
Former-commit-id: 28dbb27b69 [formerly 3a3d320eb4]
Former-commit-id: 5caed115bf
2012-05-18 10:49:15 -05:00
Max Schenkelberg
60295eb76c Issue #239 Added circle drawing, fixed jumpiness issues
Change-Id: I3003fc4fd132dde2108ada5cb5ad1152bb8b4566

Former-commit-id: 80a7110f21 [formerly 4add8c7c8e] [formerly 80a7110f21 [formerly 4add8c7c8e] [formerly ab314d0333 [formerly fbf7ea43b20bff1c97dc38265d9dfae091e5dcb4]]]
Former-commit-id: ab314d0333
Former-commit-id: a3df5975db [formerly f28f51f5a5]
Former-commit-id: 955c308db5
2012-05-17 16:07:23 -05:00
Max Schenkelberg
6cbb7a0e8c Issue #639 Cleaned up chat logging a bit
Change-Id: Iba4e2a935dfdca9518ac0184fc53acfad2306c32

Former-commit-id: fdcc024dd7 [formerly d9c1499311] [formerly fdcc024dd7 [formerly d9c1499311] [formerly dce9ee1905 [formerly 19f338e41a81b50e57fe13b969c2b3a80f78ace0]]]
Former-commit-id: dce9ee1905
Former-commit-id: 6723e813e6 [formerly f6e74cc027]
Former-commit-id: 1462e030ec
2012-05-17 13:58:33 -05:00
Brad Gonzales
06a99fd702 Issue #639 added collaboration chat logging to localization.
Former-commit-id: 954324a221 [formerly 5935fd7091] [formerly 954324a221 [formerly 5935fd7091] [formerly 892b6d83e5 [formerly bf4e1e674e7461871ce19fe7ea74da7ef4db48ae]]]
Former-commit-id: 892b6d83e5
Former-commit-id: aa71750482 [formerly 06ebcfb533]
Former-commit-id: 0e79b46c23
2012-05-17 12:13:30 -05:00
Max Schenkelberg
bc6563c49f Issue #239 Added IShadedShape capability to remote target
Change-Id: I9616a1dff3ba7f73ed1382027dd725928587efad

Former-commit-id: 193bc7e249 [formerly 1ca2a9ce13] [formerly 193bc7e249 [formerly 1ca2a9ce13] [formerly 0e5fd5cd15 [formerly a2f8c091c08d47d7b8354071e0ceedc978168a29]]]
Former-commit-id: 0e5fd5cd15
Former-commit-id: 25b9975bc3 [formerly b764f03353]
Former-commit-id: 3d58fb358e
2012-05-16 15:01:41 -05:00
Brad Gonzales
b47ae13f47 Issue #628 Backing out PGEN changes with remote target checking
Former-commit-id: 6e170a377f [formerly 4e629cc7e4] [formerly 6e170a377f [formerly 4e629cc7e4] [formerly 0db325a1cd [formerly b5babbb4b852c83680b93b35311d14297f41532e]]]
Former-commit-id: 0db325a1cd
Former-commit-id: 00935dded7 [formerly aeaf7d922b]
Former-commit-id: 6a7397b0f6
2012-05-16 14:43:53 -05:00
Brad Gonzales
7af3b1e16c Issue #628 changed NCEP PGEN PgenStaticDataProder.java to cause the staticdataprovider Activator to be loaded. in PgenResource.drawGhost() check for dispatch target before drawing.
Former-commit-id: d44a07d33f [formerly b732df5f1c] [formerly d44a07d33f [formerly b732df5f1c] [formerly 11b93412bf [formerly b4229b04a76044a10848460f01b2b500add537e1]]]
Former-commit-id: 11b93412bf
Former-commit-id: aa731cc329 [formerly 64774ccf32]
Former-commit-id: bb04dccd7b
2012-05-16 13:09:52 -05:00
Brad Gonzales
34d055ea22 Issue #628 Nate's additional ncep pgen changes including PGEN's SymbolSetElement.java
Former-commit-id: 85f331b8b0 [formerly 50eba2317a] [formerly 85f331b8b0 [formerly 50eba2317a] [formerly d7babbaebd [formerly 23e99f88390a6865e0ba5d449402b4ef2febbd34]]]
Former-commit-id: d7babbaebd
Former-commit-id: e8a5c38fa7 [formerly 4b30085d9d]
Former-commit-id: 6c9898e98a
2012-05-16 10:12:27 -05:00
Matt Nash
11cf799e50 Issue #440 username/password logging fixes, synchronize all times collaboratorShapes are manipulated
Former-commit-id: ced182100b [formerly f1ea85ea44] [formerly ced182100b [formerly f1ea85ea44] [formerly 096b526e7a [formerly 9255532085a1d43955345092d567e04222bbb06d]]]
Former-commit-id: 096b526e7a
Former-commit-id: 67a7713c47 [formerly 9c36b710dc]
Former-commit-id: 8022bb6e79
2012-05-15 16:08:29 -05:00
Max Schenkelberg
7fdb33ac73 Issue #588 Added canvas size to construction of editor
Change-Id: I72a634c2b15f654474557ec9824fa11550a6a2a7

Former-commit-id: df5cc2e0c3 [formerly f3ec9008f2] [formerly df5cc2e0c3 [formerly f3ec9008f2] [formerly f3277ca807 [formerly 82ef715dda2308686870e18aca6184ea2f0f71f2]]]
Former-commit-id: f3277ca807
Former-commit-id: b810e46d4b [formerly 5f2e758c25]
Former-commit-id: 660334e023
2012-05-14 17:13:54 -05:00
Max Schenkelberg
2df7b826b5 Issue #588 Fixed bug with participant resizing window
Change-Id: I9a4fca76fdc0f81a8f55135402efcf187c684915

Former-commit-id: 40b7dbd920 [formerly 7d02ae3404] [formerly 40b7dbd920 [formerly 7d02ae3404] [formerly a709f9a491 [formerly c31c62f94799322fc5811c8f38afdb01c9c49c2c]]]
Former-commit-id: a709f9a491
Former-commit-id: 9daf435929 [formerly 900b55f292]
Former-commit-id: e24c82a6b7
2012-05-14 16:35:28 -05:00
Matt Nash
8ffcdf0553 Issue #444 minor cleanup
Former-commit-id: 966dbbf836 [formerly 1c7f6861e4] [formerly 966dbbf836 [formerly 1c7f6861e4] [formerly ba73d47044 [formerly b601ea017e09c9fcd74e974d3f5ce2f0104a75fc]]]
Former-commit-id: ba73d47044
Former-commit-id: 70653e8093 [formerly d88b7e7c33]
Former-commit-id: 4ffa120f8d
2012-05-14 15:25:03 -05:00
Max Schenkelberg
1c9ee7ed91 Issue #588 Made Canvas sizes stay in sync to fix text size issues
Change-Id: I1a9bff16168eda355850d47983fe479853e2e907

Former-commit-id: d44ba58859 [formerly fdbd626715] [formerly d44ba58859 [formerly fdbd626715] [formerly c7ea0894bb [formerly 8b6bb90e6ba0f1b21e78594ff3b3604924662138]]]
Former-commit-id: c7ea0894bb
Former-commit-id: e9f053c037 [formerly 2204422d14]
Former-commit-id: c0859506f1
2012-05-14 12:38:19 -05:00
Matt Nash
ace74173ba Issue #444 add further capability of transferring session leader
Former-commit-id: 01f852004b [formerly 746fd1464c] [formerly 01f852004b [formerly 746fd1464c] [formerly b2621eb89e [formerly 49a19d4b6a56252e4e17f4563cdd4f94ef0ab3cc]]]
Former-commit-id: b2621eb89e
Former-commit-id: a67300f43c [formerly fc9a902f04]
Former-commit-id: 259cb38b94
2012-05-11 16:29:27 -05:00
Nate Jensen
996af2f34d Issue #427 clean up telestrator rsc on session exit
Change-Id: I14b5603f480e15537aa42eb2d8e5eebad87d09de

Former-commit-id: fd766443b7 [formerly 46e165ef69] [formerly fd766443b7 [formerly 46e165ef69] [formerly 56a8c1f937 [formerly 9908d7d3de10ac919c550995ce0ba766f67096ee]]]
Former-commit-id: 56a8c1f937
Former-commit-id: 02c25f4adc [formerly a72d2b528f]
Former-commit-id: 5cc7230b61
2012-05-11 16:09:29 -05:00
Nate Jensen
e0e36eddc7 Issue #427 cleanup properly on exiting session
Change-Id: I4779ce49f9a9ee6d64cd908e04b007d808cb3bc6

Former-commit-id: 797f1e5ec1 [formerly e68e75d735] [formerly 797f1e5ec1 [formerly e68e75d735] [formerly 057b5eb3b9 [formerly c42b670e619beaba9b22bfa3bbdc6e1f0b9da075]]]
Former-commit-id: 057b5eb3b9
Former-commit-id: fd16a8ee65 [formerly e5a84290de]
Former-commit-id: 6f1cc36e72
2012-05-11 15:30:06 -05:00
Max Schenkelberg
6c5c820afa Issue #588 fixed resizing of participant canvas
Change-Id: I17e0ce448682291948af7339fa8982e21cf3b220

Former-commit-id: 7bb3576866 [formerly d500f49208] [formerly 7bb3576866 [formerly d500f49208] [formerly 21b7735e92 [formerly 544c1226d807308c06037f98cad6ca2b037d69ce]]]
Former-commit-id: 21b7735e92
Former-commit-id: de6297fada [formerly 85f2900333]
Former-commit-id: 67c4838d7f
2012-05-11 14:41:11 -05:00
Nate Jensen
824d66ad32 Issue #443 improve zlib compression
Change-Id: If1ce4e4288ad45276d11a4d9a3bf5dc8435352e4

Former-commit-id: 4dbc6f7726 [formerly 105d703fbf] [formerly 4dbc6f7726 [formerly 105d703fbf] [formerly 1838de6993 [formerly 5203a659ec0aaea45cbf281544b22b23b54a51d8]]]
Former-commit-id: 1838de6993
Former-commit-id: 0095b4083e [formerly 571eca8d57]
Former-commit-id: ef97a25505
2012-05-11 14:04:41 -05:00
Nate Jensen
99130351c6 Issue #590 fix issue when exiting GFE
Change-Id: I6dd72855e80a49be5735f9d805fbc42e42c7f157

Former-commit-id: 7abedf8904 [formerly 75754040cb] [formerly 7abedf8904 [formerly 75754040cb] [formerly c92f9ee705 [formerly 258fead57d05a908b32b0b74a2e34ab19be0947f]]]
Former-commit-id: c92f9ee705
Former-commit-id: 4be7493c21 [formerly c55862a1ab]
Former-commit-id: 94661e501c
2012-05-11 13:58:46 -05:00
Matt Nash
6eeaca40c4 Issue #440 fix login dialog not popping up
Former-commit-id: ed501edb0c [formerly fa89b0cf6e] [formerly ed501edb0c [formerly fa89b0cf6e] [formerly a8c5c7b3ca [formerly 8b9c87c5e4fe04405ce1fa3cb86eeaed14e3aadb]]]
Former-commit-id: a8c5c7b3ca
Former-commit-id: e747734aff [formerly e19b5cb75c]
Former-commit-id: aa59e0a555
2012-05-11 12:04:56 -05:00
Brad Gonzales
8d46ba706c Issue #628 Nate's ncep pgen feature.xml.
Former-commit-id: dd0192fef2 [formerly 1a763575ed] [formerly dd0192fef2 [formerly 1a763575ed] [formerly 877b13b79b [formerly 5151a8934bd6f9558c91b5493273ca02c93b2064]]]
Former-commit-id: 877b13b79b
Former-commit-id: d0953dd11a [formerly c909b32d0b]
Former-commit-id: 66d5bb6d4b
2012-05-11 10:12:47 -05:00
Nate Jensen
b43cbc5bbb Issue #590 Fix rsc so it can be recycled
Change-Id: I3cddf5d67c2e5dfb52380529f703a0d9558d8916

Former-commit-id: fbd4b64be8 [formerly 798463a4cf] [formerly fbd4b64be8 [formerly 798463a4cf] [formerly 78c1298085 [formerly cd52bfbeb593a4b1891f4df7f7ae73c7193504d0]]]
Former-commit-id: 78c1298085
Former-commit-id: 536d47dcf0 [formerly 7be5ef8528]
Former-commit-id: 814be4f5c8
2012-05-11 10:04:36 -05:00
Max Schenkelberg
0f3d4cf0e4 Issue #588 Got crude string rendering working. Doesn't quite look good if canvas bounds are not same size and legends are not handled specially
Change-Id: I8f3d0560869178598f160fb2e7914c45f656a860

Former-commit-id: 5fca70461f [formerly 31243a9dfe] [formerly 5fca70461f [formerly 31243a9dfe] [formerly 074b9aba8c [formerly 24b673fcc45a4da27ac349bdebf8b48f6405607b]]]
Former-commit-id: 074b9aba8c
Former-commit-id: d2d6a4d1eb [formerly d22b403f48]
Former-commit-id: fc471eb557
2012-05-10 18:03:00 -05:00
Brad Gonzales
cb1ff65e77 Issue #628 committing more PGEN code received from Plummer on 4-19-2012.
Former-commit-id: 22a29b98b2 [formerly a90d64e1fc] [formerly 22a29b98b2 [formerly a90d64e1fc] [formerly 0df0aa8663 [formerly bd658184b246452b5d3e2154d79f2179bdc12594]]]
Former-commit-id: 0df0aa8663
Former-commit-id: af92e8d329 [formerly e1f03d9369]
Former-commit-id: 998c7b3174
2012-05-10 17:02:18 -05:00
Brad Gonzales
632020195a Issue #628 committing PGEN code received from Plummer on 4-19-2012.
Former-commit-id: fda897d2d0 [formerly 253e8bc948] [formerly fda897d2d0 [formerly 253e8bc948] [formerly 295cbf95e5 [formerly 0816cd253c86acc699cb90866131619c4679f631]]]
Former-commit-id: 295cbf95e5
Former-commit-id: 2a3bf4ec32 [formerly ae3d17c698]
Former-commit-id: a610dcde73
2012-05-10 16:50:45 -05:00
Matt Nash
41520eb43f Issue #440 fix multiple login dialogs when trying to click 'Cancel'
Former-commit-id: cfcfb84668 [formerly 62ddaa6fa8] [formerly cfcfb84668 [formerly 62ddaa6fa8] [formerly 4558d1bd41 [formerly e2c0426f38c59954e1e57d9dddce2bd93f54f36f]]]
Former-commit-id: 4558d1bd41
Former-commit-id: 88bfafe9f2 [formerly 4f4b4a0e23]
Former-commit-id: 8873bc3aa9
2012-05-10 11:37:52 -05:00
Nate Jensen
624849ac25 Merge "Issue #561 - created a new httpd-collaboration rpm and standardized the build of httpd-pypies and httpd-collaboration. Updated the Build 1.0 to build the new httpd rpm. For now collaboration will default to port 80 until the openfire plugin ticket is finished." into 11-Collaboration
Former-commit-id: c12a2c59e4 [formerly 859a91cfcd] [formerly c12a2c59e4 [formerly 859a91cfcd] [formerly ef756e4e0e [formerly 317384cdff533ddcbe15c33351b2b1e42ee210a9]]]
Former-commit-id: ef756e4e0e
Former-commit-id: 3a5b30e846 [formerly 8f991ac1bd]
Former-commit-id: 9c0943ffe4
2012-05-10 11:26:02 -05:00
Matt Nash
eb4dacb7a6 Issue #444 fix rename
Former-commit-id: 44d23c36e7 [formerly 267c83294d] [formerly 44d23c36e7 [formerly 267c83294d] [formerly c05e57d3d2 [formerly fc9ed4eb5ee470d309fea6af74d254728877c531]]]
Former-commit-id: c05e57d3d2
Former-commit-id: 87250a5585 [formerly 0f0f49249b]
Former-commit-id: d417baed67
2012-05-10 10:09:48 -05:00
Matt Nash
e9e6782125 Isssue #444 rename project to better match structure
Former-commit-id: 4733741c0c [formerly 8caf649518] [formerly 4733741c0c [formerly 8caf649518] [formerly ba377eae5c [formerly e644591a18b0a145c7db2151ebf06a17326d8572]]]
Former-commit-id: ba377eae5c
Former-commit-id: 9e7f6df610 [formerly ef6345493d]
Former-commit-id: d0621994c8
2012-05-10 10:06:06 -05:00
Bryan Kowal
4f7aa56ad1 Issue #561 - created a new httpd-collaboration rpm and standardized the build of httpd-pypies and httpd-collaboration. Updated the Build 1.0 to build the new httpd rpm. For now collaboration will default to port 80 until the openfire plugin ticket is finished.
Former-commit-id: 38f61f4a73 [formerly ea8bf623cf] [formerly 38f61f4a73 [formerly ea8bf623cf] [formerly fbb694b48e [formerly b831809423f9aa6e1da5678f2653fa52d928c132]]]
Former-commit-id: fbb694b48e
Former-commit-id: cbe0691efd [formerly f7cba22ee2]
Former-commit-id: 7f6a6ff856
2012-05-10 09:24:56 -05:00
Matt Nash
ec77c5d583 Issue #429 clean up telestrator
Former-commit-id: ccb859576c [formerly d88d5ab229] [formerly ccb859576c [formerly d88d5ab229] [formerly 3cd13e285c [formerly 55a10673d6585098caf45aa4f19f0add42aaf4a5]]]
Former-commit-id: 3cd13e285c
Former-commit-id: 4eda4ab762 [formerly 9612df2217]
Former-commit-id: a524ac4d99
2012-05-10 09:18:41 -05:00