Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Minds/front
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dev-0.1c
Choose a base ref
...
head repository: Minds/front
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 4,998 changed files with 1,579,684 additions and 31,135 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
55 changes: 55 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Define the line ending behavior of the different file extensions
# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto
* text eol=lf

# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.php text
*.default text
*.ctp text
*.md text
*.po text
*.js text
*.css text
*.ini text
*.txt text
*.xml text

# Declare files that will always have CRLF line endings on checkout.
*.bat eol=crlf
*.ps1 eol=crlf

# Declare files that will always have LF line endings on checkout.
*.pem eol=lf
*.sh eol=lf
*.cql eol=lf
containers/** eol=lf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.jpeg binary
*.svg binary
*.gif binary
*.ico binary
*.mo binary
*.mp4 binary
*.webp binary
*.pdf binary
*.ttf binary
*.eot binary
*.woff binary
*.woff2 binary

# Remove files for archives generated using `git archive`
appveyor.yml export-ignore
CONTRIBUTING.md export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
Makefile export-ignore
phpunit.xml.dist export-ignore
.travis.yml export-ignore
tests/test_app export-ignore
tests/TestCase export-ignore
2 changes: 2 additions & 0 deletions .githooks/post-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
HUSKY_SKIP_HOOKS=1 git commit -m "your commit message" --no-verify src/locale/Base.xliff
70 changes: 70 additions & 0 deletions .githooks/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-commit".

if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
fi

# If you want to allow non-ASCII filenames set this variable to true.
allownonascii=$(git config --bool hooks.allownonascii)

# Redirect output to stderr.
exec 1>&2

# Cross platform projects tend to avoid non-ASCII filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
test $(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
then
cat <<\EOF
#Error: Attempt to add a non-ASCII file name.
#
#This can cause problems if you want to work with people on other platforms.
#
#To be portable it is advisable to rename the file.
#
#If you know what you are doing you can disable this check using:
#
# git config hooks.allownonascii true
EOF
exit 1
fi

# extract i18n - changes commited in post-commit hook.
#npm run xi18n

# If there are whitespace errors, print the offending file names and fail.
#exec git diff-index --check --cached $against --

# Check for "fdescribe"-esque development artifacts accidentally left in.
# https://gist.github.com/DerLobi/d938ac7dc422145f85e6#gistcomment-2824

STATUS=0
for focus in fdescribe fcontext fit fspecify fexample; do
FILES=$(git diff --staged -G"^\s*$focus\(" --name-only | wc -l)
if [ $FILES -gt 0 ]
then
echo "You forgot to remove a $focus in the following files:"
git diff --staged --name-only -G"^\s*$focus\("
echo ""
STATUS=1
fi
done
exit $STATUS


30 changes: 27 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
/.angular/cache
cache
cache_directory
# Ignore front end plugins
app/src/plugins
app/templates/plugins
#app/src/plugins
#app/templates/plugins
app/stylesheets/plugins.scss
app/stylesheets/plugins
public
dist
/tests/ng-spec

coverage
src/main.css
!.gitlab-ci.yml
tsd_typings
src/assets/locale

/.htaccess
.htaccess
@@ -18,6 +25,7 @@ tsd_typings
.*
*~
!/.gitignore
!/.angular-cli.json
/nbproject
/nb-configuration.xml
Session.vim
@@ -27,5 +35,21 @@ tmtags
Thumbs.db
Desktop.ini
node_modules
cypress/screenshots
cypress/videos
# don't ignore travis config
!/.travis.yml
!/.drone.yml
!/.gitlab
!/.githooks
!/.prettierrc
!/.prettierignore
!.gitattributes
!.gitkeep
!/.nvmrc
!/.husky
!/.storybook
cypress-tests
e2e/test/error-screenshots
e2e/test/.env
graphql.config.yml
Loading