Sebastian Kehr authored 5 years ago and Frank Morgner committed 5 years ago

* merges all changes of #14831 in new instance/fid branch

refs #12124

Ulf Seltmann authored 6 years ago and Frank Morgner committed 6 years ago

* update docker-compose.yml to new images
* remove /vendor folder
* remove /local/dev folder
* remove auth.json
* update composer.lock

ignore files like themes/.../css/less/lessphp_c007ba97e4ce96f1beb961f751016c35.list

Frank Morgner authored 8 years ago and André Lahmann committed 8 years ago

* initial implementation of EbscoResults integration

* removed solr from vufind folder
* added folder solr to .gitignore

- Requires significant changes to Phing tasks.
- Eliminates vufind.sh/vufind.bat in favor of solr.sh/solr.bat.

* removed vendor from .gitignore
* updated and added dependencies in vendor folder

* updated gruntfile.js with de_j59, de_bn3 and adlr_link
* changed package.json name to vufind2-foundation (e.g. for community release)
* added node_modules to .gitignore

* deleted all sass-cache files already committed

This reverts commit 4d140b80.

----

And do not ignore /vendor any more.

This combines the changes to .gitignore from three commits:

91847d1a added oauth token to provide composer with github login credentials
75681907 added git config
d26d7b8c added dev config and some gitignore entries

via `git diff d26d7b8c^..91847d1a  -- .gitignore`, except

`vendor/*` is changed to `/vendor` so it does not match:

    themes/bootstrap3/js/vendor

Solution from: http://getcomposer.org/doc/faqs/should-i-commit-the-dependencies-in-my-vendor-directory.md

Option #4