Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec
No related branches found
No related tags found
Showing
- Gemfile 10 additions, 0 deletionsGemfile
- app/assets/images/icons/collection-add.png 0 additions, 0 deletionsapp/assets/images/icons/collection-add.png
- app/assets/images/icons/collection-download.png 0 additions, 0 deletionsapp/assets/images/icons/collection-download.png
- app/assets/images/icons/collection-fast.png 0 additions, 0 deletionsapp/assets/images/icons/collection-fast.png
- app/assets/images/icons/collection-items.png 0 additions, 0 deletionsapp/assets/images/icons/collection-items.png
- app/assets/images/icons/collection-remove.png 0 additions, 0 deletionsapp/assets/images/icons/collection-remove.png
- app/assets/images/icons/collection.png 0 additions, 0 deletionsapp/assets/images/icons/collection.png
- app/assets/images/icons/comments.png 0 additions, 0 deletionsapp/assets/images/icons/comments.png
- app/assets/images/icons/contrast.png 0 additions, 0 deletionsapp/assets/images/icons/contrast.png
- app/assets/images/icons/download.png 0 additions, 0 deletionsapp/assets/images/icons/download.png
- app/assets/images/icons/filter.png 0 additions, 0 deletionsapp/assets/images/icons/filter.png
- app/assets/images/icons/font-minus.png 0 additions, 0 deletionsapp/assets/images/icons/font-minus.png
- app/assets/images/icons/font-plus.png 0 additions, 0 deletionsapp/assets/images/icons/font-plus.png
- app/assets/images/icons/report-circle.png 0 additions, 0 deletionsapp/assets/images/icons/report-circle.png
- app/assets/images/icons/report.png 0 additions, 0 deletionsapp/assets/images/icons/report.png
- app/assets/images/icons/search.png 0 additions, 0 deletionsapp/assets/images/icons/search.png
- app/assets/images/icons/selection-copy.png 0 additions, 0 deletionsapp/assets/images/icons/selection-copy.png
- app/assets/images/icons/selection-download.png 0 additions, 0 deletionsapp/assets/images/icons/selection-download.png
- app/assets/images/icons/selection-move.png 0 additions, 0 deletionsapp/assets/images/icons/selection-move.png
- app/assets/images/icons/star-gold.png 0 additions, 0 deletionsapp/assets/images/icons/star-gold.png
... | ... | @@ -112,3 +112,13 @@ group :test do |
gem 'shoulda' | ||
gem 'shoulda-callback-matchers', '~> 1.1.1' | ||
end | ||
gem 'streamio-ffmpeg', '~> 1.0.0' | ||
# sidekiq | ||
gem 'sidekiq' | ||
gem 'sinatra', require: false | ||
gem 'slim' | ||
# CUrl | ||
gem 'curb', '~> 0.8.8' |
app/assets/images/icons/collection-add.png
0 → 100644
8.91 KiB
9.9 KiB
app/assets/images/icons/collection-fast.png
0 → 100644
9.74 KiB
app/assets/images/icons/collection-items.png
0 → 100644
3.42 KiB
8.56 KiB
app/assets/images/icons/collection.png
0 → 100644
5.14 KiB
app/assets/images/icons/comments.png
0 → 100644
4.28 KiB
app/assets/images/icons/contrast.png
0 → 100644
2.23 KiB
app/assets/images/icons/download.png
0 → 100644
9.5 KiB
app/assets/images/icons/filter.png
0 → 100644
2.69 KiB
app/assets/images/icons/font-minus.png
0 → 100644
2.18 KiB
app/assets/images/icons/font-plus.png
0 → 100644
2.14 KiB
app/assets/images/icons/report-circle.png
0 → 100644
8.13 KiB
app/assets/images/icons/report.png
0 → 100644
22.8 KiB
app/assets/images/icons/search.png
0 → 100644
9.11 KiB
app/assets/images/icons/selection-copy.png
0 → 100644
8.78 KiB
8.09 KiB
app/assets/images/icons/selection-move.png
0 → 100644
9.79 KiB
app/assets/images/icons/star-gold.png
0 → 100644
7.21 KiB