Commits · 8fbef6e8b8cb951ea3da7905b5811712f7b90035 · pinsis-dev / pinsis-portal

Feb 27, 2018
- SCRUM#6 Added map to the Map page · 8fbef6e8
  bhm15 authored 7 years ago
  
  8fbef6e8
Feb 07, 2018
- Merge branch 'issue/3' into 'development' · 9c34c9eb
  Luiz Vasconcellos authored 7 years ago
  
  issue#3 Button header fix See merge request !2
  9c34c9eb
- issue#3 Button header fix · e438ce68
  bhm15 authored 7 years ago
  
  e438ce68
Jan 31, 2018
- Merge branch 'issue/2' into 'development' · 762303c2
  Luiz Vasconcellos authored 7 years ago
  
  ISSUE#2:Added favicon and pinsis title See merge request !1
  762303c2
- ISSUE#2:Added favicon and pinsis title · 1d1e3b7e
  Dante Aleo authored 7 years ago
  
  1d1e3b7e
Jan 25, 2018
- Merge branch 'issue#5' into 'development' · f39885ae
  Luiz Vasconcellos authored 7 years ago
  
  SCRUM#5: Paginating See merge request PInSIS/pinsis-portal!9
  f39885ae
- SCRUM#5: Paginating · 130d00c4
  Luiz Vasconcellos authored 7 years ago
  
  130d00c4
Jan 24, 2018
- Merge branch 'issue#6' into 'development' · 98a77af0
  Luiz Vasconcellos authored 7 years ago
  
  SCRUM#6: Joining components See merge request PInSIS/pinsis-portal!8
  98a77af0
- SCRUM#6: Joining components · 5c23b3a3
  Luiz Vasconcellos authored 7 years ago
  
  5c23b3a3
Jan 18, 2018
- Merge branch 'Issue/1' into 'development' · 84621d4d
  Luiz Vasconcellos authored 7 years ago
  
  Issue/1 See merge request PInSIS/pinsis-portal!6
  84621d4d
- SCRUM#1 - header creation · 9a0b75fb
  Dante Aleo authored 7 years ago
  
  9a0b75fb
Jan 15, 2018
- Merge branch 'issue/2' into 'development' · 57e3f9ce
  Luiz Vasconcellos authored 7 years ago
  
  SCRUM#2 - Added the main page element. See merge request PInSIS/pinsis-portal!3
  57e3f9ce
Dec 22, 2017
- SCRUM#2 - Added the main page element. · 464c7ae3
  Leonardo D'Agostini Chillemi authored 7 years ago
  
  464c7ae3
Dec 20, 2017
- Merge branch 'issue#3' into 'development' · ef097b43
  Luiz Vasconcellos authored 7 years ago
  
  SCRUM#3 - footer implemented See merge request PInSIS/pinsis-portal!2
  ef097b43
- SCRUM#3 - footer implemented · 002b122f
  Luan Varaschim Welter authored 7 years ago
  
  002b122f
Dec 18, 2017
- Sets Angular app · bf5e044a
  Luiz Vasconcellos authored 7 years ago
  
  bf5e044a
Nov 24, 2017
- Solved conflicts and added a title to the map page. · 2f80b970
  Leonardo D'Agostini Chillemi authored 7 years ago
  
  2f80b970
- Adds about page · 819ff95c
  Luiz Vasconcellos authored 7 years ago
  
  819ff95c
- Put a working pin on the map and removed text padding from the bottom. · 088bdb14
  Leonardo D'Agostini Chillemi authored 7 years ago
  
  088bdb14
- Merge branch 'development' of gitlab.c3sl.ufpr.br:PInSIS/pinsis-portal into development · c0817860
  Leonardo D'Agostini Chillemi authored 7 years ago
  
  c0817860
- Implemented the map as a partial that loads inside about.html · 64598c30
  Leonardo D'Agostini Chillemi authored 7 years ago and Luan Varaschim Welter committed 7 years ago
  
  64598c30
- map · 7a03fb04
  Luan Varaschim Welter authored 7 years ago
  
  7a03fb04
Nov 23, 2017
- Implemented the map as a partial that loads inside about.html · e7700b71
  Leonardo D'Agostini Chillemi authored 7 years ago
  
  e7700b71
- little mistake · 44eb02a2
  Luan Varaschim Welter authored 7 years ago
  
  44eb02a2
- barbs te vira · fd9bf488
  Luan Varaschim Welter authored 7 years ago
  
  fd9bf488
- map · 938cac79
  Luan Varaschim Welter authored 7 years ago
  
  938cac79
- Final adjustments to layout · 797e991f
  Luiz Vasconcellos authored 7 years ago
  
  797e991f
- Merge branch 'bootstrap' into development · a72baf6b
  Luiz Vasconcellos authored 7 years ago
  
  a72baf6b
- Add links to footer · 0adc9794
  Luiz Vasconcellos authored 7 years ago
  
  0adc9794
- Basic angularjs · 0c763a7d
  Luiz Vasconcellos authored 7 years ago
  
  0c763a7d
Nov 22, 2017
- footer with links · 58d8f010
  Dante Aleo authored 7 years ago
  
  58d8f010
- Merge branch 'bootstrap' of gitlab.c3sl.ufpr.br:PInSIS/pinsis-portal into bootstrap · 02e3f53e
  Leonardo D'Agostini Chillemi authored 7 years ago
  
  02e3f53e
- Same thing. · f0d39f6d
  Leonardo D'Agostini Chillemi authored 7 years ago
  
  f0d39f6d
- barra brasil works now · 5ad4723f
  Luan Varaschim Welter authored 7 years ago
  
  5ad4723f
- Adds kibana iframe · d3e91dd5
  Luiz Vasconcellos authored 7 years ago
  
  d3e91dd5
- Alteração de imagens do footer. · 4c9c5575
  Leonardo D'Agostini Chillemi authored 7 years ago
  
  4c9c5575
- Some logo tests. · b46fbe72
  Leonardo D'Agostini Chillemi authored 7 years ago
  
  b46fbe72
- Final touches for basic layout · 78515be9
  Luiz Vasconcellos authored 7 years ago
  
  78515be9
- Basic layout · 042e1ec1
  Luiz Vasconcellos authored 7 years ago
  
  042e1ec1
- Merge branch 'footer' of gitlab.c3sl.ufpr.br:PInSIS/pinsis-portal into dev1 · 5f3c48d0
  Luiz Vasconcellos authored 7 years ago
  
  5f3c48d0