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.

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

Us12 visualize indicators from libraries #65

Merged
merged 16 commits into from
Oct 31, 2017

Conversation

cjjcastro
Copy link
Collaborator

Resolved #50

Hugo Carvalho and others added 16 commits October 30, 2017 09:33
…b.com/fga-gpp-mds/2017.2-QueroCultura into US12_VisualizeIndicatorsFromLibraries

Signed-off-by: Hugo Carvalho <hugo-nc@hotmail.com>

Conflicts:
	agents_indicators/static/css/agentsIndicators.css
	agents_indicators/templates/agents_indicators/agents_indicators.html
Signed-off-by: Hugo Carvalho <hugo-nc@hotmail.com>
Signed-off-by: Cleber Castro <cjj.castro3@gmail.com>
Signed-off-by: Hugo Carvalho <hugo-nc@hotmail.com>
Signed-off-by: Cleber Castro <cjj.castro3@gmail.com>
Signed-off-by: Hugo Carvalho <hugo-nc@hotmail.com>
Signed-off-by: Cleber Castro <cjj.castro3@gmail.com>
Signed-off-by: Hugo Carvalho <hugo-nc@hotmail.com>
Signed-off-by: Cleber Castro <cjj.castro3@gmail.com>
Signed-off-by: Hugo Carvalho <hugo-nc@hotmail.com>

Conflicts:
	agents_indicators/templates/agents_indicators/agents_indicators.html
	library_indicators/templates/library_indicators/library.html
Signed-off-by: Hugo Carvalho <hugo-nc@hotmail.com>
Signed-off-by: Cleber Castro <cjj.castro3@gmail.com>
Signed-off-by: Hugo Carvalho <hugo-nc@hotmail.com>
Signed-off-by: Cleber Castro <cjj.castro3@gmail.com>
@hugonxc hugonxc merged commit fd303b4 into devel Oct 31, 2017
@pablodiegoss pablodiegoss deleted the US12_VisualizeIndicatorsFromLibraries branch November 21, 2017 12:35
rodrigocam pushed a commit that referenced this pull request Dec 12, 2017
…ibraries

Us12 visualize indicators from libraries
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants