5468 Commits

Author SHA1 Message Date
jaredevantabor
ce78fee680 Merge pull request #497 from jaredevantabor/footer
Footer Opacity on Login
2015-11-12 13:11:18 -08:00
Jared Tabor
4ac56a474b Set footer opacity to 0 when on login modal
and hide the copyright if the screen is not wide enough for it
2015-11-12 00:35:20 -08:00
John Mitchell
3a87b22269 upgrade angular and angular-animate 2015-11-11 15:09:55 -05:00
John Mitchell
a5e938e9ab fixed merge conflict with layout css 2015-11-06 13:34:38 -05:00
John Mitchell
1662b8bff7 update ids based on conversation with jlaska 2015-11-06 13:26:03 -05:00
John Mitchell
5863d25968 move hover style under selected so it is not overridden 2015-11-06 13:25:23 -05:00
John Mitchell
7d208b7d6f updates based on jtabor's review 2015-11-06 10:53:20 -05:00
jaredevantabor
229be0a99e Merge pull request #491 from jaredevantabor/footer
Directivize footer and make it sticky
2015-11-05 17:17:52 -08:00
Jared Tabor
edc364be8b Directivize footer and make it sticky
Sticky to bottom of screen if viewport is taller than brawser window
2015-11-05 16:57:05 -08:00
John Mitchell
2db805f051 Rehaul of main-menu
Updated assets, main-menu module code, main layout styling, and the index.html template.
2015-11-05 19:31:20 -05:00
John Mitchell
cb9495c2e3 hacky tooltip style fixing for new nav 2015-11-05 19:31:20 -05:00
John Mitchell
e5d9d9f9cb add new fontcustom icons 2015-11-05 19:31:20 -05:00
jaredevantabor
9181790df7 Merge pull request #487 from jaredevantabor/footer
Tower 3.0 footer
2015-11-05 09:22:23 -08:00
Jared Tabor
0c6bb50dd4 Tower 3.0 footer
footer with copyright and logo
2015-11-04 15:21:41 -08:00
Matthew Jones
45982e50e6 Merge branch 'release_2.4.0' into devel
* release_2.4.0: (94 commits)
  Fix up location of apt key for mongo
  Handle playbook_on_include events from v2 ansible
  if basic auth in headers, don't use cookie token
  Add a docker-ui container to the compose workflow
  Fix custom inventory scripts on org deletion
  adding check for missing session time from local storage
  Properly handle idle/expired session across tabs
  fixed system tracking date issues
  Improve postgres user creation
  Remove silly user check in postgres config
  Fix typo in `clean` target
  fixed sources scope regions issue
  fixed scan date being the earlier one when identical
  fixed the console errors for the sources scope
  fixed console error
  fixed standard out load for adhoc commands
  fixing custom inventory script error
  Revert "change list separator for adhoc host patterns"
  Revert "update awFeature ldap to enterprise_auth"
  Revert "Change delimiter from ':' to ','."
  ...
2015-10-20 16:10:02 -04:00
Matthew Jones
b579b76099 Handle playbook_on_include events from v2 ansible 2015-10-20 11:18:07 -04:00
Chris Meyers
bcc2cb7914 Merge pull request #479 from chrismeyersfsu/fix-basic_auth_cookies
if basic auth in headers, don't use cookie token
2015-10-19 17:07:14 -04:00
Chris Meyers
1db26531a1 if basic auth in headers, don't use cookie token
* Allows for basic auth to be used when cookie token fails
2015-10-19 14:49:15 -04:00
Matthew Jones
99da0965ef Add a docker-ui container to the compose workflow 2015-10-19 12:07:09 -04:00
Matthew Jones
b25413002c Fix custom inventory scripts on org deletion
We'll now clear the organization for it, this requires a database
migration to accept null values for custom inventory scripts
2015-10-19 12:07:09 -04:00
jaredevantabor
4692c13a9d Merge pull request #478 from jaredevantabor/session-fixes
Properly handle idle/expired session across tabs
2015-10-16 20:27:48 -07:00
Jared Tabor
d7c78d0b28 adding check for missing session time from local storage
for gracefully failing if session time isn't set
2015-10-16 20:26:25 -07:00
jlmitch5
aca31b0ff4 Merge pull request #477 from jlmitch5/system_tracking_date_issues
fixed system tracking date issues
2015-10-16 21:34:34 -04:00
Jared Tabor
fa2a11d8e7 Properly handle idle/expired session across tabs
this utilizes local storage instead of cookies/rootscope
2015-10-16 16:48:09 -07:00
John Mitchell
ed8aa45693 fixed system tracking date issues 2015-10-16 17:57:23 -04:00
James Laska
3ae78ca6e8 Fix typo in clean target 2015-10-15 20:30:36 -04:00
John Mitchell
6b9cb0f496 fixed sources scope regions issue 2015-10-15 12:04:57 -04:00
John Mitchell
e4452fba2b fixed scan date being the earlier one when identical 2015-10-15 10:10:48 -04:00
jlmitch5
8d705b01f2 Merge pull request #476 from jlmitch5/fix_adhoc_stdout_load
fixed standard out load for adhoc commands
2015-10-15 09:46:43 -04:00
John Mitchell
80c629bf3e fixed the console errors for the sources scope 2015-10-14 19:53:58 -04:00
John Mitchell
4049a2cfa4 fixed console error 2015-10-14 18:18:47 -04:00
John Mitchell
e056a93ea9 fixed standard out load for adhoc commands 2015-10-14 17:40:54 -04:00
Jared Tabor
b45534859f fixing custom inventory script error
the source_script ID wasn't getting translated to inventory script ID on sources_scope when editing a preexisting source
2015-10-14 13:40:37 -07:00
John Mitchell
54f308a61b Revert "change list separator for adhoc host patterns"
This reverts commit 7200ad3a87b642d7f947f9eaa110b8c90767f34f.
2015-10-14 16:02:09 -04:00
John Mitchell
e3d6803df7 Revert "update awFeature ldap to enterprise_auth"
This reverts commit bc49756ef6e792efd5a32d7342b0f7d1aa17a950.
2015-10-14 16:01:37 -04:00
Jared Tabor
ff121a56c1 check for object existence before searching for key on that object
to resolve some console errors in regards to http  error handling
2015-10-14 09:14:44 -07:00
Matthew Jones
1bbd5fbe0a Update UI error text for single data picker
When no data is available
2015-10-14 10:19:05 -04:00
Chris Meyers
f051c13374 list cust inv scripts with deleted orgs 2015-10-14 07:36:32 -05:00
Matthew Jones
fd33d7df58 Tweak proj rbac for orphaned projects
Slight tweak to the rbac for projects related to the user who created
them.  IF a user created a project but it is orphaned/not associated
with an organization then they will be able to see/change it.  If,
however, it is created and associated with an organization and then they
are removed as an org admin they will no longer have access to it.
2015-10-13 16:42:12 -04:00
jaredevantabor
d0888c1bcb Merge pull request #473 from jaredevantabor/session-fixes
fixing timer issue that would log user out on each page refresh
2015-10-13 12:37:04 -07:00
Jared Tabor
7e95b3cde7 fixing timer that would log user out on each page refresh
the check to see if the session time existed in memory was not specific enough
2015-10-13 11:37:55 -07:00
Matthew Jones
a27a620bcf Remove pdb trace from unit test 2015-10-13 14:10:40 -04:00
Jared Tabor
17fe670393 making pendo bootstrapping more explicit
bootstrap if state is anonymous/detailed (was previously set to !off)
2015-10-13 10:28:54 -07:00
Bill Nottingham
80f088b39b Merge pull request #474 from wenottingham/release_2.4.0
Change delimiter from ':' to ','.
2015-10-13 11:56:12 -04:00
Matthew Jones
4b46f33299 Fix up unit tests for overwrite_vars 2015-10-13 11:38:37 -04:00
Matthew Jones
f7ebf956c1 Remove the created_by access ability for projects
Now, simply being the creator of a project does not convey any access
for users.  You must be in a project/team that has access to it and you
must be an org admin for an org that has the project to be able to make
changes to it
2015-10-13 11:24:48 -04:00
John Mitchell
8d526ff812 prettify api response for job failure explanation 2015-10-13 11:20:19 -04:00
John Mitchell
2f23b5c113 remove organization lookup from inventory script query 2015-10-12 23:41:21 -04:00
John Mitchell
1969559ee1 change list separator for adhoc host patterns 2015-10-12 19:54:59 -04:00
jaredevantabor
fcb14f27fa Merge pull request #472 from jaredevantabor/ng-pendo
removing ng-pendo from UI packaging
2015-10-12 12:20:45 -07:00