External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 04:31:21 -03:30
Code Issues Packages Projects Releases Wiki Activity
9,525 Commits 54 Branches 19 Tags
Commit Graph

9525 Commits

This Branch
This Branch
All Branches
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
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
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
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
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
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
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
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
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
Graham Mainwaring
b143f53888 Fix RPM builds and setup for 3.1 2016-10-24 14:51:53 -04:00
Matthew Jones
cd48427189 Merge pull request #3757 from ansible/AlanCoding-patch-1 
Only fill scm_revision env var if project for job exists
 2016-10-24 13:27:19 -04:00
Matthew Jones
3eddc1f770 Merge pull request #3761 from AlanCoding/proj_update_death 
Hack and slash of project directory checks
 2016-10-24 13:13:56 -04:00
AlanCoding
18cb20ebb6 remove code that checks for local project directory to give status 2016-10-24 12:42:04 -04:00
Matthew Jones
7c7d2e37ed Fix some issues syncing playbooks 
* Build a list of playbooks and store it in the database at sync time
* Fix an issue running playbook sync on jobs for scan jobs
* Remove a TODO that was unneeded
 2016-10-24 11:32:21 -04:00
Aaron Tan
5ca25b924e Add missing always_node check in bfs 2016-10-24 11:06:25 -04:00
Alan Rominger
3121839704 only fill scm_revision var if project for job exists 2016-10-24 09:43:17 -04:00
Chris Meyers
0f0d9953b3 bump os-client-config for shade 2016-10-22 09:51:12 -04:00
Chris Meyers
7050c4e09e Revert "no one knows wtf the files in this dir a for, so don't serve them" 
This reverts commit b3cccea70368ba1550366380e583751df1df061b.
 2016-10-21 10:04:50 -04:00
Matthew Jones
3d8eb48986 Test for HA license before allowing cluster job start 2016-10-20 16:50:49 -04:00
Matthew Jones
4d792bef9d Merge pull request #3755 from ansible/cluster_project_sync 
Rearchitect project sync for standalone and clusters
 2016-10-20 16:04:03 -04:00
Matthew Jones
73b5b47e94 flake8 cleanup 2016-10-20 15:27:59 -04:00
Matthew Jones
6e22460f1e Add scm revision to the job model 
This also cleans up flake8 issues
 2016-10-20 15:18:05 -04:00
Matthew Jones
ca32c5fd21 scm_revision should be used for job_type run 2016-10-20 14:56:15 -04:00
Matthew Jones
4562faa858 Pass scm revision in env and extra var for job run 2016-10-20 14:42:28 -04:00