External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
11,300 Commits 65 Branches 102 Tags
557bc8006d54d736851180e3748233b8fd6a39a8
Commit Graph
28 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane McDonald b9d5e89ead Update en-us django po file 2017-01-31 16:05:59 -05:00
Shane McDonald 696353f77e Update django pot file 2017-01-31 16:05:59 -05:00
Shane McDonald b9f6368299 Update po files 2017-01-31 14:34:42 -05:00
Shane McDonald 94a03b640d Update pot files 2017-01-31 14:34:42 -05:00
Shane McDonald ece5299a74 Add gcc-c++ to development container 2017-01-31 13:09:59 -05:00
Shane McDonald a467d20341 Update po files 2017-01-27 13:34:09 -05:00
Shane McDonald 9ec99cd026 Update pot files 2017-01-27 13:34:09 -05:00
Shane McDonald dfd7b5ca62 Improve awx/ui/README.md 2017-01-25 18:45:48 -05:00
Shane McDonald 35deb0be37 Simplify UI / Docker targets 
- Renamed npm scripts to reflect what they are actually doing. Nothing is being built here!
- Not sure why the default django_host was 0.0.0.0…
- Removed unnecessary logic from build-docker-cid
 2017-01-25 18:45:48 -05:00
Shane McDonald 7776dc1304 Remove SauceLabs stuff from package.json 2017-01-25 18:45:48 -05:00
Shane McDonald f9573db5a3 Regenerate npm-shrinkwrap.json 
This file was originally generated with a version of NPM that was affected by a bug that would cause `npm install` to fail on non-macOS systems. We were temporarily forced to downgrade to 3.10.7, but…. this fixes that! Verified on macOS Sierra and CentOS 7 using NPM version 3.10.10.
 2017-01-25 18:45:47 -05:00
Shane McDonald 790f30b3cd Prevent npm install from running every time make ui-docker* is invoked 
awx/ui/package.json is a normal file in the repo, not created by Make.
 2017-01-25 18:45:47 -05:00
Shane McDonald 1cac3abc9f Whitespace fix in translation 2017-01-23 14:50:35 -05:00
Shane McDonald 483fbb6f24 Pull in latest translations 2017-01-23 12:25:57 -05:00
Shane McDonald b60b4b2bc1 Generate .mo files without django, enable API l10n at build time. 2017-01-23 12:25:56 -05:00
Shane McDonald 933512be63 Revert "Manually add .mo files (for now) to get API l10 working." 
This reverts commit 3acb71784fdcaff34644b31fc1bdf4914229c503.

# Conflicts:
#	awx/locale/fr/LC_MESSAGES/ansible-tower-ui.mo
 2017-01-23 12:25:56 -05:00
Shane McDonald ad4323ebb8 Update French .mo file 2017-01-19 15:54:58 -05:00
Shane McDonald 8b7435ccd3 Manually add .mo files (for now) to get API l10 working. 2017-01-13 14:49:40 -05:00
Shane McDonald e0cd4bc7ae Get Japanese API l10 working 
Worked with matburt on this. There were some inconsistencies between our code and the po files.
 2017-01-13 14:49:40 -05:00
Shane McDonald 6b0573da71 Uncomment line that requests UI l10n files. 2017-01-12 21:09:18 -05:00
Shane McDonald cbf0c2704d Separate API and UI l10n make targets. 
A couple reasons for this:

- The command for generating the API l10n files is currently broken, and I want to get the translation folks looking at the UI ASAP.
- These things require different environments:
  - Generating the UI files requires Grunt, which is only available *before* packaging. We generate the static files before invoking mock or pbuilder.
  - Generating the API files requires Django, which is only available inside the virtual environment. This will likely need to be invoked somewhere inside of the install playbooks.
 2017-01-12 21:09:18 -05:00
Shane McDonald 894577c89a Add Japanese and French po files for the UI. 2017-01-12 21:09:18 -05:00
Shane McDonald dfa85dbbd2 Merge pull request #1896 from shanemcd/expiration-date 
*Really* display correct expiration date on license page.
 2016-05-16 14:43:45 -04:00
Shane McDonald dacbeed5a4 Merge pull request #1886 from shanemcd/license-expiration-date 
Fix license expiration date / time remaining
 2016-05-11 10:25:48 -04:00
Shane McDonald 0a315f5c60 Merge pull request #1770 from shanemcd/prevent-orphaned-supervisor-processes 
Fix supervisor restarts / prevent orphaned processes.
 2016-05-03 10:13:01 -04:00
Shane McDonald 629c46fb0c Merge pull request #1501 from shanemcd/fix-ami-install-script 
Make Packer inventory consistent with setup/inventory
 2016-04-12 11:51:24 -04:00
Shane McDonald 81268f7106 Merge pull request #1497 from shanemcd/remove-unnecessary-config-play 
Remove unnecessary play in configuration playbook.
 2016-04-12 09:35:22 -04:00
Shane McDonald 0a15ece049 Merge pull request #1483 from shanemcd/packer-centos7 
Use CentOS 7 as source AMI in Packer template.
 2016-04-11 15:06:23 -04:00