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

5638 Commits

Author SHA1 Message Date
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
Jared Tabor
33a82222b9 updated $http get request from deprecated syntax for angular 1.4 2015-09-21 11:38:53 -04:00
Jared Tabor
f88320a5f7 LoadConfig fix to load config.js first and then local_settings.json 2015-09-21 11:15:10 -04:00
jaredevantabor
fdace7e10d Merge pull request #424 from ansible/login_2.4_2
Refactoring login modal and services
2015-09-21 11:10:41 -04:00
James Laska
ecc866e061 Merge pull request #423 from wenottingham/release_2.3
Fix some typos in file names, and add licenses for some things we hav…
2015-09-21 10:58:51 -04:00
Bill Nottingham
a470d9d6e8 Correct DJRF/DJRF-mongoengine licenses, rename qsstats license to match pkg name. 2015-09-21 10:42:40 -04:00
Bill Nottingham
3275ff3a18 Fix some typos in file names, and add licenses for some things we have modified in our own repos. 2015-09-21 10:35:48 -04:00
James Laska
dfca63d54c Merge pull request #422 from wenottingham/release_2.3
Include source for bundled packages in bundle.
2015-09-20 15:05:16 -04:00
James Laska
222f63873c Merge pull request #421 from jlaska/release_2.3
Include license information in packaging
2015-09-18 16:45:07 -04:00
James Laska
e1b6588602 Include license information in packaging 2015-09-18 16:42:03 -04:00
James Laska
076c6c43a2 Merge pull request #420 from wenottingham/release_2.3
Add READMEs for the license directories.
2015-09-18 16:32:42 -04:00
Bill Nottingham
766b275d26 Add READMEs for the license directories. 2015-09-18 16:00:12 -04:00
Chris Meyers
6c0e76d7e9 Merge pull request #418 from jlaska/release_2.3
Add bundled licenses documentation
2015-09-18 15:24:08 -04:00
James Laska
31a709d9ca Merge pull request #419 from chrismeyersfsu/feature-python_licenses
vendored python licenses
2015-09-18 15:23:02 -04:00
Chris Meyers
8d3c7353fb vendored python licenses 2015-09-18 13:04:42 -04:00
James Laska
07574c9b64 Add bundled licenses documentation
Also includes in the bundled tarball artifact.
2015-09-18 10:04:49 -04:00
James Laska
121c6e02c9 Merge pull request #416 from jlmitch5/release_2.3_js_licenses
add js library licenses
2015-09-18 10:02:33 -04:00
James Laska
b260e1e493 Merge pull request #417 from wenottingham/devel
Improve the failure message for umask in the installer playbook.
2015-09-17 19:09:01 -04:00
John Mitchell
68416fc8e0 add js library licenses 2015-09-17 00:01:25 -04:00
James Laska
4d5b46780a Merge pull request #414 from jlaska/pbuilder
Build deb's using pbuilder
2015-09-16 16:48:37 -04:00
James Laska
b57144046b Add support for pbuilder chroot builds
Additional fixes include:
 * Clean and pyc files in debian/rules
 * Reprepro changes
 * Update debian standards version
 * Update OS distro detection
2015-09-16 16:28:05 -04:00
Chris Meyers
92bdd776c9 rbac job & job template performance fix 2015-09-15 10:18:46 -04:00
Chris Meyers
d4bc5dfaef Merge pull request #413 from chrismeyersfsu/fix-rbac_performance
performance fix
2015-09-15 10:16:46 -04:00
Chris Meyers
0e8e09b0ac rbac job & job template performance fix 2015-09-14 16:25:33 -04:00
Jared Tabor
f4f54cc6dc Refactoring login modal and services
refactoring login modal logic to extract html into its own partial
2015-09-14 14:06:29 -04:00
Matthew Jones
519b0e8eef Merge branch 'release_2.3' into devel
* release_2.3: (54 commits)
  Upgrade changelog for 2.3
  Purge superlance
  Purge an old supervisor config
  Require chris-lea libzmq3
  Use the htpasswd command, not the module
  Fix a playbook syntax error for postgres
  Ensure postgres is started earlier in setup role
  Allow customizing npm path
  Include RPM-GPG-KEY-ansible-release for all releases
  Simplify GPG keys
  Correct broken RPM-GPG-KEY
  Use gpg --passphrase for signing CHECKSUM
  Handle rpm --addsign pasphrase prompts
  Adding docker-compose development workflow
  Fix license in spec file.
  Updates to selinux policy for some munin plugins
  ansible 1.8.4 requires sudo:true when using sudo_user
  Fix expect script timeout
  Disable timeout and correct sign.exp error
  Fix expect script hang
  ...
2015-09-11 16:03:52 -04:00
Matthew Jones
0ac4359bec Purge superlance
We no longer get memmon with our package vendoring changes.  Don't think
we need it anyway as we've got the socket service fixed.
2015-09-11 14:43:28 -04:00
Matthew Jones
8785af996d Purge an old supervisor config
Apparently awx_supervisor.conf was still hanging around in the debian
install.   We'll make sure we won't lay that file down and bump the
supervisor migration to make sure the file is removed permanently
2015-09-11 14:43:28 -04:00
James Laska
32cf468059 Allow customizing npm path
So jenkins can use `npm --no-color`
2015-09-10 19:03:41 -04:00
James Laska
3f9dd3ab22 Simplify GPG keys 2015-09-10 16:26:59 -04:00
James Laska
19c847ae10 Use gpg --passphrase for signing CHECKSUM 2015-09-10 13:40:24 -04:00
Matthew Jones
a2b6ffb237 Put down a file to track make develop in compose 2015-09-10 11:03:45 -04:00
Matthew Jones
97f85d2344 Rev django auth ldap to version 1.2.6
This fixes (probably among other things) an issue where we wouldn't get
any logging messages out of django for misconfigured ldap.
2015-09-10 10:59:24 -04:00
jlmitch5
552e12a8eb Merge pull request #392 from jlmitch5/adhoc_2.4
Adhoc 2.4 - Tests and refactor
2015-09-10 10:34:11 -04:00
Matthew Jones
f61a01b504 Switch to using ansible wait_for instead of sleep
In the startup script for docker-compose
2015-09-10 09:32:01 -04:00
James Laska
9d5d17fa70 Handle rpm --addsign pasphrase prompts 2015-09-09 18:51:41 -04:00
James Laska
fa77f581fa Merge pull request #410 from wenottingham/release_2.3
Fix license in spec file.
2015-09-09 18:13:10 -04:00
Matthew Jones
940910b9a3 Adding docker-compose development workflow 2015-09-09 17:17:48 -04:00
Matthew Jones
7263367c6d Adding docker-compose development workflow 2015-09-09 17:16:35 -04:00
James Laska
f56bcda53c Merge pull request #408 from wenottingham/release_2.3
Add 'cost' to yum repo definitions for bundled repos.
2015-09-09 14:25:12 -04:00
John Mitchell
edd7a5bab2 create make target that will run js tests in chrome 2015-09-09 13:08:50 -04:00
John Mitchell
7fd24987d7 update adhoc feature, add tests and modularize 2015-09-09 13:08:16 -04:00
James Laska
87d8808c2d Fix expect script timeout 2015-09-09 13:07:09 -04:00
James Laska
b7ddbc48b1 Disable timeout and correct sign.exp error 2015-09-09 12:13:55 -04:00
James Laska
06e6980eaf Fix expect script hang 2015-09-09 11:18:06 -04:00