Skip to content

Commit

Permalink
Config/vic git make shortcut (#7)
Browse files Browse the repository at this point in the history
* Feat/vic add eloquent status messages (#4) (#5)

* feat(controller): add CRUD eloquent status check

* feat(controller): add soft delete eloquent status check

* feat(service): add CRUD eloquent status check

* feat(service): add CRUD eloquent status check

* feat(lang): update en message dictionary

* feat(lang): update es message dictionary

* feat(lang): update pt message dictionary

* release 7.0.1

* config(git): create git pull merge cli

* config(make): create make git shortcuts

* Merge branch 'develop' of github.com:txsoura/core into config/vic-git-make-shortcut
  • Loading branch information
txsoura committed Jun 15, 2021
1 parent c0a218c commit 5a54e5d
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 3 deletions.
25 changes: 22 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,38 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [Unreleased]
## [7.0.2]

## [7.0.0] - 2021-05-09

### Added

- First project release

## [7.0.1] - 2021-06-15
### Added

### Changed

- Fix base query paramns dates validation

## [7.0.1.1] - 2021-06-15

### Changed

- Add controllers methods success and fail messages
- Improve CRUD methods services

### Added

- Add new dictionaries words

## [7.0.2] - 2021-06-15

### Added

- Add git merge pull cli
- Create git cmd shortcuts
11 changes: 11 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
pull:
git pull origin develop

git:
bash git-cli.sh

merge:
git checkout master
git pull origin master
git merge develop
git push
18 changes: 18 additions & 0 deletions git-cli.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/sh

###############################################################################
# Git Script #
# #
# Author: Victor Tesoura Júnior <txsoura@yahoo.com> #
###############################################################################
# #
# This script, is to be used after a approved pull request in main repo #
# branch. #
# #
###############################################################################


git checkout develop
git fetch -p
git pull origin develop

0 comments on commit 5a54e5d

Please sign in to comment.