José Corte
|
3112632b2d
|
Merge branch 'release/0.2.0' into 'dev'
Release/0.2.0
See merge request kluppsoftware/smart-energia-web!49
|
2022-05-16 21:26:46 +00:00 |
|
joseCorte-exe
|
eabb400dc2
|
Merge branch 'dev' of https://gitlab.com/kluppsoftware/smart-energia-web into fix/fixMerge
|
2022-05-16 18:24:21 -03:00 |
|
joseCorte-exe
|
f5aea2359e
|
fix image error (deploy)
|
2022-05-16 18:22:53 -03:00 |
|
José Corte
|
c71949201d
|
Merge branch 'dev' into 'release/0.2.0'
Dev
See merge request kluppsoftware/smart-energia-web!47
|
2022-05-16 21:03:45 +00:00 |
|
José Corte
|
c7f8e3c788
|
Merge branch 'fix/fixMerge' into 'dev'
Fix/fix merge
See merge request kluppsoftware/smart-energia-web!46
|
2022-05-16 21:02:46 +00:00 |
|
joseCorte-exe
|
c05fe57e19
|
fixing merge
|
2022-05-16 18:01:54 -03:00 |
|
joseCorte-exe
|
12fe01699a
|
Merge branch 'dev' of https://gitlab.com/kluppsoftware/smart-energia-web into feature/forgotPasswordAndpldPage
|
2022-05-16 17:57:49 -03:00 |
|
joseCorte-exe
|
6a92651a9b
|
fix conflict
|
2022-05-16 17:55:59 -03:00 |
|
José Corte
|
92b988dac2
|
Merge branch 'feature/forgotPasswordAndpldPage' into 'dev'
Feature/forgot password andpld page
See merge request kluppsoftware/smart-energia-web!44
|
2022-05-16 20:37:12 +00:00 |
|
joseCorte-exe
|
b224c837cd
|
✨ add forgot password and pld pages
|
2022-05-16 17:30:12 -03:00 |
|
joseCorte-exe
|
5d28dbe930
|
✨ add forgot password feature
|
2022-05-16 10:44:11 -03:00 |
|
joseCorte-exe
|
ec01d4cada
|
✨
|
2022-05-16 08:51:43 -03:00 |
|
joseCorte-exe
|
875d9e45ab
|
:feature: add pld pages feature
|
2022-05-16 08:26:09 -03:00 |
|
José Corte
|
3a04abe15f
|
Merge branch 'feature/loginPage' into 'dev'
Feature/login page
See merge request kluppsoftware/smart-energia-web!43
|
2022-05-13 15:51:39 +00:00 |
|
joseCorte-exe
|
dc6b9bbe67
|
🐛 fix login page style bugs
|
2022-05-13 12:49:27 -03:00 |
|
joseCorte-exe
|
775d141482
|
✨ add link features (tel and smart-energia site)
|
2022-05-13 12:48:24 -03:00 |
|
José Corte
|
704a063fab
|
Merge branch 'release/0.1.0' into 'main'
Release/0.1.0
See merge request kluppsoftware/smart-energia-web!42
|
2022-05-12 18:36:02 +00:00 |
|
José Corte
|
1bd150e4eb
|
Release/0.1.0
|
2022-05-12 18:36:02 +00:00 |
|
joseCorte-exe
|
ab036e3de4
|
🔥 remove all comments
|
2022-05-12 15:24:53 -03:00 |
|
joseCorte-exe
|
af5cc2dd31
|
🔥 remove comments
|
2022-05-12 15:17:33 -03:00 |
|
joseCorte-exe
|
33d59eccfb
|
🐛 fix style map card
|
2022-05-12 15:11:03 -03:00 |
|
joseCorte-exe
|
fff84c7816
|
🐛 fix style map card
|
2022-05-12 15:04:30 -03:00 |
|
joseCorte-exe
|
1d83f662ac
|
🐛 fix babel
|
2022-05-12 14:51:07 -03:00 |
|
joseCorte-exe
|
43bb63bbd0
|
🐛 fix babel
|
2022-05-12 14:48:44 -03:00 |
|
joseCorte-exe
|
b51b2b0a2e
|
🐛 fix babel
|
2022-05-12 14:38:23 -03:00 |
|
joseCorte-exe
|
7fc8f51d8c
|
🐛 fix babel
|
2022-05-12 14:36:07 -03:00 |
|
José Corte
|
cbf98861fe
|
Update babel.config.js
|
2022-05-12 17:31:12 +00:00 |
|
José Corte
|
6b6bf086a9
|
Delete .babelrc
|
2022-05-12 17:26:14 +00:00 |
|
joseCorte-exe
|
e28d661f89
|
🐛 fix imports
|
2022-05-12 14:19:49 -03:00 |
|
joseCorte-exe
|
b2065b0003
|
🚚 move pages and styles to src
|
2022-05-12 14:13:18 -03:00 |
|
joseCorte-exe
|
0a1365815e
|
add .js to styled files
|
2022-05-12 14:04:18 -03:00 |
|
joseCorte-exe
|
f9237cb7f8
|
fixing _document.tsx
|
2022-05-12 13:54:05 -03:00 |
|
joseCorte-exe
|
df902d6306
|
fixing dashboard imports
|
2022-05-12 13:37:15 -03:00 |
|
José Corte
|
0bd6b6bdf1
|
Merge branch 'dev' into 'main'
fix tsconfig configurations
See merge request kluppsoftware/smart-energia-web!40
|
2022-05-12 16:34:16 +00:00 |
|
joseCorte-exe
|
a2fc9b0355
|
fix tsconfig configurations
|
2022-05-12 13:30:52 -03:00 |
|
José Corte
|
ce92e85cae
|
Merge branch 'release/0.1.0' into 'main'
Merge branch 'dev' into 'release/0.1.0'
See merge request kluppsoftware/smart-energia-web!39
|
2022-05-12 16:23:26 +00:00 |
|
José Corte
|
93bedd5287
|
Merge branch 'dev' into 'release/0.1.0'
Dev
See merge request kluppsoftware/smart-energia-web!38
|
2022-05-12 16:22:52 +00:00 |
|
José Corte
|
a9f5c964bf
|
Merge branch 'release/0.1.0' into 'main'
🏷️ fix styled-components
See merge request kluppsoftware/smart-energia-web!37
|
2022-05-12 15:40:29 +00:00 |
|
joseCorte-exe
|
423d959c0a
|
🏷️ fix styled-components
|
2022-05-12 12:39:29 -03:00 |
|
José Corte
|
4931eb9be4
|
Merge branch 'release/0.1.0' into 'main'
🏷️ fix code types
See merge request kluppsoftware/smart-energia-web!36
|
2022-05-12 14:42:35 +00:00 |
|
joseCorte-exe
|
9b27297de6
|
🏷️ fix code types
|
2022-05-12 11:41:15 -03:00 |
|
José Corte
|
583c2f8b12
|
🔖 Merge branch 'release/0.1.0' into 'main'
Release/0.1.0
See merge request kluppsoftware/smart-energia-web!35
|
2022-05-12 14:22:25 +00:00 |
|
José Corte
|
b93316c3bd
|
Merge branch 'login' into 'dev'
Login
See merge request kluppsoftware/smart-energia-web!33
|
2022-05-12 14:05:36 +00:00 |
|
joseCorte-exe
|
bfd1182b8d
|
🚀 preparing to deploy
|
2022-05-12 11:00:17 -03:00 |
|
José Corte
|
f45110aed1
|
Merge branch 'feature/buttonGroup' into 'dev'
Feature/button group
See merge request kluppsoftware/smart-energia-web!32
|
2022-05-12 12:58:44 +00:00 |
|
José Corte
|
6187d42ea4
|
Merge branch 'dev' into 'feature/buttonGroup'
# Conflicts:
# pages/resumoOperacao.tsx
|
2022-05-12 12:58:38 +00:00 |
|
joseCorte-exe
|
f4417e8c50
|
✏️ add toggle buttton group view types
|
2022-05-12 09:55:55 -03:00 |
|
joseCorte-exe
|
40e7902377
|
✨ add toggle buttton group
|
2022-05-12 09:54:08 -03:00 |
|
José Corte
|
f080edbab6
|
Merge branch 'feature/telemetry2' into 'dev'
Feature/telemetry2
See merge request kluppsoftware/smart-energia-web!31
|
2022-05-12 12:45:42 +00:00 |
|
José Corte
|
ca32688e81
|
Merge branch 'dev' into 'feature/telemetry2'
# Conflicts:
# pages/resumoOperacao.tsx
# styles/layouts/ResumoOperacao/ResumoOperacaoView.ts
|
2022-05-12 12:45:37 +00:00 |
|