 Joan Sanchez
|
8a36e0913f
|
changed fixtures for dynamic holidays
gitea/salix/1924-worker_calendar_dynamic_holidays This commit looks good
Details
|
2020-01-03 08:43:03 +01:00 |
 Carlos Jimenez Ruiz
|
9c364fccb7
|
Merge branch '1964-client_balance' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-02 14:31:52 +00:00 |
Bernat Exposito Domenech
|
b1c23dfca4
|
delete console.log
gitea/salix/1964-client_balance This commit looks good
Details
|
2020-01-02 15:07:25 +01:00 |
|
Bernat Exposito Domenech
|
68f437071f
|
refactor client.balance
gitea/salix/1964-client_balance This commit looks good
Details
|
2020-01-02 14:44:51 +01:00 |
|
Carlos Jimenez Ruiz
|
8a38ca7055
|
Merge branch '1966-teamBoss_worker_time_control' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-02 11:20:39 +00:00 |
|
Joan Sanchez
|
7fb3f75808
|
changed comparator
gitea/salix/1966-teamBoss_worker_time_control This commit looks good
Details
|
2020-01-02 11:21:11 +01:00 |
|
Joan Sanchez
|
a5eb8e5315
|
extended worker contract ranges & fixed invoice
gitea/salix/dev There was a failure building this commit
Details
|
2020-01-02 11:10:26 +01:00 |
|
Carlos Jimenez Ruiz
|
c089e151e7
|
Merge branch '1967-worker_time_control_worked_hours' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-31 13:41:15 +00:00 |
|
Joan Sanchez
|
8f92abe49c
|
fixed procedure bug
gitea/salix/1967-worker_time_control_worked_hours This commit looks good
Details
|
2019-12-31 14:01:05 +01:00 |
|
Joan Sanchez
|
417642ac9e
|
updated UserPhone acl
gitea/salix/dev This commit looks good
Details
|
2019-12-31 11:07:46 +01:00 |
|
Joan Sanchez
|
e13d457389
|
Merge branch '1965-update_models' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-27 10:43:06 +00:00 |
|
Joan Sanchez
|
b4e7a1e3e0
|
Changed sepa-core title
gitea/salix/dev This commit looks good
Details
|
2019-12-27 10:29:20 +01:00 |
|
Joan Sanchez
|
4d6709712d
|
Merge branch '1958-send_chat_with_avatar' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-27 08:55:55 +00:00 |
|
Joan Sanchez
|
d880ca2427
|
changed param
gitea/salix/1958-send_chat_with_avatar This commit looks good
Details
|
2019-12-27 09:02:37 +01:00 |
|
Joan Sanchez
|
0ece53a35e
|
Send chat message with user avatar
gitea/salix/1958-send_chat_with_avatar This commit looks good
Details
|
2019-12-27 08:49:51 +01:00 |
|
Bernat Exposito Domenech
|
e9d3b14da7
|
refactor models component and componentType
gitea/salix/1965-update_models This commit looks good
Details
|
2019-12-27 08:01:53 +01:00 |
|
Carlos Jimenez Ruiz
|
e4279733f4
|
Merge branch '1945-item_type_category' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-26 12:59:33 +00:00 |
|
Joan Sanchez
|
195163c4f1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1945-item_type_category
gitea/salix/1945-item_type_category This commit looks good
Details
|
2019-12-26 13:30:57 +01:00 |
|
Joan Sanchez
|
b74de37c82
|
updated selectors
gitea/salix/dev This commit looks good
Details
|
2019-12-26 13:29:50 +01:00 |
|
Joan Sanchez
|
f2e9dbd597
|
added category name to item type autocompletes
gitea/salix/1945-item_type_category This commit looks good
Details
|
2019-12-26 11:27:44 +01:00 |
|
Joan Sanchez
|
fd594841d5
|
Merge branch '1955-client_index' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-26 08:16:08 +00:00 |
|
Carlos Jimenez Ruiz
|
c992cbc5c6
|
Merge branch '1935-ticket_create_auto_fill' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-26 08:14:22 +00:00 |
|
Joan Sanchez
|
0bfabeb32b
|
Merge branch '1949-show_specie_genus' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-26 08:11:07 +00:00 |
|
Joan Sanchez
|
fd8eeb626d
|
removed console.log
gitea/salix/1935-ticket_create_auto_fill This commit looks good
Details
|
2019-12-26 08:45:55 +01:00 |
|
Joan Sanchez
|
d2c5ab7297
|
trigger unit tests
gitea/salix/1949-show_specie_genus This commit looks good
Details
|
2019-12-26 08:43:34 +01:00 |
|
Joan Sanchez
|
c95c7192da
|
Added template to specie autocomplete
|
2019-12-26 08:21:08 +01:00 |
|
Bernat Exposito Domenech
|
0a37f3a1b2
|
update index filter
gitea/salix/1955-client_index This commit looks good
Details
|
2019-12-26 08:20:16 +01:00 |
|
Joan Sanchez
|
5273e90a30
|
Added params to ticket method & updated unit tests
gitea/salix/1935-ticket_create_auto_fill This commit looks good
Details
|
2019-12-26 07:12:34 +01:00 |
|
Joan Sanchez
|
d97a188b37
|
Merge branch '1932-delete_scheme_bs' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-26 06:07:37 +00:00 |
|
Bernat Exposito Domenech
|
0827b998a1
|
update structure sql
gitea/salix/1932-delete_scheme_bs This commit looks good
Details
|
2019-12-23 15:15:58 +01:00 |
|
Joan Sanchez
|
0799e58558
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-23 08:15:25 +01:00 |
|
Joan Sanchez
|
3d4fc9c18e
|
#1963 Entry & zone style changes
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-12-23 08:05:58 +01:00 |
 Juan Ferrer
|
c8e4615433
|
Merge branch 'test'
gitea/salix/master This commit looks good
Details
|
2019-12-22 15:12:57 +01:00 |
|
Joan Sanchez
|
994b87ef1d
|
Merge branch '1960-update_structure_db' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-20 13:24:47 +00:00 |
|
Bernat Exposito Domenech
|
e9d416671d
|
update fixtures and structure db
gitea/salix/1960-update_structure_db This commit looks good
Details
|
2019-12-20 13:51:04 +01:00 |
|
Joan Sanchez
|
ec1750476e
|
Fixed tags
gitea/salix/master This commit looks good
Details
|
2019-12-20 12:56:56 +01:00 |
|
Joan Sanchez
|
472352e24c
|
Merge branch '1915-claim_regularize_fk' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-20 10:05:38 +00:00 |
|
Joan Sanchez
|
72d591e143
|
sql changes
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
|
2019-12-20 10:59:17 +01:00 |
|
Joan Sanchez
|
b9415c0335
|
updated sql
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
|
2019-12-20 10:40:12 +01:00 |
|
Joan Sanchez
|
61408bdfd5
|
updated tests
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
|
2019-12-20 09:30:35 +01:00 |
|
Joan Sanchez
|
2330e9fb39
|
Merge branch '1897travel.index' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-20 07:52:28 +00:00 |
|
Joan Sanchez
|
28f5abe8bc
|
Merge branch '1937-workerDepartment' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-20 07:41:52 +00:00 |
|
Bernat Exposito Domenech
|
81bb9cfc88
|
refactor travel filter
gitea/salix/1897travel.index This commit looks good
Details
|
2019-12-20 08:39:34 +01:00 |
|
Bernat Exposito Domenech
|
9a6c8db140
|
focus on the dialog
gitea/salix/1937-workerDepartment This commit looks good
Details
|
2019-12-20 08:32:02 +01:00 |
|
Bernat Exposito Domenech
|
3d21539fb0
|
travel index filter
gitea/salix/1897travel.index This commit looks good
Details
|
2019-12-20 07:55:00 +01:00 |
|
Juan Ferrer
|
fce22f2e30
|
Jenkinsfile fixes
gitea/salix/test This commit looks good
Details
|
2019-12-19 16:23:59 +01:00 |
|
Juan Ferrer
|
00b103b389
|
Jenkinsfile fixes
gitea/salix/test There was a failure building this commit
Details
|
2019-12-19 16:16:54 +01:00 |
|
Juan Ferrer
|
5db65e188a
|
Jenkinsfile fixes
gitea/salix/test This commit looks good
Details
|
2019-12-19 16:11:56 +01:00 |
|
Juan Ferrer
|
1407b7b76f
|
Nginx config fixes
gitea/salix/test This commit looks good
Details
|
2019-12-19 15:45:19 +01:00 |
|
Joan Sanchez
|
688b68a18a
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-19 15:04:45 +01:00 |