mjames-upc
|
e2d9ba9a4c
|
merge unidata_15.1.1 to unidata_16.1.4
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
|
2016-03-25 13:09:32 -05:00 |
|
mjames-upc
|
f827e8dd72
|
don't show AWIPS User Administration menu
Former-commit-id: d109e132b99a276aa8f35ef4d9ac361d63298e44 [formerly c83ded7ce0393592fbe03c005e2355a15faeae2d]
Former-commit-id: 4417e91fe7
|
2016-03-13 18:06:56 -05:00 |
|
Steve Harris
|
7e7cdd1c7a
|
Merge tag 'OB_15.1.1-14' into omaha_16.1.1
15.1.1-14
Conflicts:
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Former-commit-id: 92470a2ce7952ee72dbe2557ee16ee54d7ae901c
|
2015-06-04 11:08:19 -05:00 |
|
Steve Harris
|
9b3d8a8443
|
Merge tag 'OB_15.1.1-12' into omaha_16.1.1
15.1.1-12
Conflicts:
build/deploy.edex.awips2/esb/bin/setup.env
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
|
2015-05-20 11:25:45 -05:00 |
|
David Lovely
|
80dc4c85d9
|
Omaha #4146 Bundled class files in a jar when unpacked.
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02
Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
|
2015-05-19 10:23:35 -05:00 |
|
Roger Ferrel
|
bff71b34b8
|
Omaha #4419 NwsRoleDataManager.getRolePermissions now sorts its results.
Change-Id: I575c3ee82e4ee4ef4a700c993cf82d31fed7fa01
Former-commit-id: 754bc5602785242ace4d3b60b2470410ceb62c1a
|
2015-05-12 16:21:11 -05:00 |
|
Roger Ferrel
|
39d9ebc61f
|
Omaha #4419 NwsRoleDataManager.getRolePermissions now sorts its results.
Change-Id: I575c3ee82e4ee4ef4a700c993cf82d31fed7fa01
Former-commit-id: bff71b34b8 [formerly 754bc5602785242ace4d3b60b2470410ceb62c1a]
Former-commit-id: 6bd2a22cda
|
2015-05-12 16:21:11 -05:00 |
|
Roger Ferrel
|
a104dd0dc8
|
Omaha #4419 Sort User Administration's edit user dialog lists.
Former-commit-id: 972c3f1ff1fcbcc35c4268275a3c8fd4c0d74860
|
2015-05-05 17:10:40 -05:00 |
|
Roger Ferrel
|
5bd84f89c5
|
Omaha #4419 Sort User Administration's edit user dialog lists.
Former-commit-id: a104dd0dc8 [formerly 972c3f1ff1fcbcc35c4268275a3c8fd4c0d74860]
Former-commit-id: 1cfc87f724
|
2015-05-05 17:10:40 -05:00 |
|
Slav Korolev
|
0dc34f2bc8
|
Omaha #4345 - Fixed UserAdminSelectDlg to expand vertically properly
Former-commit-id: dae4db1a74982458dda149c51d41e028d1ee9336
|
2015-04-02 11:04:28 -04:00 |
|
Nathan Bowler
|
18e1ede6a1
|
Omaha #3801 Fix closing cave with new/edit dialogs open, description menu when nothing is selected, and when edit/delete buttons are enabled
Change-Id: I982e959f2c4ebe7b26ee1aa615953228b9781474
Former-commit-id: 32621b600176a3afff5ee42228eb8cee2417c9c6
|
2014-12-05 15:31:46 -05:00 |
|
Nathan Bowler
|
907425cb04
|
Omaha #3801 Fix closing cave with new/edit dialogs open, description menu when nothing is selected, and when edit/delete buttons are enabled
Change-Id: I982e959f2c4ebe7b26ee1aa615953228b9781474
Former-commit-id: 18e1ede6a1 [formerly 32621b600176a3afff5ee42228eb8cee2417c9c6]
Former-commit-id: 59f4baa5fe
|
2014-12-05 15:31:46 -05:00 |
|
Nate Jensen
|
25e09348c0
|
Omaha #3549 remove dead code
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2
Former-commit-id: 70209fbc92c5459dab007224e1f5783a5bb08fd0
|
2014-12-03 17:35:08 -06:00 |
|
Nate Jensen
|
cb745b34f3
|
Omaha #3549 remove dead code
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2
Former-commit-id: 25e09348c0 [formerly 70209fbc92c5459dab007224e1f5783a5bb08fd0]
Former-commit-id: 19d14b6107
|
2014-12-03 17:35:08 -06:00 |
|
Nate Jensen
|
8dbe6abbe4
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
|
2014-12-03 15:47:10 -06:00 |
|
Nate Jensen
|
6c1391e938
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]
Former-commit-id: ec28d2f1a0
|
2014-12-03 15:47:10 -06:00 |
|
Ben Steffensmeier
|
e32037b42a
|
Omaha #3390 Remove references to deprecated API.
Former-commit-id: ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3
|
2014-09-02 15:39:45 -05:00 |
|
Ben Steffensmeier
|
950075dc59
|
Omaha #3390 Remove references to deprecated API.
Former-commit-id: e32037b42a [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]
Former-commit-id: 1d2144e840
|
2014-09-02 15:39:45 -05:00 |
|
Mike Duff
|
e791617acc
|
Issue #2247 - Fix permission displays in UserAdmin Dialogs
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4
Former-commit-id: ca3499309373b553874e7a89e8f38f30e9b041e6
|
2013-08-14 10:13:05 -05:00 |
|
Mike Duff
|
e319928638
|
Issue #2247 - Fix permission displays in UserAdmin Dialogs
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4
Former-commit-id: e791617acc [formerly ca3499309373b553874e7a89e8f38f30e9b041e6]
Former-commit-id: 097028ec59
|
2013-08-14 10:13:05 -05:00 |
|
Dave Hladky
|
db7c81a1df
|
Issue #2236 Merged Mike's Code
Change-Id: I78943ceee3aeea1eeb6d815fefd3e82b46d677a6
Former-commit-id: 7cc09247bc4166f9586867fba097b4c40577464d
|
2013-07-31 16:16:47 -05:00 |
|
Dave Hladky
|
2049a9b4da
|
Issue #2236 Merged Mike's Code
Change-Id: I78943ceee3aeea1eeb6d815fefd3e82b46d677a6
Former-commit-id: db7c81a1df [formerly 7cc09247bc4166f9586867fba097b4c40577464d]
Former-commit-id: e21cc84d16
|
2013-07-31 16:16:47 -05:00 |
|
Steve Harris
|
d2a654625f
|
13.3.1-1 baseline
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
8ae397085e
|
13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: 71e8990021
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
328c6dccad
|
13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
33bc5fd816
|
13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
|
2013-01-23 11:18:44 -05:00 |
|