Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Admin user grid conversion #4341

Merged
merged 49 commits into from Aug 10, 2017

Conversation

Projects
None yet
3 participants
@guerler
Copy link
Contributor

commented Jul 25, 2017

This PR is branched from #4327. After separation of the admin controller, this PR converts the admin user handling grid to the grid dict_format. The user grid contains two form makos which have been extended to show the masthead panel. The other user grid operations have been made asynchronous. Message parsing has been adjusted accordingly.

@guerler guerler added this to the 17.09 milestone Jul 25, 2017

guerler added some commits Jul 25, 2017

@guerler guerler force-pushed the guerler:revise_page branch from 527fd73 to 4159397 Jul 26, 2017

@guerler guerler force-pushed the guerler:revise_page branch from 2244c5e to b3e095d Aug 1, 2017

@guerler guerler force-pushed the guerler:revise_page branch from 031dbb1 to 068ff8c Aug 1, 2017

@guerler guerler added status/review and removed status/WIP labels Aug 2, 2017

guerler added some commits Aug 2, 2017

@guerler guerler added status/WIP and removed status/review labels Aug 3, 2017

@guerler guerler added status/review and removed status/WIP labels Aug 3, 2017

@jmchilton

This comment has been minimized.

Copy link
Member

commented Aug 9, 2017

@guerler can you merge or rebase to resolve the client and lib conflicts?

guerler added some commits Aug 9, 2017

@guerler

This comment has been minimized.

Copy link
Contributor Author

commented Aug 10, 2017

@jmchilton sure.

@jmchilton

This comment has been minimized.

Copy link
Member

commented Aug 10, 2017

Awesome sauce - looks great to me - thanks!

@jmchilton jmchilton merged commit 5e43fce into galaxyproject:dev Aug 10, 2017

5 checks passed

api test Build finished. 280 tests run, 0 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 150 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 37 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 579 tests run, 0 skipped, 0 failed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.