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

9809 Commits

Author SHA1 Message Date
sundeep-co-in
e908bc34e6 Merge branch 'devel' of https://github.com/sundeep-co-in/ansible-tower into STAGE 2016-10-27 22:23:39 +05:30
AlanCoding
a2c972e513 Workflow status original commit 2016-10-27 12:52:07 -04:00
Alan Rominger
88edff521e Merge pull request #3791 from ansible/revert-3711-workflow_status
Revert "Introduce workflow failure condition"
2016-10-27 12:38:13 -04:00
Alan Rominger
76fae6c052 Revert "Introduce workflow failure condition" 2016-10-27 12:21:31 -04:00
Aaron Tan
432242bdd2 Null check added. 2016-10-27 11:20:45 -04:00
Shane McDonald
bbf185cd0b Add awx/public to clean target 2016-10-27 10:17:37 -04:00
sundeep-co-in
c1a5fb3312 resolve conflict 2016-10-27 08:13:02 +05:30
AlanCoding
1fec29dcb3 remove awx.compat, since it looks like it is not necessary 2016-10-26 17:22:03 -04:00
Leigh Johnson
2c8d295132 UI Build System - new interface
Use `make ui-devel` to build a development/debug version of the  UI, with source maps,
without raising any additional browser-sync or filesystem polling.
2016-10-26 16:53:36 -04:00
Leigh Johnson
04a094aa7c npm shrinkwrap i18n dependencies 2016-10-26 16:53:36 -04:00
Alan Rominger
57b1666abe Merge pull request #3711 from AlanCoding/workflow_status
Introduce workflow failure condition
2016-10-26 16:46:18 -04:00
James Laska
f129c42929 Update rax.py inventory
Resolves https://github.com/ansible/ansible/pull/18204 and continues
support for disabling SSL verification.

Fixes #3709
2016-10-26 15:59:41 -04:00
Alan Rominger
0900c4fbbc Merge pull request #3771 from AlanCoding/job_unit_tests
Make job unit tests pass
2016-10-26 15:55:39 -04:00
Aaron Tan
7c9e1c91db Ensure workflow_job_template being set during node creation. 2016-10-26 15:52:49 -04:00
Aaron Tan
813c786dc7 Add destory sanity checks to prevent UJ deletion during underlying workflow run. 2016-10-26 14:53:22 -04:00
sundeep-co-in
be93cb488c django-i18n: small fix 2016-10-26 23:31:12 +05:30
Aaron Tan
237587c2e7 Merge pull request #3758 from jangsutsr/3667_always_check_missing_in_bfs
Add missing always_node check in bfs
2016-10-26 12:17:38 -04:00
AlanCoding
0e99d150bb correct error in workflow unit tests 2016-10-26 10:47:09 -04:00
AlanCoding
6b4737b5f0 more WFJT node docs feedback 2016-10-26 09:53:54 -04:00
AlanCoding
2794d62b4a fix null problem with char_prompts 2016-10-26 09:35:00 -04:00
AlanCoding
8165141210 expand documentation for WFJT node list 2016-10-26 09:28:20 -04:00
sundeep-co-in
3bf72f1dba add manage_translations 2016-10-26 16:47:49 +05:30
sundeep-co-in
475d6ed110 Merge branch 'devel' of https://github.com/sundeep-co-in/ansible-tower into STAGE 2016-10-26 10:23:57 +05:30
Aaron Tan
ffeb2b22a4 Unit test added. 2016-10-25 19:28:24 -04:00
Jared Tabor
bf301ec130 Merge pull request #3781 from jaredevantabor/i18n
i18n on the UI
2016-10-25 15:59:27 -07:00
jaredevantabor
b98524dc91 Temporarily commenting out request for language files
in order to avoid 404 file not found error on the console until the i18n
team provies the language files
2016-10-25 15:46:45 -07:00
Leigh Johnson
4b34c6987a Remove make languages target pending delivery of .po files 2016-10-25 15:26:45 -07:00
jaredevantabor
d8b1281d57 adding i18n reference to a few files 2016-10-25 15:26:45 -07:00
Takao Fujiwara
40b94a38a8 Enable message i18n with angular-gettext
Signed-off-by: Takao Fujiwara <tfujiwar@redhat.com>
2016-10-25 15:26:45 -07:00
AlanCoding
04013e4d9f fix problems with OPTIONS for char_prompts 2016-10-25 16:34:36 -04:00
Wayne Witzel III
b11f5c3015 Revert "filter internal User.admin_roles from the /roles API list view"
This reverts commit 2a55bfa5741e91c466570e7b4cf9b517d366c610.
2016-10-25 13:40:15 -04:00
James Laska
ed8bbc2bbd Merge pull request #3774 from ansible/AlanCoding-patch-2
Fix spelling of disassociated
2016-10-25 12:02:34 -04:00
Alan Rominger
9f15fc3873 fix spelling of disassociated 2016-10-25 11:53:43 -04:00
AlanCoding
836c13f857 bump migration dependency 2016-10-25 09:18:14 -04:00
AlanCoding
e0173a5ca2 bump migration file number 2016-10-25 09:16:09 -04:00
AlanCoding
10c847e804 docs feedback for fojf incorporated 2016-10-25 09:14:55 -04:00
AlanCoding
48fc9eb773 update workflow model unit tests 2016-10-25 09:14:55 -04:00
AlanCoding
56a9978d56 Introduce workflow failure condition 2016-10-25 09:14:52 -04:00
sundeep-co-in
3166390a84 Merge branch 'i18n-test' of https://github.com/sundeep-co-in/ansible-tower into STAGE 2016-10-25 16:30:23 +05:30
sundeep-co-in
576db5120f resolve conflict 2016-10-25 16:18:14 +05:30
sundeep-co-in
d7b3b90f4d update strings 2016-10-25 16:12:41 +05:30
AlanCoding
7da6d2978a remove test imports 2016-10-24 21:30:03 -04:00
AlanCoding
3b4b1412fc fix tests for project playbook mocking 2016-10-24 21:04:01 -04:00
Wayne Witzel III
ced3c41df9 add auth_token verification to websocket 2016-10-24 19:42:53 -04:00
Wayne Witzel III
04bfdf8617 Merge branch 'devel' of https://github.com/ansible/ansible-tower into channels-fixups 2016-10-24 19:42:16 -04:00
AlanCoding
bb34ca662f update job unit tests to HA project update changes 2016-10-24 16:45:37 -04:00
Matthew Jones
088e9c0291 Merge pull request #3763 from ansible/performance_postgres_config
Adding customized postgres.conf to setup
2016-10-24 16:32:46 -04:00
AlanCoding
3c24105271 update JT playbook validation for HA 2016-10-24 16:31:33 -04:00
Graham Mainwaring
a59b226a68 Merge pull request #3764 from ghjm/packaging_3.1
RPM and setup playbook fixes for 3.1
2016-10-24 15:57:46 -04:00
Leigh Johnson
5dfd9d4ec9 Merge pull request #3762 from leigh-johnson/3750
Resolves 404 when assigning resources/users to organizations in card view
2016-10-24 15:25:56 -04:00