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

Article crud #3

Open
wants to merge 18 commits into
base: authorizemodule
Choose a base branch
from
Open

Article crud #3

wants to merge 18 commits into from

Commits on Aug 16, 2016

  1. New branch

    @FirstRound
    FirstRound committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    0d970dd View commit details
    Browse the repository at this point in the history

  2. Update project name

    @FirstRound
    FirstRound committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    2356401 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from HardDays/article-crud 

    Update project name
    @FirstRound
    FirstRound committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    824e5b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2016

  1. Add DataCollector and repositories system.

    @FirstRound
    FirstRound committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    04c9639 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'remotes/HardDays/authorizemodule' into … 

    …article-crud

Conflicts:
	.idea/artifacts/knowledge_base_war_exploded.xml
	.idea/dataSources.ids
	.idea/dataSources.xml
	knowledge-base.iml
	src/main/java/ru/knowledgebase/dbmodule/Program.java
	src/main/java/ru/knowledgebase/webmodule/services/HelloWorldService.java
	src/main/resources/META-INF/spring-config.xml
    @FirstRound
    FirstRound committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    f47fb24 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2016

  1. Merge remote-tracking branch 'remotes/HardDays/authorizemodule' into … 

    …article-crud

Conflicts:
	.idea/artifacts/knowledge_base_war_exploded.xml
	.idea/dataSources.ids
	.idea/dataSources.xml
	knowledge-base.iml
	src/main/java/ru/knowledgebase/dbmodule/Program.java
	src/main/java/ru/knowledgebase/webmodule/services/HelloWorldService.java
	src/main/resources/META-INF/spring-config.xml
    @FirstRound
    FirstRound committed Aug 22, 2016
    Configuration menu
    Copy the full SHA
    541c759 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2016

  1. Complete Article CRUD operations

    @FirstRound
    FirstRound committed Aug 26, 2016
    Configuration menu
    Copy the full SHA
    5fe8968 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2016

  1. Complete Article CRUD operations

    @FirstRound
    FirstRound committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    459c42f View commit details
    Browse the repository at this point in the history

  2. Add exceptions to article module

    @FirstRound
    FirstRound committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    5f9c624 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2016

  1. Merged project commit

    @FirstRound
    FirstRound committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    7e732e2 View commit details
    Browse the repository at this point in the history

  2. Merged project commit

    @FirstRound
    FirstRound committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    5571658 View commit details
    Browse the repository at this point in the history

  3. Merged project commit

    @FirstRound
    FirstRound committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    dfd5c79 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4 from HardDays/article-crud 

    PR
    @FirstRound
    FirstRound committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    cc4fba3 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of /home/pisatel/Documents/Work/KnowlageBase wi… 

    …th conflicts.
    @FirstRound
    FirstRound committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    87c2de8 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/master' 

    Conflicts:
	.idea/workspace.xml
    @FirstRound
    FirstRound committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    24c28b5 View commit details
    Browse the repository at this point in the history

  7. Merged project commit

    @FirstRound
    FirstRound committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    9cfc775 View commit details
    Browse the repository at this point in the history

  8. Add article and image wrappers

    @FirstRound
    FirstRound committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    6d5ea84 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2016

  1. Add logger

    @FirstRound
    FirstRound committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    428da22 View commit details
    Browse the repository at this point in the history