Skip to content

Commit

Permalink
Merge branch 'master' into add-more-social-media
Browse files Browse the repository at this point in the history
  • Loading branch information
falexandrou authored Mar 23, 2019
2 parents 41ebd55 + 3de50e8 commit def1c58
Show file tree
Hide file tree
Showing 321 changed files with 5,726 additions and 2,194 deletions.
13 changes: 10 additions & 3 deletions .fontcustom-manifest.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"checksum": {
"previous": "76158a909a15f01682c59bf93797ff7dcc006135b11c6c1005b4728aa5d60c65",
"current": "76158a909a15f01682c59bf93797ff7dcc006135b11c6c1005b4728aa5d60c65"
"previous": "a76e98698a465d2e0331eecdf54e8a0cfc15e19b18f78430498ed433629ed40d",
"current": "a76e98698a465d2e0331eecdf54e8a0cfc15e19b18f78430498ed433629ed40d"
},
"fonts": [
"app/assets/fonts/spina/ics_spina.ttf",
"app/assets/fonts/spina/ics_spina.svg",
"app/assets/fonts/spina/ics_spina.woff",
"app/assets/fonts/spina/ics_spina.eot"
"app/assets/fonts/spina/ics_spina.eot",
"app/assets/fonts/spina/ics_spina.woff2"
],
"glyphs": {
"barchart": {
Expand Down Expand Up @@ -110,6 +111,10 @@
"codepoint": 61720,
"source": "app/assets/icons/spina/exclamation.svg"
},
"export": {
"codepoint": 61753,
"source": "app/assets/icons/spina/export.svg"
},
"eye": {
"codepoint": 61721,
"source": "app/assets/icons/spina/eye.svg"
Expand Down Expand Up @@ -242,6 +247,8 @@
"options": {
"autowidth": false,
"config": "config/fontcustom.yml",
"copyright": "",
"css3": false,
"css_selector": ".icon-{{glyph}}",
"debug": false,
"font_ascent": 448,
Expand Down
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<!-- Love Spina? Please consider supporting our collective:
👉 https://opencollective.com/Spina/donate -->
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ test/dummy/app/assets/fonts/
test/dummy/config/application.yml
coverage/*
*.gemfile.lock
test/dummy/storage/*
.idea/*
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.5.0
20 changes: 20 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
env:
global:
- CC_TEST_REPORTER_ID=07411cbad687d8541613a5e38ba058efd456c4d3717353b99adbce10fe7e596a

language: ruby

addons:
postgresql: '9.6'

before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
- bundle exec rails db:setup

after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

notifications:
slack: spinacms:pEcHb40Gd0UWHWdooU2JG6OZ
38 changes: 38 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,41 @@ $ git push
```

Thank you.


## Financial contributions

We also welcome financial contributions in full transparency on our [open collective](https://opencollective.com/Spina).
Anyone can file an expense. If the expense makes sense for the development of the community, it will be "merged" in the ledger of our open collective by the core contributors and the person who filed the expense will be reimbursed.


## Credits


### Contributors

Thank you to all the people who have already contributed to Spina!
<a href="graphs/contributors"><img src="https://opencollective.com/Spina/contributors.svg?width=890" /></a>


### Backers

Thank you to all our backers! [[Become a backer](https://opencollective.com/Spina#backer)]

<a href="https://opencollective.com/Spina#backers" target="_blank"><img src="https://opencollective.com/Spina/backers.svg?width=890"></a>


### Sponsors

Thank you to all our sponsors! (please ask your company to also support this open source project by [becoming a sponsor](https://opencollective.com/Spina#sponsor))

<a href="https://opencollective.com/Spina/sponsor/0/website" target="_blank"><img src="https://opencollective.com/Spina/sponsor/0/avatar.svg"></a>
<a href="https://opencollective.com/Spina/sponsor/1/website" target="_blank"><img src="https://opencollective.com/Spina/sponsor/1/avatar.svg"></a>
<a href="https://opencollective.com/Spina/sponsor/2/website" target="_blank"><img src="https://opencollective.com/Spina/sponsor/2/avatar.svg"></a>
<a href="https://opencollective.com/Spina/sponsor/3/website" target="_blank"><img src="https://opencollective.com/Spina/sponsor/3/avatar.svg"></a>
<a href="https://opencollective.com/Spina/sponsor/4/website" target="_blank"><img src="https://opencollective.com/Spina/sponsor/4/avatar.svg"></a>
<a href="https://opencollective.com/Spina/sponsor/5/website" target="_blank"><img src="https://opencollective.com/Spina/sponsor/5/avatar.svg"></a>
<a href="https://opencollective.com/Spina/sponsor/6/website" target="_blank"><img src="https://opencollective.com/Spina/sponsor/6/avatar.svg"></a>
<a href="https://opencollective.com/Spina/sponsor/7/website" target="_blank"><img src="https://opencollective.com/Spina/sponsor/7/avatar.svg"></a>
<a href="https://opencollective.com/Spina/sponsor/8/website" target="_blank"><img src="https://opencollective.com/Spina/sponsor/8/avatar.svg"></a>
<a href="https://opencollective.com/Spina/sponsor/9/website" target="_blank"><img src="https://opencollective.com/Spina/sponsor/9/avatar.svg"></a>
6 changes: 5 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
source "http://rubygems.org"
source "https://rubygems.org"

gemspec

gem 'bootsnap', require: false

group :development, :test do
gem 'rails-controller-testing'
gem 'minitest-reporters'
Expand All @@ -10,4 +12,6 @@ group :development, :test do
gem 'codeclimate-test-reporter', '~> 1.0.0'
gem 'letter_opener'
gem 'pry-rails'
gem 'mocha'
gem 'listen'
end
Loading

0 comments on commit def1c58

Please sign in to comment.