shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 18:21:12 +03:00
Code Releases Activity
9,244 Commits 40 Branches 19 Tags 380 MiB
37270bfb13
Commit Graph

9244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlanCoding
a32dd5b535 introduce summary_fields for users, showing user_capabilities 2016-08-30 14:02:57 -04:00
AlanCoding
0151967e9c selectively show POST in options for inventory sublists 2016-08-30 11:16:49 -04:00
Matthew Jones
c112fc3cf4 Update qpid packaging, remove migrations 
* Remove old system migrations
* Update qpid install deps for RH
 2016-08-30 10:46:13 -04:00
AlanCoding
cf81199bbf Remove extra project-related DB hit, follow same pattern as unified jobs 2016-08-30 10:12:12 -04:00
AlanCoding
381e8aacdd more organization of access method preprocessing 2016-08-29 16:57:30 -04:00
Alan Rominger
5e626cfe2e test_credential bug fixes 
Credential detail view was looked up with the organization's primary key. Works fine when the database arbitrarily gives them both pk=1 in a isolated test, but not a great thing to depend on.
 2016-08-29 15:54:45 -04:00
AlanCoding
23791cb91e Merge branch 'devel' of https://github.com/ansible/ansible-tower into can_CRUD 2016-08-29 14:01:18 -04:00
Alan Rominger
f66fa6fb7c Merge pull request #3365 from AlanCoding/makefile_hot_fix 
fix error introduced in Makefile syntax
 2016-08-29 12:00:05 -04:00
AlanCoding
5f15b00a8a fix error Alan introduced in Makefile syntax 2016-08-29 11:46:16 -04:00
Alan Rominger
f9cd0fe197 Merge pull request #3352 from AlanCoding/js_makefile 
Updating Jenkins UI targets, and pin pytest in devel
 2016-08-29 11:34:37 -04:00
AlanCoding
52dc28f7c5 jshint given desired commands, although not working 2016-08-29 11:32:42 -04:00
AlanCoding
c6c295ef32 pin Dockerfile version as well 2016-08-29 09:50:57 -04:00
AlanCoding
8f1e9bd20d fields generally working as intended now 2016-08-26 17:05:52 -04:00
Matthew Jones
3f0311a969 Integrate packaging for qpid/memcached 
Also

* Remove redis packaging
* Fix typo in contributing
 2016-08-26 14:59:43 -04:00
AlanCoding
1372623080 temporarily pin the pytest version until the ldap error can be fixed 2016-08-26 14:03:41 -04:00
AlanCoding
38879d339b flake8 fix 2016-08-26 13:57:35 -04:00
AlanCoding
3a86a41685 disable all the UI unit tests until things are sorted out 2016-08-26 13:51:49 -04:00
AlanCoding
260e93571e outright remove the old jshint install 2016-08-26 13:35:53 -04:00
AlanCoding
7cfb79110f updating Jenkins UI targets 2016-08-26 13:30:08 -04:00
AlanCoding
e4504f789a intermediary state, not yet known to be working 2016-08-26 13:16:06 -04:00
Alan Rominger
c87637ea7d Merge pull request #3325 from AlanCoding/temporary_pytest_bump 
Temporary pytest bump for tower unit tests
 2016-08-26 12:58:48 -04:00
Bill Nottingham
cb69416799 Merge pull request #3348 from wenottingham/old-ansible-branch 
Remove compatiblity code for pre-1.9 Ansible versions.
 2016-08-26 12:14:54 -04:00
John Mitchell
baa2481944 fixed localed date stuff 2016-08-26 11:49:31 -04:00
Wayne Witzel III
fbcd14d40b Merge pull request #3347 from wwitzel3/issue-3305 
Ensure deprecated_team.org is passed to credential.
 2016-08-26 09:45:38 -04:00
Matthew Jones
59aed7b318 Merge pull request #3343 from ansible/ramparts_and_ha 
New Development Environment Workflow && Replacing Redis with qpid/memcached
 2016-08-26 09:34:19 -04:00
Chris Church
eb70d8d32e Merge pull request #3255 from cchurch/my-saml-done-froze-up 
Initialize xmlsec once to prevent SAML auth from hanging.
 2016-08-25 23:32:19 -04:00
Bill Nottingham
c2f85d5bfb Remove compatiblity code for pre-1.9 Ansible versions. 2016-08-25 15:41:47 -04:00
Wayne Witzel III
18e4a33404 update test to check org_auditor access 2016-08-25 13:45:13 -04:00
Wayne Witzel III
dbe3f628d4 ensure team organizations are assigned to credentials 2016-08-25 13:44:55 -04:00
Matthew Jones
3382736e70 Put some redis reqs back in until we make the packaging changes 2016-08-25 12:03:33 -04:00
Matthew Jones
b507dc53ea Putting a bow on some of the new dev workflow 
* Documentation of the developer variety
* Defaulting the COMPOSE_TAG to develop, can be overridden
* Automatic docker login assuming gcr login
* Including a manual build step as an alternative to gcr
* Make qpid container shut the f**k up when it's running
 2016-08-25 11:57:31 -04:00
Matthew Jones
c8e2f73d48 Support pulling the dev container image from gcr 
This will be branch-relative.  If you are ont he `devel` branch then it
will pull that tag, it will try to pull the branch you are on and can be
overridden with the COMPOSE_TAG environment variable
 2016-08-24 22:45:20 -04:00
Matthew Jones
dcb4959443 Initial qpid development work 
* Switch base tower devel image from u14.04 to c7
* Switch container image to build python dependencies into itself
  instead of forcing it to be built on startup
* Upgrade venv pip to 8.1.2
* Neuter queue.py which was heavily tied to redis and was basically
  orphaned code
* Alter local_settings to override default cache settings and use
  memcached
* Alter local settings to refer to qpid instead of redis for celery
  broker
* Purge redis python dependencies and add qpid and memcached
* Update docker-compose to purge redis and add qpid and memcached
 2016-08-24 16:23:47 -04:00
AlanCoding
50ec9ca259 temporarily pin the pytest version until the ldap error can be fixed 2016-08-24 15:54:33 -04:00
John Mitchell
d7b79c5f08 fixed locale 2016-08-24 11:50:56 -04:00
jlmitch5
0baeafa1f1 fix date locale angular scheduler 2016-08-24 11:39:16 -04:00
AlanCoding
23024c8fad Make sure org admins can see credential after migration, comment updates on related tests 
add clause in test to verify automatic setting of org of new team credential
 2016-08-24 11:36:07 -04:00
Aaron Tan
37e19115a8 Merge pull request #3320 from jangsutsr/3248_resolve_extra_var_n_survey_mess_up 
Resolve extra vars display mix-up with passworded survey questions.
 2016-08-24 11:17:10 -04:00
jangsutsr
8576dcda19 Remove legacy exception handling. 2016-08-24 10:58:53 -04:00
jangsutsr
c3f844cfe0 Add unit test. 2016-08-23 20:00:08 -04:00
Alan Rominger
75f513e591 Merge pull request #3324 from AlanCoding/3305_test_update 
Update team admin credential migration test
 2016-08-23 16:40:31 -04:00
Wayne Witzel III
efa8496407 Merge pull request #3301 from wwitzel3/release_3.0.2 
remove last_name and first_name from admin_only fields
 2016-08-23 15:17:35 -04:00
Wayne Witzel III
c963035178 Merge pull request #3302 from wwitzel3/fix-3153 
prevent non-superusers from adding orphan users
 2016-08-23 15:16:57 -04:00
AlanCoding
bb3e370e56 Update team admin credential migration test to current state-of-knowledge 2016-08-23 14:14:48 -04:00
Leigh Johnson
034f266b07 fix ng-toast rel, resolves #3197 (#3316) 2016-08-23 13:48:10 -04:00
Graham Mainwaring
f36ff01a5b Merge pull request #3312 from ghjm/make_clean_venv 
Clean venv on 'make clean'
 2016-08-23 10:47:47 -04:00
Wayne Witzel III
2fb386b23c allow users to edit their first and last name 2016-08-23 09:55:00 -04:00
jangsutsr
60b7309c08 Resolve extra vars display mix-up with passworded survey questions. 2016-08-22 16:33:03 -04:00
AlanCoding
e461ff0144 Merge branch '2479' of github.com:AlanCoding/ansible-tower into can_CRUD 2016-08-22 15:47:48 -04:00
AlanCoding
eddc1a8ed2 implement two methods for can_edit field for testing 2016-08-22 14:43:04 -04:00