1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Commit Graph

5282 Commits

Author SHA1 Message Date
Matthew Jones
53a96fd9eb Merge pull request #440 from matburt/pendo_apiside
API Side Pendo Tracking Work
2015-09-29 01:04:21 -04:00
jlmitch5
924e8b8114 Merge pull request #443 from jlmitch5/loginModalDisappears
fixed login modal disappearing by improving ux
2015-09-28 16:42:33 -04:00
John Mitchell
e5c6dda79f fixed login modal disappearing by improving ux 2015-09-28 16:05:41 -04:00
John Mitchell
2e43ed0405 adhoc ui fixes 2015-09-28 10:47:12 -04:00
John Mitchell
f1f9f5f982 fixed custom logo path stuff to work with server 2015-09-25 16:58:53 -04:00
Matthew Jones
a3410920a9 Remove management job schedule count restriction 2015-09-25 16:00:19 -04:00
Matthew Jones
3d7f25218a Add api side support for pendo
Also adds setup playbook support for pendo.  This change anticipates
that the default for new installations will be 'detailed'
2015-09-25 15:52:42 -04:00
John Mitchell
331bb09a80 login modal width overflow of logo fix 2015-09-25 15:17:58 -04:00
John Mitchell
e8504dc57b Merge branch 'loginRefactor2' into devel 2015-09-25 15:02:24 -04:00
John Mitchell
e817693169 added pluggable auth icons 2015-09-25 14:59:28 -04:00
Matthew Jones
a7f1e69352 Fix an issue with default schedules
These weren't being created correctly, the logic meant an extra schedule
would be created on cleanup facts erroneously selected to be cleanup
activity stream
2015-09-25 14:17:31 -04:00
Matthew Jones
2135a6651b Hash the license key to show a deployment key
This can be used by pendo and other things that need to identify an
individual deployment without exposing the actual license key
2015-09-25 13:21:08 -04:00
Matthew Jones
3a6807c5b4 Add environment variable that sets proot's tmp dir
Only really useful with patched proot containing tmpdir fix
2015-09-25 11:08:03 -04:00
Matthew Jones
30d88b1829 Merge pull request #439 from matburt/backup_ui_customizations
Backup customized ui files
2015-09-24 22:36:31 -04:00
John Mitchell
4daa7874ad fixed weird container issue that somehow made its way into tower 2015-09-24 18:38:20 -04:00
John Mitchell
0f5dde3bd4 update gitignore to include local_settings.json 2015-09-24 17:30:17 -04:00
John Mitchell
e655e2ad54 styling updates based on taufique suggestions 2015-09-24 17:28:31 -04:00
John Mitchell
1de977b4c5 refactor login folder to be a little cleaner 2015-09-24 16:16:55 -04:00
jlmitch5
5b87eeb515 Merge pull request #437 from jlmitch5/pluggable_auth
Pluggable auth
2015-09-24 14:02:32 -04:00
James Laska
531fc4d8ed Correct reprepro/conf path in Makefile 2015-09-23 20:33:40 -04:00
John Mitchell
4980c2145c create conditional to not display third party login block 2015-09-23 17:43:35 -04:00
Bill Nottingham
1563f26742 Merge pull request #436 from wenottingham/devel
Add preflight check for permissions on /var/log.
2015-09-23 17:09:09 -04:00
John Mitchell
25132b5daa pluggable auth ui styling 2015-09-23 17:00:13 -04:00
James Laska
7582458a0a Cleanup merge fallout from release_2.3 2015-09-23 16:10:40 -04:00
Chris Meyers
12180531da Merge pull request #432 from chrismeyersfsu/feature-session_info
add Auth-Token-Timeout to http headers
2015-09-23 13:30:16 -04:00
John Mitchell
169066df22 Merge less block styling of login modal 2015-09-23 11:26:36 -04:00
John Mitchell
2ac72da19b merge loginModal less styling 2015-09-23 11:26:13 -04:00
John Mitchell
18164181b4 moved login modal to less block styling 2015-09-23 10:49:56 -04:00
Chris Meyers
eb8219fd9f add Auth-Token-Timeout to http headers 2015-09-23 10:30:19 -04:00
jlmitch5
1aa82df7ee Merge pull request #430 from jlmitch5/login_rebranding
rebranding and notice in ui login support
2015-09-22 16:04:35 -04:00
jlmitch5
353a7ec9b4 fixed type in auth controller causing notice to not show up 2015-09-22 15:59:54 -04:00
Matthew Jones
256af567de Merge branch 'release_2.3' into devel
* release_2.3: (24 commits)
  Updated package changelogs
  Rephrase task name
  Make purge supervisor.conf conditional on 2.2 el6
  Fix another name typo.
  Update python-ldap license text.
  Add LGPL source directly so it gets shipped.
  Update font-awesome licenses per legal feedback
  Remove bundled_licenses - we are shipping the source for bundled items, and therefore do not need to provide this separately.
  Add more license texts.
  Add full Apache licenses to files, per Pam.
  Attempt to harden mongodb tgz download
  Correct DJRF/DJRF-mongoengine licenses, rename qsstats license to match pkg name.
  Fix some typos in file names, and add licenses for some things we have modified in our own repos.
  Update Ubuntu depends and ppa's
  Include source for bundled packages in bundle.
  Include license information in packaging
  Add READMEs for the license directories.
  vendored python licenses
  Add bundled licenses documentation
  Revert to stock libzmq3 for deb depends
  ...
2015-09-22 15:57:32 -04:00
James Laska
618d69ecbc Updated package changelogs 2015-09-22 15:30:57 -04:00
James Laska
ba65396f1f Merge pull request #431 from wenottingham/release_2.3
Fix another name typo.
2015-09-22 13:04:46 -04:00
Matthew Jones
9859ac3754 Merge pull request #429 from matburt/migrate_to_default_schedules
Add some default schedules for cleanup jobs
2015-09-22 11:29:15 -04:00
Matthew Jones
4cf2f32451 Remove the contents of tmp/ on clean 2015-09-22 11:04:40 -04:00
Bill Nottingham
c2d1698a9b Fix another name typo. 2015-09-21 22:30:56 -04:00
James Laska
f460f10792 Merge pull request #427 from wenottingham/release_2.3
Add LGPL source directly so it gets shipped.
2015-09-21 20:31:36 -04:00
James Laska
f10ab47043 Merge pull request #428 from wenottingham/ldaplicense
Adjust python-ldap license text blurb.
2015-09-21 20:30:39 -04:00
John Mitchell
dd0bc0ec17 rebranding and notice in ui login support 2015-09-21 17:34:19 -04:00
Matthew Jones
077819c4c5 Add some default schedules for cleanup jobs 2015-09-21 14:53:53 -04:00
Matthew Jones
5fa0ce9d58 Include apt-get update with install
This forces the Docker apt-get update to not attempt to re-use the cache
2015-09-21 14:52:43 -04:00
Bill Nottingham
f668f75563 Update python-ldap license text.
Change blurb to match what Fedora/RH ship for this package.
2015-09-21 14:46:43 -04:00
Bill Nottingham
27869be4cd Add LGPL source directly so it gets shipped.
(HAAAAAAAAAAAAAAAAAAAAAAACK)
2015-09-21 14:01:04 -04:00
James Laska
3e521d2f6a Merge pull request #426 from wenottingham/release_2.3
Further license-related tweaks, per Pam.
2015-09-21 13:59:39 -04:00
James Laska
5ff2e84ef4 Update font-awesome licenses per legal feedback 2015-09-21 13:55:55 -04:00
Bill Nottingham
e4795111ef Remove bundled_licenses - we are shipping the source for bundled items, and therefore do not need to provide this separately. 2015-09-21 13:53:49 -04:00
Bill Nottingham
17f9fc6267 Add more license texts. 2015-09-21 13:45:45 -04:00
jaredevantabor
2fe97e526c Merge pull request #425 from jaredevantabor/login_cofig
LoadConfig fix to load config.js first and then local_settings.json
2015-09-21 13:38:31 -04:00
Bill Nottingham
a0b3647c84 Add full Apache licenses to files, per Pam. 2015-09-21 13:35:37 -04:00