verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

4770-routes_roadmap2 #1647

Merged
vicent merged 7 commits from 4770-routes_roadmap2 into dev 2023-07-13 08:35:48 +00:00
Conversation 0 Commits 7 Files Changed 51 +1753 -490
vicent commented 2023-07-04 12:46:42 +00:00
Contributor
Copy Link
No description provided.
vicent added the
CR / Tests passed
 label 2023-07-04 12:46:42 +00:00
vicent added 1 commit 2023-07-04 12:46:47 +00:00
gitea/salix/pipeline/head This commit looks good Details
e58d4e5db3 refs #4770 feat: añadida sección 'Troncales'
vicent requested review from jgallego 2023-07-04 12:54:09 +00:00
vicent changed title from refs #4770 feat: añadida sección 'Troncales' to 4770-routes_roadmap2 2023-07-04 12:58:03 +00:00
vicent added 1 commit 2023-07-04 13:04:01 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
4369d275f8 refs #4770 feat: add test
jgallego requested changes 2023-07-04 14:11:11 +00:00
db/changes/232801/00-roadmapACL.sql Outdated
@ -0,0 +1,4 @@
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
VALUES
('Roadmap', '*', '*', 'ALLOW', 'ROLE', 'employee'),
jgallego commented 2023-07-04 13:05:35 +00:00
Owner
Copy Link

posem algo mes concret, pregunta a Pako qui pot llegir i escriure d'ixes taules

posem algo mes concret, pregunta a Pako qui pot llegir i escriure d'ixes taules
vicent marked this conversation as resolved
modules/client/front/summary/style.scss
@ -11,2 +11,2 @@
content: 'contact_support';
font-size: 17px;
font-family: 'salixfont' !important;
content: "e965";
jgallego commented 2023-07-04 14:10:58 +00:00
Owner
Copy Link

confirma que este es correcte

confirma que este es correcte
vicent commented 2023-07-11 11:41:06 +00:00
Author
Contributor
Copy Link

si, es el icono de grafana

si, es el icono de grafana
vicent marked this conversation as resolved
modules/route/front/roadmap/summary/style.scss
@ -0,0 +1,11 @@
@import "variables";
jgallego commented 2023-07-04 14:11:07 +00:00
Owner
Copy Link

sols un bot de linea

sols un bot de linea
vicent marked this conversation as resolved
vicent added 1 commit 2023-07-11 11:49:57 +00:00
gitea/salix/pipeline/head Build queued... Details
6655807d80 refs #4770 refactor: change acl
vicent added 158 commits 2023-07-11 11:50:54 +00:00
gitea/salix/pipeline/head This commit looks good Details
0d6b248f76 feat(2fa): email 2fa 
Refs #5475
gitea/salix/pipeline/head There was a failure building this commit Details
902709d61b Added authCode table
gitea/salix/pipeline/head There was a failure building this commit Details
2e0325e567 Validate code
gitea/salix/pipeline/head There was a failure building this commit Details
b9e48f2102 Added translations & enable through departments
gitea/salix/pipeline/head There was a failure building this commit Details
b0f1bae33e Added unit test
gitea/salix/pipeline/head There was a failure building this commit Details
4807fcb394 Removed focus
gitea/salix/pipeline/head There was a failure building this commit Details
b5f2cf3711 Added unit test & translation fixes
gitea/salix/pipeline/head There was a failure building this commit Details
9aaea7e8ed Changed to new SQL version
gitea/salix/pipeline/head There was a failure building this commit Details
ef87dcc0f5 require authentication on every login
gitea/salix/pipeline/head This commit looks good Details
c3443ecc7c Updated e2e
gitea/salix/pipeline/head This commit looks good Details
c1ea1acc8c refs #4614 fear(ticket): add 'set weight' funcionality
gitea/salix/pipeline/head This commit looks good Details
7021e52705 correct folder
gitea/salix/pipeline/head There was a failure building this commit Details
87e1caa4eb refs #5334 department seccion
gitea/salix/pipeline/head There was a failure building this commit Details
598067f757 refs #5334 routes
gitea/salix/pipeline/head There was a failure building this commit Details
071849065a refs #5334 fix main
gitea/salix/pipeline/head There was a failure building this commit Details
443821b5c2 refs #5334 ?q
gitea/salix/pipeline/head There was a failure building this commit Details
fd4d04756a refs #5334 routes index fix
gitea/salix/pipeline/head There was a failure building this commit Details
612d0a2dfb refs #5334 fix index
gitea/salix/pipeline/head There was a failure building this commit Details
3dcdbe0223 refs #5334 summary basic data
gitea/salix/pipeline/head There was a failure building this commit Details
d09889b08a refs #5334 fix summary route
gitea/salix/pipeline/head There was a failure building this commit Details
9f9963af56 refs #5334 descriptor
gitea/salix/pipeline/head There was a failure building this commit Details
5c9ee21cfc refs #5334 department.card
gitea/salix/pipeline/head There was a failure building this commit Details
f63dd0f9a3 refs #5334 datos
gitea/salix/pipeline/head There was a failure building this commit Details
adafd7444b refs #5334 worker-department
gitea/salix/pipeline/head There was a failure building this commit Details
10e085ca1b refs #5334 link department
gitea/salix/pipeline/head There was a failure building this commit Details
2b06c62876 refs #5334 left-menu
gitea/salix/pipeline/head There was a failure building this commit Details
0789804352 refs #5334 fix basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
f74c370446 refs #5334 checks vertical
gitea/salix/pipeline/head There was a failure building this commit Details
07e176ae4f refs #5334 fix checks basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
ceaaece007 refs #5334 label-value
gitea/salix/pipeline/head There was a failure building this commit Details
3aa5ce6208 refs #5334 fix hasToSendMail
gitea/salix/pipeline/head There was a failure building this commit Details
2a78a912eb refs #5334 worker.department
gitea/salix/pipeline/head There was a failure building this commit Details
f4e877dada refs #5334 refactor summary
gitea/salix/pipeline/head There was a failure building this commit Details
2d6f0bb2ce refs #5334 front fix
gitea/salix/pipeline/head There was a failure building this commit Details
d9a64211de refs #5334 fix descriptor, basic-data, summary
gitea/salix/pipeline/head There was a failure building this commit Details
107d8d1edd refs #5334 model y vista
gitea/salix/pipeline/head There was a failure building this commit Details
2778858705 refs #5334 search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
cf632040e7 refs #5334 workFk, clientFk
gitea/salix/pipeline/head This commit looks good Details
e26eedb51c refs #5334 descriptor wprkerFk clientFk
gitea/salix/pipeline/head This commit looks good Details
e7d25a6cf3 refs #5334 filter
gitea/salix/pipeline/head This commit looks good Details
45085cccc8 refs #5334 fix search-panel
gitea/salix/pipeline/head This commit looks good Details
8860c77147 refs #5334 fix descriptor
gitea/salix/pipeline/head This commit looks good Details
26187898e1 refs #5334 popover
gitea/salix/pipeline/head This commit looks good Details
1dcaba1fdc refs #5334 department workers list
gitea/salix/pipeline/head This commit looks good Details
0fd7f4183e refs #5334 fk
gitea/salix/pipeline/head This commit looks good Details
0774a94d8b refs #5334 params
gitea/salix/pipeline/head This commit looks good Details
e38bf4f1b3 refs #5334 button delete, btn popover
gitea/salix/pipeline/head This commit looks good Details
d1a61b3e0d refs #5334 dinamic
gitea/salix/pipeline/head This commit looks good Details
eb6953a2b6 refs #5334 department
gitea/salix/pipeline/head This commit looks good Details
4c7c7f5c96 refs #5334 mod search-panel
gitea/salix/pipeline/head This commit looks good Details
f37c66304f refs #5334 change info
gitea/salix/pipeline/head This commit looks good Details
bb5247c49b refs #5334 tree
gitea/salix/pipeline/head There was a failure building this commit Details
04780e211d refs #5334 test front & 1/2 back
gitea/salix/pipeline/head This commit looks good Details
1095a59954 refs #5334 rest back, e2e summary, less e2e basic
gitea/salix/pipeline/head There was a failure building this commit Details
5798b28c5e refs #5334 baicData e2e
gitea/salix/pipeline/head There was a failure building this commit Details
9ef51f5600 remove fdescribe puppeter
gitea/salix/pipeline/head There was a failure building this commit Details
c1cda1a3ff refs #5334 basicData e2e
gitea/salix/pipeline/head This commit looks good Details
2545a40087 Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
d6cde764d7 refs #5334 changelog
gitea/salix/pipeline/head There was a failure building this commit Details
3a5e591cf0 refs #5475 feat(signin): use twoFactor and passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
b96f0f22b5 refs #5475 feat(account_changePassword)
gitea/salix/pipeline/head There was a failure building this commit Details
cf01c8d46e refs #5475 feat(account_changePassword)
gitea/salix/pipeline/head There was a failure building this commit Details
ee1b901dea refs #5475 feat(account_changePassword): accessScope
gitea/salix/pipeline/head This commit looks good Details
d4cc9cf82a change log remove
gitea/salix/pipeline/head Build queued... Details
3701acd26e refs #5334 error getLeaves solve
gitea/salix/pipeline/head There was a failure building this commit Details
168e7f1929 changelog
gitea/salix/pipeline/head There was a failure building this commit Details
092471f74e refs #5475 feat(account_changePassword): accessScope and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
7f20973650 refs #5334 merge
gitea/salix/pipeline/head There was a failure building this commit Details
4537344790 merge
gitea/salix/pipeline/head This commit looks good Details
a155f846c2 refs #5334 fix ctx
gitea/salix/pipeline/head This commit looks good Details
c63df30e5c refs #5334 fix back
gitea/salix/pipeline/head This commit looks good Details
f0f8b112cd Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head There was a failure building this commit Details
a8fafacb82 refs #5475 send email force
gitea/salix/pipeline/head There was a failure building this commit Details
e741904250 refs #5347
gitea/salix/pipeline/head This commit looks good Details
2ddf8e5de6 Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head There was a failure building this commit Details
168d05a830 refs #5334 fix errors
gitea/salix/pipeline/head There was a failure building this commit Details
6ab431f8ef refs #5475 tests
gitea/salix/pipeline/head There was a failure building this commit Details
27946c0062 Refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
137e01e60c refs #5334 fix acl, filter
gitea/salix/pipeline/head This commit looks good Details
beb173f6ce refs #5334 quit e2e no necesario
gitea/salix/pipeline/head There was a failure building this commit Details
f6cc59eafb refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
f0fec2cdd6 refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
203e80afa8 refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
16af0c5d6c Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit Details
4b8b7a9d82 refs #5475 fix accessScope
gitea/salix/pipeline/head There was a failure building this commit Details
06437c9e80 refs #5334 remove other
gitea/salix/pipeline/head This commit looks good Details
89c25c07b6 refs #5475 fix e2e and back test
gitea/salix/pipeline/head This commit looks good Details
f02019d64d refs #5334 fix words
gitea/salix/pipeline/head There was a failure building this commit Details
bbc5ed2683 Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head This commit looks good Details
9dc52b6011 refs #5334 fix labels trad
gitea/salix/pipeline/head This commit looks good Details
bb4951bbc8 Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head There was a failure building this commit Details
be1c145d9a refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
b062cec747 refs #5475 fix setPassword options/cb
gitea/salix/pipeline/head This commit looks good Details
0441bc29b7 refs #5475 correct SQL folder
gitea/salix/pipeline/head This commit looks good Details
dc36c6fd9d refs #5334 basicData solve e2e
gitea/salix/pipeline/head This commit looks good Details
dc10c20fe3 refs #5334 email validate
gitea/salix/pipeline/head This commit looks good Details
5e68363312 refs #5334 onsearch postlink
gitea/salix/pipeline/head There was a failure building this commit Details
8ef6f0dd17 Merge branch 'dev' into 5347-clientCreateRefactor
gitea/salix/pipeline/head This commit looks good Details
983d028d06 refs #5334 popover y basic data
gitea/salix/pipeline/head This commit looks good Details
2ccf8d5197 refs #5347
gitea/salix/pipeline/head This commit looks good Details
5000e05e05 refs #5334 merge + e2e solve
gitea/salix/pipeline/head This commit looks good Details
089f1e48ac Merge pull request '5347-clientCreateRefactor' (!1644) from 5347-clientCreateRefactor into dev 
Reviewed-on: #1644
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
59ad603de6 refs #5816 set version
gitea/salix/pipeline/head This commit looks good Details
6530e87508 refs #4614 feat(ticket): prevent invoice without weight
gitea/salix/pipeline/head This commit looks good Details
83467c3b6c refs #5334 quit es
gitea/salix/pipeline/head This commit looks good Details
9c9b53917a refs #5334 fix error
gitea/salix/pipeline/head This commit looks good Details
a7ad947168 Merge pull request '5334-editDepartment' (!1521) from 5334-editDepartment into dev 
Reviewed-on: #1521
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
48951cc5a1 Merge pull request '5475 - Autenticación de doble factor por email' (!1429) from 5475-email_2fa into dev 
Reviewed-on: #1429
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
ea71e980cc refs #5970 add changelog
gitea/salix/pipeline/head This commit looks good Details
a665b6c060 refs #5970 fix sql
gitea/salix/pipeline/head This commit looks good Details
d9d4441d59 refs #5970 deploy: 233001 init
gitea/salix/pipeline/head This commit looks good Details
8fe9b387ce refs #4614 test: front and correct folder
gitea/salix/pipeline/head This commit looks good Details
d9a5868ce4 refs #5930 fix(claim_updateClaim) options
gitea/salix/pipeline/head There was a failure building this commit Details
8922d27f20 refs #4614 fix e2e
gitea/salix/pipeline/head This commit looks good Details
5e6d941f36 Merge branch 'dev' into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good Details
60f70ac2b4 Merge pull request 'refs #4614 fear(ticket): add 'set weight' funcionality' (!1487) from 4614-ticket_weight into dev 
Reviewed-on: #1487
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
a831a1534b Merge branch 'dev' into 4770-routes_roadmap2
vicent requested review from jgallego 2023-07-11 11:51:23 +00:00
jgallego approved these changes 2023-07-11 12:02:13 +00:00
vicent added 24 commits 2023-07-13 07:42:21 +00:00
gitea/salix/pipeline/head This commit looks good Details
7030be3efa fix
gitea/salix/pipeline/head This commit looks good Details
6fa6c21cb1 remove fixtures
gitea/salix/pipeline/head This commit looks good Details
0afddb546b Merge pull request 'refs #5978 hotfix_workCenter' (!1650) from hotfix_workCenter into test 
Reviewed-on: #1650
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
9f2ef5c2c0 change ref master
gitea/salix/pipeline/head This commit looks good Details
ce8927a714 Merge pull request 'change ref master' (!1653) from hotfix-extraCommunityEntryRef into master 
Reviewed-on: #1653
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
1bcd3039cd refs #5475 redesign 2FA email
gitea/salix/pipeline/head This commit looks good Details
43bf7ce707 Merge pull request 'refs #5475 redesign 2FA email' (!1657) from 5475_redesign_2FA_email into test 
Reviewed-on: #1657
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
6978339fd3 refs #5475 fix email translations
gitea/salix/pipeline/head This commit looks good Details
56247b5012 add acl
gitea/salix/pipeline/head This commit looks good Details
da13f0811c refs 5887 cambiado drop y create por create or replace
gitea/salix/pipeline/head This commit looks good Details
810021e23a Merge pull request 'refs #5874 feat: refactorizado proceso facturación' (!1658) from hotfix_makeInvoice-refactor into master 
Reviewed-on: #1658
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
e1f12bea02 a
gitea/salix/pipeline/head This commit looks good Details
5a5a1ed20b refs #5887 feat: addback test
gitea/salix/pipeline/head There was a failure building this commit Details
a215797390 tranalstion
gitea/salix/pipeline/head This commit looks good Details
808a9976ab refs #5887 fix: back etst
gitea/salix/pipeline/head This commit looks good Details
83698522ca Merge pull request '5887-mailAlias_refactor' (!1659) from 5887-mailAlias_refactor into master 
Reviewed-on: #1659
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
d7ac20dc6a hotFix(supplier): fix accessToken in before save
gitea/salix/pipeline/head There was a failure building this commit Details
219a4fbca9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
vicent added 1 commit 2023-07-13 08:18:29 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
392dc5060a refs #4770 delete test
vicent added 1 commit 2023-07-13 08:19:17 +00:00
gitea/salix/pipeline/head This commit looks good Details
c91db1b429 a
alexm approved these changes 2023-07-13 08:35:08 +00:00
vicent merged commit c88a753865 into dev 2023-07-13 08:35:48 +00:00
vicent deleted branch 4770-routes_roadmap2 2023-07-13 08:35:48 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
alexm
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1647
No description provided.
Delete Branch "4770-routes_roadmap2"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?