tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,685 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

226 Commits

Author SHA1 Message Date
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
fbsanchez e66f33fd37 WIP Cluster references updated 2020-05-22 12:14:01 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
marcos 2d48c67377 add modal on Webchat 2020-04-28 13:56:43 +02:00
marcos bcc68c0034 add modal on Webchat 2020-04-28 13:42:27 +02:00
alejandro-campos 60c766ca29 minor visual changes on user notifications editor 2020-04-02 10:37:59 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Alejandro Fraguas 45c57abb70 Merge branch 'ent-4883-Mensaje-erroneo-WebChat' into 'develop' 
Ent 4883 mensaje erroneo web chat

See merge request artica/pandorafms!2856
 2019-12-23 17:45:25 +01:00
marcos 0490024abc add sap view to autorefresh edit my user 2019-11-25 15:01:27 +01:00
Tatiana Llorente e94d8726c7 Changed date in webchat 2019-11-04 13:59:30 +01:00
Alejandro Fraguas ca5a31db6a Merge branch 'ent-3830-autorrefresh-en-mapas-gis' into 'develop' 
add gis maps to autorefresh list

See merge request artica/pandorafms!2731
 2019-10-15 13:21:19 +02:00
marcos.alconada 53850a8c1f add gis maps to autorefresh list 2019-09-16 15:51:04 +02:00
marcos.alconada 2538504036 chaged hint from home screen 2019-09-04 16:05:10 +02:00
Daniel Rodriguez f08b5204c7 Merge branch 'ent-3673-bug-webchat-consola' into 'develop' 
Modified jquery window function

See merge request artica/pandorafms!2550
 2019-07-18 12:50:56 +02:00
Jose Gonzalez b7c662d3f9 Added session control for unexpected or forced logouts 2019-07-16 17:55:44 +02:00
Daniel Barbero Martin bd070b706b fixed minor error 2019-07-11 12:45:52 +02:00
Tatiana Llorente 52f391667a Style changes - #4250 2019-06-28 10:24:53 +02:00
Jose Gonzalez 0e1ad43422 Update webchat.php. Forgotten console log 2019-06-27 09:33:31 +02:00
Jose Gonzalez 77419ee709 Modified jquery window function 2019-06-27 09:05:22 +02:00
Luis Calvo cdbd5b3487 Fixed bug in meta user_edir form url 2019-05-30 17:23:32 +02:00
fbsanchez 5131c24772 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 12:24:28 +02:00
Luis Calvo 77dbb53db4 Fixed minor bug 2019-05-28 18:03:40 +02:00
Luis Calvo 6fdd88ab65 Fixed errors on eHorus user level conf 2019-05-28 17:19:13 +02:00
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
Luis Calvo 588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
fbsanchez 4400d9303f subscription manager udp 2019-05-23 19:22:05 +02:00
fbsanchez 211b05c9d6 minor fix in newsletter logic 2019-05-23 18:59:38 +02:00
fbsanchez 058c9d3806 Newsletter reminder settings ent 2019-05-23 18:54:04 +02:00
Alejandro Fraguas 88234503c0 Merge branch 'ent-4078-7999-Error-al-actualizar-los-cambios-en-la-vista-de-usuario' into 'develop' 
Fixed url in user_edit

See merge request artica/pandorafms!2436
 2019-05-22 14:14:15 +02:00
Daniel Maya edbde3fecb Fixed url in user_edit 2019-05-21 17:14:29 +02:00
Luis Calvo a0faffe161 Form eHorus user login with title 
Former-commit-id: 7b55f446802bb9c24602d2e626789a3365599835
 2019-05-16 18:59:17 +02:00
Luis Calvo ce34adb9d8 Fixed errors and corrected style 
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
 2019-05-13 17:28:23 +02:00
Luis Calvo c527435a0e eHorus user-login settings 
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
 2019-05-10 15:32:25 +02:00
Luis Calvo ecce1160e1 Added button to select ehorus conf type and box into user conf 2019-05-09 19:23:18 +02:00
Daniel Barbero Martin ac41e9255f helpers 
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
 2019-04-24 13:53:18 +02:00
Alejandro Fraguas 6594095de7 Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop' 
Ent 3707 nuevo diseño para las tablas

See merge request artica/pandorafms!2352

Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
 2019-04-17 10:19:42 +02:00
Daniel Barbero Martin 26d5060232 fixed errors css 
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
 2019-04-12 10:10:04 +02:00
Tatiana Llorente 59c2734b5a Deleted old files. Centered the map. Fixed broken image in meta. - #3806 
Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7
 2019-04-12 09:20:55 +02:00
Daniel Barbero Martin 0769c61b19 add map user edit 
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
 2019-04-09 18:18:10 +02:00
Tatiana Llorente aa640efc44 Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas 
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
 2019-04-05 13:19:42 +02:00
Daniel Maya faecabb1cc Fixed problem with openlayer 
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
 2019-04-03 12:54:36 +02:00
Tatiana Llorente 26451c41a1 New design for the tables - #3707 
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
 2019-03-29 11:05:52 +01:00
Tatiana Llorente c942242652 Changed map image size 
Former-commit-id: 8e3757addb1c81bc4a5cdcff0fb45e396626d6b8
 2019-03-25 17:59:02 +01:00
Tatiana Llorente 45c7bea6e6 Fixed a bug: show map image alternative when offline 
Former-commit-id: 9d3945a8fdff7c6c09db043037ae779b1b3ebecd
 2019-03-22 10:57:22 +01:00
Tatiana Llorente 151fe6ac78 Fixed a bug: show map image alternative when offline 
Former-commit-id: f800226594a46447c031e2e9273d33a04f86a810
 2019-03-21 18:13:21 +01:00
Tatiana Llorente b8f1b5f6a1 Fixed a bug: show popup double authentication 
Former-commit-id: a5a7d6f2cf2f3b90a277ccf9f4f042c1ab3be48d
 2019-03-21 15:58:10 +01:00
Tatiana Llorente 5d409cd778 New view user edit 
Former-commit-id: 551c2036cd69e34c66e12a8cbcef3345fbf3919a
 2019-03-20 16:45:24 +01:00
Tatiana Llorente a99c8b1a7b New view user edit 
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
 2019-03-20 13:26:15 +01:00