Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

I want merge the devel to master, to update it with the latest changes made #251

Merged
merged 77 commits into from
Oct 20, 2018
Merged

I want merge the devel to master, to update it with the latest changes made #251

merged 77 commits into from
Oct 20, 2018

Conversation

WeillerFernandes
Copy link
Contributor

No description provided.

GabrielDVpereira and others added 30 commits October 4, 2018 16:41
@GabrielDVpereira @Ridersk
#187 spreading the elements in the sidebar evenly
0fea669 
Co-authored-by: Ridersk <lucasmacielaguiar@gmail.com>
@GabrielDVpereira @Ridersk
#187 Aligning the search button
d76553a 
Co-authored-by: Ridersk <lucasmacielaguiar@gmail.com>
@GabrielDVpereira
#187 Adding shadow effect to sidebar
a14e27b 
 Co-authored-by: Ridersk <lucasmacielaguiar@gmail.com>
@GabrielDVpereira @Ridersk
#187 Added the new navbar color and changed the publicity background
0d59ee8 
Co-authored-by: Ridersk <lucasmacielaguiar@gmail.com>
@Ridersk
#187 fixed errors of invalid references in screens
213fad2
@Ridersk
#187 Adding underline decoration in search inputText
5d9a653
@GabrielDVpereira @Ridersk
Added a bottom line to the navbar
46c18fa 
Co-authored-by: Ridersk <lucasmacielaguiar@gmail.com>
@GabrielDVpereira @Ridersk
WIP: adding a advertiser page
8e744f1 
Co-authored-by: Ridersk <lucasmacielaguiar@gmail.com>
@Ridersk
#187 Adding back button in some screens
7095cd6
@Ridersk
#187 styling choose file button in cadastro screen
852f0e8
@Ridersk
#187 Adding input of categoria in screen Cadastro and button to confi…
855d7d8 
…rm dot in map
@Ridersk
#187 Changed size of the screen itens in navBar
8960205
@Ridersk
#187 Changed presentation of the in screen index
1bedc64
@GabrielDVpereira
adapting the margin of the index page's content
16dcc1b
@GabrielDVpereira
Made some adjustments on the cadastro page's code but visualy nothin…
9aec43f 
…g changed
@GabrielDVpereira
Adding a new map for the publicity local page
f7d064f
@GabrielDVpereira
just adjusted the position of the favorite box in the favorite page
572ec75
@GabrielDVpereira
#187 Finished some changes in the LocalPublicidade.html file
691c38c
@GabrielDVpereira
#187 on file local.html I made the favorite icon turns into a complet…
b2725b0 
…elyfull heart when clicking
@min-ia
Add issue template to usability
f2b7ea9
@min-ia
Update issue templates
76a1d9d
@min-ia
Update issue templates
2cf2c24
@GabrielDVpereira
Added a modal box to the map page when clicking on 'confirmar' button
dc8c0bf
@min-ia
Add documentation to sprint 6
8e281fa
@min-ia
Merge pull request #221 from fga-eps-mds/documentation/sprint-6
696f04c 
Add documentation to sprint 6
@min-ia
Add page with EVM graphs
7cb2f03
@min-ia
Merge pull request #222 from fga-eps-mds/documentation/208-evm
1ccdd4b 
Add page with EVM graphs
@Ridersk
#187 Removing unnecessary comments
4473ac1
@Ridersk
#187 Adding overflow:hidden at style navbar css
5f1faa9
@Ridersk
Adding scrollbar with height opx at style navbar tab css
3d6c63e
Ridersk and others added 24 commits October 15, 2018 17:08
@Ridersk
#201 Changing method to find_by_id in FavoriteLocal - update and dest…
a196966 
…roy actions
@Ridersk
#201 Creating test to favorite not deleted controller
3269346
@GabrielDVpereira
#199 fixed all the codeclimate issues in the Gemfile
d5961ad
@GabrielDVpereira
#199 fixed some more issues from codeclimate
5388eb0
@GabrielDVpereira
#199 fixing more issues from codeclimate
ffe9218
@GabrielDVpereira
#199 fixing more issues from codeclimate
ad5f7b7
@min-ia
Documentation Sprint 7
05c6260
@GabrielDVpereira
#199 Last fixtures upon the codeclimate matter
3a54bbc
@WeillerFernandes
#189 creating folder for prototype images
76a5dfc
@min-ia
Merge pull request #227 from fga-eps-mds/refactor/201-add-route-favor…
2c114d9 
…ite-locals

Refactor/201 add route favorite locals
@min-ia
Merge pull request #231 from fga-eps-mds/documentation/sprint-7
61c28b0 
Documentation Sprint 7
@min-ia
Merge pull request #229 from fga-eps-mds/documentation/189-map-of-pro…
04c1b4a 
…totype-screens

Documentation/189 adding map of prototype screens
@GabrielDVpereira
#199 Trying to fix some errors
b8491c3
@GabrielDVpereira
#199 Trying to fix some errors
e5c52c6
@GabrielDVpereira
#199 trying to fix travis issue
1acf2a0
@GabrielDVpereira
#199 trying to fix travis issue
1d007c1
@GabrielDVpereira
#199 trying to fix travis issue
20a81d1
@GabrielDVpereira
#199 trying to work out a way for the codeclimate to come clean witho…
cd81c4c 
…ut breaking travis build in the Gemfile
@GabrielDVpereira
Resolving some conflict issues
a4f2906
@min-ia
Merge pull request #230 from fga-eps-mds/refactor/199-fixing-codeclimate
aa00943 
Refactor/199 fixing codeclimate
@zarbielli
#232 - Updating jekyll to fix the security vulnerability
acc3cb3
@min-ia
Merge pull request #233 from fga-eps-mds/bugfix/232-jekyll
c62e3de 
#232 - Updating jekyll to fix the security vulnerability
@min-ia
Update issue templates
8f612ec
@min-ia
Delete CHANGELOG.md
ad97842
@min-ia min-ia temporarily deployed to dev-indicaai October 20, 2018 14:45 Inactive
@coveralls
Copy link

coveralls commented Oct 20, 2018 •
edited
Loading

Pull Request Test Coverage Report for Build 478

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.4%) to 98.091%
Totals Coverage Status
Change from base Build 296: 0.4%
Covered Lines: 411
Relevant Lines: 419
💛 - Coveralls

@min-ia min-ia temporarily deployed to dev-indicaai October 20, 2018 15:07 Inactive
@min-ia min-ia temporarily deployed to dev-indicaai October 20, 2018 15:10 Inactive
@min-ia min-ia merged commit e64110a into master Oct 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@WeillerFernandes @coveralls @min-ia @GabrielDVpereira @Ridersk @zarbielli