tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-17 07:48:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
38,031 Commits 34 Branches 30 Tags
Commit Graph

5042 Commits

Author SHA1 Message Date
artica
ace916bc8e Updated version and build strings. 2021-06-10 17:12:11 +02:00
Marcos Alconada
665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Barbero Martin
9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
artica
5ad364cc4a Auto-updated build strings. 2021-06-10 01:00:20 +02:00
Daniel Rodriguez
4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Marcos Alconada
2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Barbero Martin
e54fde338d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-09 08:22:04 +02:00
artica
2953870e4f Auto-updated build strings. 2021-06-09 01:00:20 +02:00
Daniel Barbero Martin
df2f72cce3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-08 08:22:16 +02:00
artica
a63a4efb71 Auto-updated build strings. 2021-06-08 01:00:20 +02:00
Daniel Barbero Martin
8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
artica
bc6b4acd8b Auto-updated build strings. 2021-06-07 01:00:19 +02:00
artica
656105cdf0 Auto-updated build strings. 2021-06-06 01:00:14 +02:00
artica
2513693ada Auto-updated build strings. 2021-06-05 01:00:19 +02:00
Daniel Barbero Martin
ca59034cf3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-04 08:13:20 +02:00
artica
8976ec4b6e Auto-updated build strings. 2021-06-04 01:00:19 +02:00
Daniel Barbero Martin
030a4fed6a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-03 08:15:30 +02:00
artica
e1ae9d7908 Auto-updated build strings. 2021-06-03 01:00:17 +02:00
Daniel Barbero Martin
18f414ce5b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 08:09:32 +02:00
artica
2a5b5591a3 Auto-updated build strings. 2021-06-02 01:00:45 +02:00
Daniel Barbero Martin
ddc4b47d0b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-01 08:34:32 +02:00
artica
b0e3b0aa24 Auto-updated build strings. 2021-06-01 01:00:09 +02:00
Daniel Barbero Martin
33618af381 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-31 08:40:09 +02:00
artica
ff3eb72420 Auto-updated build strings. 2021-05-31 01:00:34 +02:00
artica
20d3399d39 Auto-updated build strings. 2021-05-30 01:00:20 +02:00
artica
ec8ffea249 Auto-updated build strings. 2021-05-29 01:00:10 +02:00
Daniel Barbero Martin
8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
artica
059b14dbf6 Auto-updated build strings. 2021-05-28 01:00:43 +02:00
Daniel Barbero Martin
a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
artica
9103f671e2 Auto-updated build strings. 2021-05-27 01:00:43 +02:00
Daniel Barbero Martin
d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
artica
22a9043378 Auto-updated build strings. 2021-05-26 01:00:45 +02:00
Daniel Barbero Martin
933f679d27 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-25 08:51:48 +02:00
artica
f3d6dafad2 Auto-updated build strings. 2021-05-25 01:00:38 +02:00
Daniel Barbero Martin
337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/ajax.php
	pandora_console/extras/delete_files/delete_files.txt
 2021-05-24 17:41:28 +02:00
artica
3388bfa699 Auto-updated build strings. 2021-05-24 01:00:35 +02:00
artica
5366b40ac3 Auto-updated build strings. 2021-05-23 01:00:27 +02:00
artica
01e811254e Auto-updated build strings. 2021-05-22 01:00:37 +02:00
Daniel Barbero Martin
5bc6fa9394 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-21 08:35:49 +02:00
artica
f86c1c50c6 Auto-updated build strings. 2021-05-21 01:01:12 +02:00
Daniel Barbero Martin
03e857ffc8 Wip command center 2021-05-20 17:36:01 +02:00
artica
63da7abe47 Auto-updated build strings. 2021-05-20 01:00:47 +02:00
Daniel Rodriguez
22fa755fc3 Merge branch 'ent-7527-problemas-pandora_revent' into 'develop' 
Fixed issues with https calls

Closes pandora_enterprise#7527

See merge request artica/pandorafms!4128
 2021-05-19 16:02:34 +00:00
José González
e0ec645613 Fixed issue with last hash symbol 2021-05-19 15:22:24 +02:00
José González
45b5ab4589 Added separator control 2021-05-19 12:40:06 +02:00
artica
f3eb560518 Auto-updated build strings. 2021-05-19 01:00:46 +02:00
José González
5342ae077c id_agent default value 2021-05-18 15:27:45 +02:00
José González
5cdc0b8a14 Code review 2021-05-18 10:52:39 +02:00
José González
be6269fc89 Code review 2021-05-18 10:25:45 +02:00
artica
739bc7ebd9 Auto-updated build strings. 2021-05-18 01:00:45 +02:00