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

Story/cit 6 #14

Merged
merged 28 commits into from Mar 8, 2019
Merged

Story/cit 6 #14

merged 28 commits into from Mar 8, 2019

Commits on Jan 25, 2019

  1. [CIT-5] Merge develop to branch.

    Namratha authored and Namratha committed Jan 25, 2019
    Configuration menu
    Copy the full SHA
    33880ed View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2019

  1. Merge branch 'develop' of https://github.com/diging/citesphere into d… 

    …evelop
    Namratha authored and Namratha committed Jan 29, 2019
    Configuration menu
    Copy the full SHA
    1135d97 View commit details
    Browse the repository at this point in the history

  2. [CIT-6] Saving changes in edit author.

    Namratha authored and Namratha committed Jan 29, 2019
    Configuration menu
    Copy the full SHA
    ed70252 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2019

  1. Merge remote-tracking branch 'origin/develop' into story/CIT-6

    Namratha authored and Namratha committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    1dcbf6f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into story/CIT-6

    Namratha authored and Namratha committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    6b4085e View commit details
    Browse the repository at this point in the history

  3. [CIT-6] Changes in edit author on edit page.

    Namratha authored and Namratha committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    a67c6ef View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2019

  1. [CIT-6] Saving changes in edit author.

    Namratha authored and Namratha committed Jan 31, 2019
    Configuration menu
    Copy the full SHA
    b6299aa View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2019

  1. [CIT-6] Saving changes in retaining affiliations.

    Namratha authored and Namratha committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    a922825 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2019

  1. [CIT-6] Added update affiliations in edit author modal.

    Namratha authored and Namratha committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    ea7fbd6 View commit details
    Browse the repository at this point in the history

  2. [CIT-6] Merge remote-tracking branch 'origin/develop' into story/CIT-6 

    Conflicts:
	citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp
    Namratha authored and Namratha committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    21204e5 View commit details
    Browse the repository at this point in the history

  3. [CIT-6] Null pointer fix in title sort comparator.

    Namratha authored and Namratha committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    9ea6711 View commit details
    Browse the repository at this point in the history

  4. [CIT-6] Reverting Cit-5 changes.

    Namratha authored and Namratha committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    1a8744f View commit details
    Browse the repository at this point in the history

  5. [CIT-6] Changes in formatting.

    Namratha authored and Namratha committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    ae50939 View commit details
    Browse the repository at this point in the history

  6. [CIT-6] Removing unused library.

    Namratha authored and Namratha committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    5b0bebe View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2019

  1. Merge remote-tracking branch 'origin/develop' into story/CIT-6

    Namratha authored and Namratha committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    9626306 View commit details
    Browse the repository at this point in the history

  2. [CIT-6] Saving work.

    Namratha authored and Namratha committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    3b9f155 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2019

  1. [CIT-6] Changes in edit author.

    Namratha authored and Namratha committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    59ad854 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. [CIT-6] Saving work in edit authors.

    Namratha authored and Namratha committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    56c9f0f View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2019

  1. [CIT-6] Saving work in edit author.

    Namratha authored and Namratha committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    4d14047 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2019

  1. [CIT-6] Changes in edit author.

    Namratha authored and Namratha committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    0227920 View commit details
    Browse the repository at this point in the history

  2. [CIT-6] Minor fixes.

    Namratha authored and Namratha committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    f25968b View commit details
    Browse the repository at this point in the history

  3. [CIT-6] Merge remote-tracking branch 'origin/develop' into story/CIT-6 

    Conflicts:
	citesphere/src/main/java/edu/asu/diging/citesphere/core/service/impl/CitationManager.java
    Namratha authored and Namratha committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    740293f View commit details
    Browse the repository at this point in the history

  4. [CIT-6] Minor fixes in formatting in JSP.

    Namratha authored and Namratha committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    ad64f52 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2019

  1. [CIT-6] Refactored code.

    Namratha authored and Namratha committed Feb 15, 2019
    Configuration menu
    Copy the full SHA
    633be1d View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2019

  1. [CIT-6] Minor changes in affiliation field in modal.

    Namratha authored and Namratha committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    f724aa9 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2019

  1. [CIT-6] Merge remote-tracking branch 'origin/develop' into story/CIT-6 

    Conflicts:
	citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp
    Namratha authored and Namratha committed Mar 7, 2019
    Configuration menu
    Copy the full SHA
    bed9012 View commit details
    Browse the repository at this point in the history

  2. [CIT-6] Ability to edit authors and editors.

    Namratha authored and Namratha committed Mar 7, 2019
    Configuration menu
    Copy the full SHA
    ff43113 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2019

  1. [CIT-6] Fixed the exception in citation factory for jsonnull.

    Namratha authored and Namratha committed Mar 8, 2019
    Configuration menu
    Copy the full SHA
    3e59c49 View commit details
    Browse the repository at this point in the history