José Corte
|
cf47222764
|
Merge branch 'dev' into 'feature/operationSummary'
# Conflicts:
# pages/resumoOperacao.tsx
|
2022-05-12 11:42:35 +00:00 |
|
Alex Santos
|
daf9705016
|
finished News, Operation Sumary
|
2022-05-11 17:42:33 -03:00 |
|
Alex Da Silva Santos
|
51ae0e433f
|
Merge branch 'feature/login' into 'main'
Feature/login
See merge request kluppsoftware/smart-energia-web!27
|
2022-05-11 19:32:17 +00:00 |
|
Alex Santos
|
cea2327bb0
|
finished login
|
2022-05-11 16:31:17 -03:00 |
|
Alex Santos
|
25e254e9f7
|
finished login
|
2022-05-11 16:27:18 -03:00 |
|
joseCorte-exe
|
d76992f98d
|
✨ add telemetry page
|
2022-05-11 13:13:25 -03:00 |
|
José Corte
|
57fe3c6ecf
|
Merge branch 'dev' into 'feature/telemetry'
# Conflicts:
# src/components/banner/BannerView.ts
|
2022-05-11 16:08:17 +00:00 |
|
Alex Santos
|
66c850aef6
|
🎨 improve format of the code
|
2022-05-11 13:04:21 -03:00 |
|
Alex Santos
|
83c6d85e83
|
🎨 improve format of the code
|
2022-05-11 12:57:25 -03:00 |
|
joseCorte-exe
|
4db4897ff0
|
Merge branch 'responsiving' of https://gitlab.com/kluppsoftware/smart-energia-web into dev
|
2022-05-11 12:52:50 -03:00 |
|
joseCorte-exe
|
be1e8ad57b
|
📱 responsiving pages
|
2022-05-11 12:51:34 -03:00 |
|
Alex Santos
|
06640aceb6
|
Telemetry finished
|
2022-05-11 12:49:21 -03:00 |
|
joseCorte-exe
|
3c51cdbc54
|
📱 responsiving pages
|
2022-05-11 12:46:42 -03:00 |
|
José Corte
|
6a8fe821a6
|
Merge branch 'feature/commonQuestionsPagee' into 'dev'
Feature/common questions pagee
See merge request kluppsoftware/smart-energia-web!23
|
2022-05-11 14:09:13 +00:00 |
|
joseCorte-exe
|
175af9af1d
|
✨ add faq page
|
2022-05-11 11:07:13 -03:00 |
|
joseCorte-exe
|
28d68c0fd9
|
🎉 add page files
|
2022-05-11 08:59:42 -03:00 |
|
Alex Santos
|
967701b500
|
Merge branch 'dev' of https://gitlab.com/kluppsoftware/smart-energia-web into feature/telemetry
|
2022-05-10 17:35:33 -03:00 |
|
José Corte
|
2d2a6fdc5c
|
Merge branch 'feature/gradientButton' into 'dev'
✨ add button with gradient feature
See merge request kluppsoftware/smart-energia-web!22
|
2022-05-10 20:30:26 +00:00 |
|
joseCorte-exe
|
99ccad016e
|
✨ add button with gradient feature
|
2022-05-10 17:28:30 -03:00 |
|
Alex Santos
|
4ed8e2953f
|
input finale
|
2022-05-10 17:17:24 -03:00 |
|
Alex Santos
|
efb7075426
|
input styling, missing to finalize the buttons
|
2022-05-10 16:36:14 -03:00 |
|
José Corte
|
71d093b736
|
Merge branch 'feature/aboutUs' into 'dev'
✨ add about us page feature
See merge request kluppsoftware/smart-energia-web!21
|
2022-05-10 19:14:32 +00:00 |
|
joseCorte-exe
|
6ec1a13b9f
|
✨ add about us page feature
|
2022-05-10 16:10:37 -03:00 |
|
José Corte
|
b80ffc0141
|
Merge branch 'feature/iconsSidebar' into 'dev'
Feature/icons sidebar
See merge request kluppsoftware/smart-energia-web!20
|
2022-05-10 19:00:20 +00:00 |
|
Alex Santos
|
c9f197db70
|
login
|
2022-05-10 15:33:21 -03:00 |
|
Alex Santos
|
ca49939a66
|
page login
|
2022-05-10 15:29:34 -03:00 |
|
Alex Santos
|
b8d75d436b
|
✨ Add login
|
2022-05-10 15:28:16 -03:00 |
|
Alex Santos
|
0790f7973a
|
login
|
2022-05-10 15:18:39 -03:00 |
|
Alex Santos
|
0e3cf4161d
|
✨ add Operation Summary Page
|
2022-05-10 15:14:26 -03:00 |
|
Alex Santos
|
ff53d07abf
|
✨ Implementação tela de telemetria
|
2022-05-10 15:07:33 -03:00 |
|
joseCorte-exe
|
454bcbf200
|
✨ add icons to nav
|
2022-05-10 14:07:20 -03:00 |
|
joseCorte-exe
|
19775ab317
|
🍱 add sidebar icons
|
2022-05-10 12:36:46 -03:00 |
|
José Corte
|
613fb36ea0
|
Merge branch 'fix/fixAllCode' into 'dev'
🚑 fix code
See merge request kluppsoftware/smart-energia-web!19
|
2022-05-10 15:19:36 +00:00 |
|
joseCorte-exe
|
3736d6674d
|
🚑 fix code
|
2022-05-10 12:13:03 -03:00 |
|
José Corte
|
ee91534ef7
|
Merge branch 'main' into 'dev'
Main
See merge request kluppsoftware/smart-energia-web!18
|
2022-05-10 00:27:38 +00:00 |
|
José Corte
|
16eed28a8a
|
Merge branch 'feature/nprogress' into 'main'
Feature/nprogress
See merge request kluppsoftware/smart-energia-web!17
|
2022-05-09 22:29:32 +00:00 |
|
José Corte
|
40b226adcf
|
Merge branch 'main' into 'feature/nprogress'
# Conflicts:
# README.md
|
2022-05-09 22:29:24 +00:00 |
|
joseCorte-exe
|
de9ab048c5
|
add load progress bar (nprogress) feature
|
2022-05-09 18:13:10 -03:00 |
|
José Corte
|
0a9db132e3
|
Merge branch 'feature/economyPages' into 'dev'
:feature: add economy pages
See merge request kluppsoftware/smart-energia-web!16
|
2022-05-09 20:30:12 +00:00 |
|
joseCorte-exe
|
ab7aa06725
|
updating dev branch
|
2022-05-09 17:28:29 -03:00 |
|
joseCorte-exe
|
400d25fe88
|
:feature: add economy pages
|
2022-05-09 17:00:50 -03:00 |
|
José Corte
|
bd21fd15f3
|
Merge branch 'mergeFix' into 'dev'
uploading to fix marge
See merge request kluppsoftware/smart-energia-web!14
|
2022-05-09 16:11:46 +00:00 |
|
joseCorte-exe
|
4b65ecbffb
|
uploading to fix marge
|
2022-05-09 13:10:18 -03:00 |
|
Alex Da Silva Santos
|
8a0636abee
|
Merge branch 'feature/loginStyledComponents' into 'dev'
Adicionado Reponsividade no login
See merge request kluppsoftware/smart-energia-web!13
|
2022-05-07 00:10:57 +00:00 |
|
Alex Da Silva Santos
|
f04050307c
|
Merge branch 'dev' into 'feature/loginStyledComponents'
# Conflicts:
# pages/index.tsx
|
2022-05-07 00:10:40 +00:00 |
|
Alex Santos
|
99d95c3e1d
|
Adicionado Reponsividade no login
|
2022-05-06 20:50:18 -03:00 |
|
José Corte
|
89e627e1b1
|
Merge branch 'feature/graphCard' into 'dev'
Feature/graph card
See merge request kluppsoftware/smart-energia-web!11
|
2022-05-06 23:47:37 +00:00 |
|
José Corte
|
bf8f67c54f
|
add modified and created components and pages
|
2022-05-06 20:42:48 -03:00 |
|
José Corte
|
9d1741630f
|
Merge branch 'feature/graphCard' into 'dev'
Feature/graph card
See merge request kluppsoftware/smart-energia-web!8
|
2022-05-06 23:37:38 +00:00 |
|
José Corte
|
09d853a960
|
Merge branch 'feature/buttons' into 'dev'
✨ add buttons: loginButton and basicButton
See merge request kluppsoftware/smart-energia-web!7
|
2022-05-06 23:37:08 +00:00 |
|