1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Commit Graph

86 Commits

Author SHA1 Message Date
Wayne Witzel III
476c43f7a7 Resource fixes
The idea of a resource is an abstract one using Generic Foreign Key and not a concrete one with a model.
2016-04-12 10:38:24 -04:00
Wayne Witzel III
a244af5360 Update Role model method docs. 2016-04-12 10:11:38 -04:00
Akita Noek
ea2cabe4d4 Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel 2016-03-01 15:09:58 -05:00
Chris Meyers
356b9c99b3 Merge branch 'mongoectomy_implementation' into devel 2016-03-01 08:22:40 -05:00
Matthew Jones
99ec07b8a5 Merge branch 'notifications_work' into devel
* notifications_work: (23 commits)
  Updates to notification unit tests after @wwitzel3's feedback
  Fix some notifications issues and write some tests
  Add notification system documentation
  Clean up flake8 related issues
  Fixing up some unicode issues
  Implement tower ui view url on models
  Sanity check and force proper types in admin check
  Proper type for in check
  Adding migration and base notification type
  Add a periodic administrative notification
  Refactor message generator
  Support notification password field encryption
  Notification configuration type checking
  Refactor NotificationTemplate to Notifier
  Implement irc notification backend
  Add webhook notification backend
  Pagerduty and Hipchat backends plus some cleanup
  Notification serializers, views, and tasks
  Implement notification serializer and validations
  Notification endpoints and url expositions
  ...
2016-02-29 16:50:33 -05:00
Akita Noek
e18592fa87 Merge branch 'devel' into rbac 2016-02-24 16:14:32 -05:00
Matthew Jones
b35d7a3c6b Add notification system documentation 2016-02-24 13:26:43 -05:00
Matthew Jones
c3121211c3 Merge branch 'release_2.4.4' into devel
* release_2.4.4: (35 commits)
  Update changelog for 2.4.4 release
  Make pycompile non-fatal during deb build
  Revert "Add virtualenv site-pagkages to Python path before system dist-packages, to get new setuptools"
  Roll back mock version due to packaging issues
  Add virtualenv site-pagkages to Python path before system dist-packages, to get new setuptools
  change to warning behavior
  Resolve bug when building with /bin/sh on Ubuntu
  Attempt to workaround pip install issue
  point at packages with source on pypi
  Mock requires a newer setuptools when building requirements
  requests needs openssl
  Properly set the shell during directory migration
  pyrax bumpb new python license
  Typo's are bad and should be vanquished
  Conditionally install 2.6 python requirements
  separate pip requirements file for python2.6
  Added missing 'skipped' field for no_log
  Obey no_log even more when using ansible 2.0
  bump shade from 0.5.0 to 1.4
  RHEL5 compatibility and handling of error scenarios
  ...
2016-02-22 10:09:47 -05:00
Chris Meyers
56b0da30f1 adds fact model 2016-02-15 15:39:22 -05:00
Akita Noek
380ba8a41d Merge pull request #962 from anoek/rbac
"Completion" of RBAC migrations; resource_field elimination
2016-02-15 13:36:31 -05:00
Akita Noek
aafe521986 doc: ImplicitRoleField after the elimination of resource_field
Completes #926
2016-02-15 12:55:51 -05:00
Wayne Witzel III
61679a47ac Update rbac.md 2016-02-12 11:42:00 -05:00
Akita Noek
409c7baa33 doc: Removing .svg for our example image
Apparently .svg's don't work in github markdown
2016-02-12 11:08:08 -05:00
Akita Noek
0ef004171d doc: Try PNG for github markdown instead of SVG 2016-02-12 11:07:31 -05:00
Akita Noek
a4c435c14e doc: Added an example RBAC picture 2016-02-12 11:02:12 -05:00
Akita Noek
76c2454936 Docs: Added RBAC basic concepts section 2016-02-12 10:44:53 -05:00
Wayne Witzel III
104851e9a5 Update rbac.md
Remove resource_field
2016-02-12 10:18:12 -05:00
Wayne Witzel III
91c21c6c5b Update rbac.md
More documentation changes.
2016-02-12 10:17:15 -05:00
Wayne Witzel III
10e73ebc2e Update rbac.md
Updated Role model docs
2016-02-12 09:41:30 -05:00
Wayne Witzel III
25c48c0077 Update rbac.md
Quick style change.
2016-02-11 11:07:44 -05:00
Wayne Witzel III
1ed0c94c62 Update rbac.md
Added information about the ImplicitRoleField
2016-02-11 11:06:46 -05:00
Wayne Witzel III
e067c4a7c3 Update rbac.md
Fixing some misspellings / typos.
2016-02-10 18:41:46 -05:00
Wayne Witzel III
6bf81b5d11 Update rbac.md
Added more details about the mixin helper methods.
2016-02-10 18:40:08 -05:00
Wayne Witzel III
a0f317928d Update rbac.md
Continue to flesh out more of the rbac documentation and examples.
2016-02-10 18:12:54 -05:00
Wayne Witzel III
4450781662 Update rbac.md
Fixing typo
2016-02-10 17:11:24 -05:00
Wayne Witzel III
86c528154b Added initial rbac doc 2016-02-10 17:07:03 -05:00
Chris Church
60224cdbe4 Update Django to 1.8 and DRF to 3.3, add new Django migrations, update serializers/pagination/metadata, update browsable API styling. 2016-02-02 17:48:04 -05:00
Chris Meyers
ad27ae1f7d pyrax bumpb new python license 2016-01-29 11:19:30 -05:00
Joshua "jag" Ginsberg
f25b76aee9 Integrate statsd metrics into ansible playbook execution.
* Add dependencies for pystatsd and django-statsd-mozilla
* Default turned off except for development environment
* Modify docker-compose to install statsd/graphite host
2016-01-26 16:54:24 -05:00
Chris Meyers
4a6bceaeb0 Merge pull request #504 from chrismeyersfsu/license-a_piece_of_my_soul
2.4.0 python lib licenses
2015-11-17 15:49:36 -05:00
Chris Meyers
128f516e81 added dm.xmlsec.bindin license 2015-11-17 15:48:59 -05:00
Chris Meyers
a1f9476f6d added appdirs 2015-11-16 11:14:17 -05:00
Chris Meyers
47dc5b62ba add django-radius license 2015-11-16 09:26:02 -05:00
Chris Meyers
93076533c7 python openid 2015-11-13 15:29:49 -05:00
Chris Meyers
e92004c6c5 remove duplicate, wrongfully created, license files 2015-11-13 15:02:37 -05:00
Chris Meyers
0cd7746290 keep pre-existing license files 2015-11-13 15:01:05 -05:00
Chris Meyers
4f66949cd9 2.4.0 python lib licenses 2015-11-13 14:51:28 -05:00
Graham Mainwaring
c836e3415a Change Jenkins server references from IP to DNS name 2015-11-13 11:47:28 -05: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
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
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
Bill Nottingham
a0b3647c84 Add full Apache licenses to files, per Pam. 2015-09-21 13:35:37 -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