Commit Graph

4982 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 2ba91a6cc2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-05 13:20:47 +02:00
Carlos Jimenez Ruiz 837a7b08cc #1300-1301 client.risk 2019-04-05 13:20:34 +02:00
Gerard ebe269f41e #1249 ticket.invoice
gitea/salix/dev This commit looks good Details
2019-04-05 12:24:39 +02:00
Gerard 5ae58f1d70 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-05 09:27:58 +02:00
Gerard d7c063f389 removed unused binding 2019-04-05 09:27:43 +02:00
Bernat ad830e52fc update structure db from production
gitea/salix/dev This commit looks good Details
2019-04-05 09:20:22 +02:00
Gerard 05b23127b4 Merge branch 'master' into dev
gitea/salix/dev This commit looks good Details
2019-04-05 08:25:21 +02:00
Joan Sanchez b4f9b2fc3b loggable not saving id fixed
gitea/salix/master This commit looks good Details
2019-04-05 08:23:16 +02:00
Carlos Jimenez Ruiz 4a3c4aefa0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-05 08:06:12 +02:00
Carlos Jimenez Ruiz 96ef293151 e2e fixes for input number 2019-04-05 08:06:03 +02:00
Gerard 00b7442b89 #1247 reparar tests excluidos
gitea/salix/dev This commit looks good Details
2019-04-05 07:52:08 +02:00
Gerard cfdeb387a1 #1241 routes.tickets
gitea/salix/dev This commit looks good Details
2019-04-04 13:06:41 +02:00
Gerard 93bca3b3f0 merge master
gitea/salix/dev This commit looks good Details
2019-04-04 12:47:02 +02:00
Gerard 4861b789f7 Loggable now inserts the correct values for FK values
gitea/salix/master This commit looks good Details
2019-04-04 12:38:54 +02:00
Gerard d1a179c1c3 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-04-04 12:09:57 +02:00
Gerard 9abaa8ce51 bug sending messages to buyers fixed
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-04-04 12:05:01 +02:00
Joan Sanchez c4c5c67b18 Merge branch 'master' into dev
gitea/salix/dev This commit looks good Details
2019-04-04 11:54:25 +02:00
Joan Sanchez bb039386f2 fixed input focus #1302
gitea/salix/master This commit looks good Details
2019-04-04 11:53:13 +02:00
Bernat eaa3a36fde update fixtures and structure
gitea/salix/dev This commit looks good Details
2019-04-04 09:02:39 +02:00
Carlos Jimenez Ruiz 11c6939ad4 traduccion de invoice out
gitea/salix/dev There was a failure building this commit Details
2019-04-03 15:32:21 +02:00
Carlos Jimenez Ruiz 09288c2c12 merge 2019-04-03 15:19:05 +02:00
Carlos Jimenez Ruiz 971a2ab891 #1270
ticket.index advanced search mostrar dias en el futuro
2019-04-03 15:16:32 +02:00
Joan Sanchez 063360d645 fixed uvc throwing error #1280
gitea/salix/dev This commit looks good Details
2019-04-03 14:21:57 +02:00
Joan Sanchez afafbdda95 fixed back unit test
gitea/salix/dev This commit looks good Details
2019-04-03 14:04:25 +02:00
Joan Sanchez 4ecc1f445a added filter from-to on routes index #1296
gitea/salix/dev This commit has test failures Details
2019-04-03 13:51:14 +02:00
Juan Ferrer eab2a29cb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-04-03 13:40:35 +02:00
Juan Ferrer b7092d97d3 DB versioning fixes 2019-04-03 13:39:35 +02:00
Joan Sanchez ccb2505896 Merge branch 'master' into dev
gitea/salix/dev There was a failure building this commit Details
2019-04-03 12:58:59 +02:00
Joan Sanchez eea4f53151 removed field acl for buyer on item tags
gitea/salix/master This commit looks good Details
2019-04-03 12:58:30 +02:00
Joan Sanchez dcf16e19fc fixed fonts
gitea/salix/dev This commit has test failures Details
2019-04-03 12:51:49 +02:00
Joan Sanchez 0a0aa3853a Merge branch 'master' into dev
gitea/salix/dev This commit has test failures Details
2019-04-03 12:48:21 +02:00
Joan Sanchez 1e99a890e2 allow item tags for accessory role
gitea/salix/master This commit looks good Details
2019-04-03 12:47:51 +02:00
Joan Sanchez f8035c9777 fixed calendar front unit tests
gitea/salix/dev This commit has test failures Details
2019-04-03 12:39:24 +02:00
Joan Sanchez d407fc7803 fixed calendar month name display
gitea/salix/dev There was a failure building this commit Details
2019-04-03 12:29:23 +02:00
Joan Sanchez 3a19141d58 added smsConfig fixture
gitea/salix/dev There was a failure building this commit Details
2019-04-03 12:27:08 +02:00
Juan Ferrer 4847c6552b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-04-03 12:09:56 +02:00
Juan Ferrer a12ef2c290 DB versioning fixes 2019-04-03 12:09:45 +02:00
Joan Sanchez e433828f7c Merge branch 'master' into dev
gitea/salix/dev There was a failure building this commit Details
2019-04-03 11:55:18 +02:00
Joan Sanchez 892e267a16 fixed worker calendar total holidays #1299
gitea/salix/master This commit looks good Details
2019-04-03 11:36:10 +02:00
Joan Sanchez 16afe0e529 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-04-03 11:35:11 +02:00
Joan Sanchez f337799e39 tests & refactor calendar component #811 2019-04-03 11:34:58 +02:00
Juan Ferrer 479b4c68c8 DB versioning fixes
gitea/salix/dev This commit looks good Details
2019-04-03 11:21:54 +02:00
Juan Ferrer 836f210f6c DB versioning code refactor
gitea/salix/dev This commit looks good Details
2019-04-03 11:02:19 +02:00
Juan Ferrer 13ca2f7e52 DB versioning
gitea/salix/dev This commit looks good Details
2019-04-03 10:29:05 +02:00
Gerard a23c636c16 #1279 loggable rawSql
gitea/salix/dev This commit looks good Details
2019-04-02 14:36:49 +02:00
Carlos Jimenez Ruiz 287e4048e2 #1192 ticket.stepone en movil no muestra dropdown
gitea/salix/dev This commit looks good Details
2019-04-02 14:18:11 +02:00
Carlos Jimenez Ruiz b86c1afa79 re-activated preview on invoiceout index
gitea/salix/dev This commit looks good Details
2019-04-02 12:32:15 +02:00
Carlos Jimenez Ruiz 0334b8f24e moved sql only local files outside of changes 2019-04-02 12:32:09 +02:00
Joan Sanchez 377f38b10d moved procedures to only-local
gitea/salix/dev This commit looks good Details
2019-04-02 11:40:18 +02:00
Carlos Jimenez Ruiz 23bb644812 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-02 11:10:16 +02:00