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.

Sign up for GitHub

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

Jump to bottom

3431 dev guide #3892

Merged
merged 29 commits into from
Jun 20, 2017
Merged

3431 dev guide #3892

merged 29 commits into from
Jun 20, 2017

Commits on Jun 6, 2017

  1. Updated testing documentation page with actual guide documentation; u… 

    …pdated documentation.rst and geospatial.rst to include table of contents preface
    @bsilverstein95
    bsilverstein95 committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    681d1d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2017

  1. Merge remote-tracking branch 'refs/remotes/origin/develop' into 3431-… 

    …dev-guide #3431

Resolved ToC Conflicts:
	doc/sphinx-guides/source/developers/documentation.rst
	doc/sphinx-guides/source/developers/geospatial.rst
	doc/sphinx-guides/source/developers/testing.rst
    @dlmurphy
    dlmurphy committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    9de44bb View commit details
    Browse the repository at this point in the history

  2. Fixing merge conflict [ref: #3431] 

    Phil and I are confused about whether our merge conflict worked! Testing
out this fix.
    @dlmurphy
    dlmurphy committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    8aaed4f View commit details
    Browse the repository at this point in the history

  3. Changed "Branching Strategy" page to "Version Control" [Ref: #3431] 

    Changed filename and title of page and added a section called "Using
Git" with info on how to make commits and resolve merge conflicts.
    @dlmurphy
    dlmurphy committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    4aa8141 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2017

  1. finish converting branching-strategy.rst into version-control.rst #3431

    @pdurbin
    pdurbin committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    271137d View commit details
    Browse the repository at this point in the history

  2. must build war before running installer #3431

    @pdurbin
    pdurbin committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    3c0c538 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2017

  1. explain context-root problem and solution #3431

    @pdurbin
    pdurbin committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    e32b9de View commit details
    Browse the repository at this point in the history

  2. reword version control page #3431

    @pdurbin
    pdurbin committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    269301a View commit details
    Browse the repository at this point in the history

  3. Version Control page review [Ref: #3431] 

    Fixed a couple typos in the Version Control page. Lookin' good!
    @dlmurphy
    dlmurphy committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    2220912 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2017

  1. fix a typo, a couple tweaks #3431

    @pdurbin
    pdurbin committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    682452c View commit details
    Browse the repository at this point in the history

  2. rewrite of testing page #3431

    @pdurbin
    pdurbin committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    5b57bec View commit details
    Browse the repository at this point in the history

  3. Proofread of Testing and Dev Environment pages [ref: #3431] 

    Made minor typo/style fixes to testing.rst. Also looked over
dev-environment.rst and it's all good.
    @dlmurphy
    dlmurphy committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    a47b0c2 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2017

  1. Typo fix [ref: #3431] 

    Fixed a header typo I'd missed before.
    @dlmurphy
    dlmurphy committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    51ecfd9 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2017

  1. fix glassfish link, smtp trouble, non-interactive mode #3431

    @pdurbin
    pdurbin committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    24340e9 View commit details
    Browse the repository at this point in the history

  2. mention dos2unix is needed on Windows for Vagrant #3431

    @pdurbin
    pdurbin committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    f4f0feb View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2017

  1. Merge branch 'develop' into 3431-dev-guide #3431 

    Conflicts:
doc/sphinx-guides/source/developers/dev-environment.rst
    @pdurbin
    pdurbin committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    f690ded View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2017

  1. mention read-only team and spreadsheet of contributors #3431

    @pdurbin
    pdurbin committed Jun 16, 2017
    1 Configuration menu
    Copy the full SHA
    2f43b35 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2017

  1. Changed formatting of Issue Number and Title 

    Changed formatting to fix issues with issue syntax and Waffle.
    @dlmurphy
    dlmurphy authored Jun 19, 2017
    Configuration menu
    Copy the full SHA
    7076bdc View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2017

  1. mention asadmin deployment in dev guide #3907

    @pdurbin
    pdurbin committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    fa95e12 View commit details
    Browse the repository at this point in the history

  2. add previous and next links to dev guide #2163

    @pdurbin
    pdurbin committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    06bd186 View commit details
    Browse the repository at this point in the history

  3. add section on testing commands #3431 #1797

    @pdurbin
    pdurbin committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    a299f8a View commit details
    Browse the repository at this point in the history

  4. add deploying manually section from @pameyer #3907

    @pdurbin
    pdurbin committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    dccd9b0 View commit details
    Browse the repository at this point in the history

  5. improve coding style page in dev guide #3418 #2724 #2644 #2575 #2574

    @pdurbin
    pdurbin committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    6535d9d View commit details
    Browse the repository at this point in the history

  6. fix broken links to datascience.iq (deceased) #3431

    @pdurbin
    pdurbin committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    071a6bd View commit details
    Browse the repository at this point in the history

  7. Proofread fixes for #3418 

    Small fixes to Coding Style page.
    @dlmurphy
    dlmurphy committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    f7a9337 View commit details
    Browse the repository at this point in the history

  8. improve readme #3729

    @pdurbin
    pdurbin committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    b5a4ed1 View commit details
    Browse the repository at this point in the history

  9. finsh changing "master" to "develop" in readme #3729

    @pdurbin
    pdurbin committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    7dbb863 View commit details
    Browse the repository at this point in the history

  10. we don't assign new issues anymore, link version control page #3729 

    Also link to list of contributors.
    @pdurbin
    pdurbin committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    7e9a8d9 View commit details
    Browse the repository at this point in the history

  11. asadmin syntax for disabling glassfish analytics

    @pameyer @pdurbin
    pameyer authored and pdurbin committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    db03e1d View commit details
    Browse the repository at this point in the history