Commit Graph

2032 Commits

Author SHA1 Message Date
artica 3916bcf636 Auto-updated build strings.
Former-commit-id: f5e0b2e0c54dddef282d78ddc279d689b1bf4a45
2019-03-25 00:01:22 +01:00
artica 0e51cd0760 Auto-updated build strings.
Former-commit-id: 54f84af77a2fdaaa8a11cef36b5ff91d614d2219
2019-03-24 00:01:23 +01:00
artica 9efd962867 Auto-updated build strings.
Former-commit-id: 37089ebb5e845ab42d62cb476e1cdc5d723904bb
2019-03-23 00:01:24 +01:00
artica cb8cd37ee7 Auto-updated build strings.
Former-commit-id: 0224100a1d5a485cd88ebbfdef94e84904e248b9
2019-03-22 00:01:32 +01:00
artica dfadf48b4e Auto-updated build strings.
Former-commit-id: 1a3a90e08e144bc8eea361bef1a69cd14d8f4830
2019-03-21 00:02:00 +01:00
artica c598eb60fb Auto-updated build strings.
Former-commit-id: 35d392b59c07d74a3a8fb8f9291b8835a669c0f2
2019-03-20 00:01:24 +01:00
artica 392c0d0bff Auto-updated build strings.
Former-commit-id: 143536a35d2458e1a118a4772803afd4a075a26f
2019-03-19 00:01:25 +01:00
fermin831 2be3333d29 Update version script cannot delete initial whitespaces in install.php
Former-commit-id: e0b973605efb316ca73fad0a5cfeded2bffe149d
2019-03-18 11:18:55 +01:00
artica 4772f84850 Auto-updated build strings.
Former-commit-id: d3bb4e970fb058410a3f4889b4706f4a79aef09c
2019-03-18 00:01:24 +01:00
artica 093404eedc Auto-updated build strings.
Former-commit-id: d2bb79b1e176c0047307b57816022ab1834c7da0
2019-03-17 00:01:29 +01:00
artica 16d5bf5f66 Auto-updated build strings.
Former-commit-id: 34092826c1d38aedddf8c660c527ebcec3816c18
2019-03-16 00:01:30 +01:00
artica be08d76e6c Auto-updated build strings.
Former-commit-id: b661529d620964e946ecb4973030f2518f332458
2019-03-15 00:01:22 +01:00
artica 0ccbb1198a Auto-updated build strings.
Former-commit-id: 9f80809f181718d9c5fe97439b4d23c856bf9c93
2019-03-14 00:01:25 +01:00
artica 99afea22cb Auto-updated build strings.
Former-commit-id: 9d92b8845f144366f2d7ed521fefbea0ce7e8eac
2019-03-13 00:01:24 +01:00
daniel 15ca89068d Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7
Conflicts:
	pandora_console/godmode/servers/manage_recontask_form.php
	pandora_console/include/functions_events.php


Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
2019-03-12 13:07:12 +01:00
artica 67080c72d9 Auto-updated build strings.
Former-commit-id: d5c1d195e9648fa5b091c533b57a6e234275787c
2019-03-12 00:01:23 +01:00
manuel 1acde54a3f Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
Conflicts:
pandora_console/install.php


Former-commit-id: 89c947d8a835c4a63a8f9a91df5542a3fbc230d9
2019-03-11 09:46:59 +01:00
artica 0210c2381d Auto-updated build strings.
Former-commit-id: 7f83037f89edf17156828a793fa1ae3a5920d818
2019-03-11 00:01:58 +01:00
artica b79815bb06 Auto-updated build strings.
Former-commit-id: e002aa51a4e0ad634ed459dcccd4444cb1d0081c
2019-03-10 00:01:25 +01:00
artica fd68b49710 Auto-updated build strings.
Former-commit-id: 6b07eeeea7577d37282399b23c8b409ab7253507
2019-03-09 00:01:32 +01:00
artica e43d1aa356 Auto-updated build strings.
Former-commit-id: d9a712a382713bbbbb82849a2be70991acd7e72f
2019-03-08 00:01:31 +01:00
manuel 1020ec1bd7 Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
Conflicts:
pandora_console/godmode/setup/setup_visuals.php


Former-commit-id: c193f6995a3a4115270cf45d635e310bf0f8cd3a
2019-03-07 13:45:56 +01:00
artica 4eb6c16339 Auto-updated build strings.
Former-commit-id: 4c22b36dac2410ec75f5cae1c0e6ec7b81e5d78f
2019-03-07 00:01:27 +01:00
artica 88f1f16a5a Auto-updated build strings.
Former-commit-id: 4e42c790d0cc4e621a9cd231c77b3d04fc8443c4
2019-03-06 00:01:33 +01:00
artica 930c527ad2 Auto-updated build strings.
Former-commit-id: 2bf7188690fce3ac4ff2b8d124b552f6a6f7d608
2019-03-05 00:01:26 +01:00
artica 3ed6a2b089 Auto-updated build strings.
Former-commit-id: d8e95284d6eded43b5d1af26b172a034a06d3bed
2019-03-04 00:01:22 +01:00
artica 62c7e8dffc Auto-updated build strings.
Former-commit-id: dd2dc5dcc124d58611076b2e38dd65a596c23f3b
2019-03-03 00:01:24 +01:00
artica b194d439d2 Auto-updated build strings.
Former-commit-id: 8081bea8a9b82eca462bc1ae7b600162a08faea6
2019-03-02 00:01:29 +01:00
artica 8fc432b934 Auto-updated build strings.
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
2019-03-01 00:01:32 +01:00
manuel 46089b31a8 Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
Conflicts:
pandora_console/install.php


Former-commit-id: 3dee86da8f6b6b1c2caa5e6e1529acd7f60c1433
2019-02-28 13:36:18 +01:00
artica a8a9a9d620 Auto-updated build strings.
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
2019-02-28 00:01:32 +01:00
artica 26560c734c Updated version and build strings.
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
2019-02-27 11:25:50 +01:00
samucarc 9f92f3f010 Fixed
Former-commit-id: 4fc7d9a22dd2a59501cd7ffc7539c431d37512a8
2019-02-27 10:35:40 +01:00
samucarc 8f24c0cb18 Fixed conflict in CLI apply_policy
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
2019-02-27 10:28:36 +01:00
artica 65b89f6688 Auto-updated build strings.
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
2019-02-27 00:01:47 +01:00
manuel c886dd1dfa Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php


Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
2019-02-26 12:31:37 +01:00
manuel 875d7ecaba Unified sizes of the checkbox switch
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
2019-02-26 12:04:18 +01:00
artica 88202977fa Auto-updated build strings.
Former-commit-id: e3e3a3aba908a64a4743bd8b18337510e0c6e609
2019-02-26 00:01:57 +01:00
fbsanchez 510833eaf1 Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
Former-commit-id: 418593106602da6aa270905e478e25b50a8f5ebd
2019-02-25 10:47:46 +01:00
artica 9753faa17a Auto-updated build strings.
Former-commit-id: 01fee147745dfd638487449f20211abd8e83b71e
2019-02-25 00:01:36 +01:00
artica a49f68e96b Auto-updated build strings.
Former-commit-id: ee007a4042fe893b73e088abd7a7b6cd0bdc45d2
2019-02-24 00:01:50 +01:00
artica febe2cc3a6 Auto-updated build strings.
Former-commit-id: 4f687af81ee7ab9541649e5f395c2e2aaf359609
2019-02-23 00:02:37 +01:00
fbsanchez b1aa0fe2f2 Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
artica b1149a053b Auto-updated build strings.
Former-commit-id: f642e8fe029c7df7a017abe433d7768acd8577fd
2019-02-22 00:01:38 +01:00
artica 1156b29743 Auto-updated build strings.
Former-commit-id: f760ca3d8b53ad47017d82e6bc2fbb298a69312b
2019-02-21 00:01:55 +01:00
artica 53a41a7a56 Auto-updated build strings.
Former-commit-id: f44eb5d91d85be5ebfaf5fe25cea0fdb40b874f3
2019-02-20 00:01:26 +01:00
artica 2b3a72e938 Auto-updated build strings.
Former-commit-id: cf3f4af9caa5c9c435adf672e8c620b4b173f3cc
2019-02-19 00:01:28 +01:00
daniel 5411b83ceb Merge remote-tracking branch 'origin/develop' into 3404-Mejoras_y_arreglos_en_la_instalación_de_la_consola
Conflicts:
	pandora_console/install.php


Former-commit-id: 9d1616cab554029cb90f7c0e89276124589e2867
2019-02-18 16:55:09 +01:00
Tatiana Llorente 582b8a70da Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
Conflicts:
	pandora_console/install.php


Former-commit-id: 0c97025f2425b1048efd1447a56ea9e2062b3b13
2019-02-18 09:22:48 +01:00
artica 0ef118f401 Auto-updated build strings.
Former-commit-id: 2e217d82f2119ffdca6218a233fa8eeb743c3fb0
2019-02-18 00:01:24 +01:00