artu30
|
faa353bc5c
|
Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev'
# Conflicts:
# pandora_console/include/help/clippy/extension_cron_send_email.php
|
2017-05-23 09:50:22 +02:00 |
enriquecd
|
57393eb9cf
|
Fix logout bad permission with myslq service stopped dialog - #825
|
2017-05-19 11:12:58 +02:00 |
|
Arturo Gonzalez
|
634db70812
|
Added second condirmation to user session
|
2017-05-08 12:11:51 +02:00 |
|
Arturo Gonzalez
|
dba263632b
|
Revert "Revert "Fixed license failure""
This reverts commit 55196854b0.
|
2017-05-05 12:26:34 +02:00 |
|
Arturo Gonzalez
|
55196854b0
|
Revert "Fixed license failure"
This reverts commit 14e7d4b448.
|
2017-05-05 12:21:58 +02:00 |
|
Arturo Gonzalez
|
830ad6fc90
|
Revert "Revert "Fixed license failure""
This reverts commit 2b72053992.
|
2017-05-05 12:17:25 +02:00 |
|
Arturo Gonzalez
|
2b72053992
|
Revert "Fixed license failure"
This reverts commit 14e7d4b448.
|
2017-05-05 12:14:17 +02:00 |
Daniel Maya
|
14e7d4b448
|
Fixed license failure
|
2017-04-27 10:49:54 +02:00 |
|
Arturo Gonzalez
|
5b015dbcb9
|
Added new icon to meta mail setup and change mail message
|
2017-04-20 16:11:45 +02:00 |
|
Arturo Gonzalez
|
14a3a79eb3
|
Changed cod type
|
2017-04-20 15:00:24 +02:00 |
|
Arturo Gonzalez
|
bfa3b43ee7
|
Added changes to reset password system
|
2017-04-20 12:36:33 +02:00 |
|
Arturo Gonzalez
|
a1f23af142
|
Added new setup menu to mail
|
2017-04-20 12:15:45 +02:00 |
|
Arturo Gonzalez
|
df80304a80
|
Move code to enterprise section
|
2017-04-20 11:36:40 +02:00 |
|
Arturo Gonzalez
|
e26dfcd466
|
Move code to enterprise section
|
2017-04-20 11:18:43 +02:00 |
|
Arturo Gonzalez
|
727bd095f5
|
Added function to reset password in node
|
2017-04-20 10:59:32 +02:00 |
|
Arturo Gonzalez
|
48f7fa50dd
|
Added error control and email handler
|
2017-04-19 16:04:24 +02:00 |
|
Arturo Gonzalez
|
7011eee871
|
Added a new page to reset password, for now without code, only visual page and error control
|
2017-04-19 13:26:20 +02:00 |
daniel
|
07e5274d0d
|
fixed error in login page errors and change icon pdf report
|
2017-03-22 15:26:54 +01:00 |
|
daniel
|
e888675766
|
fixed minor error
|
2017-03-16 18:43:07 +01:00 |
|
daniel
|
e252135979
|
merge develop
|
2017-03-15 17:09:40 +01:00 |
|
daniel
|
aec0d91109
|
login page new
|
2017-03-15 15:23:28 +01:00 |
|
daniel
|
a87839bd07
|
login page
|
2017-03-15 10:12:18 +01:00 |
|
artu30
|
7bca59dee1
|
Merge branch 'move_mr_to_um' into 'develop'
Move mr to um
See merge request !249
|
2017-03-13 16:45:54 +01:00 |
|
Arturo Gonzalez
|
44ac96ae5e
|
Added mr to um menu (online open and enterprise). Ticket #510
|
2017-03-13 15:52:30 +01:00 |
|
enriquecd
|
0094cfa9bf
|
Center alert modal window when is opened - #93
|
2017-03-13 13:25:16 +01:00 |
|
Arturo Gonzalez
|
46b008708c
|
Move mr to um section
|
2017-03-10 14:01:24 +01:00 |
m-lopez-f
|
8de4984faf
|
Fixed dialog of system warning alerts. Gitlab: #506
|
2017-03-09 15:40:59 +01:00 |
|
m-lopez-f
|
8a1bdf5017
|
Fixed problems with login that this user not have a administration permissions. Gitlab #323
|
2017-02-21 09:47:42 +01:00 |
|
Arturo Gonzalez
|
584427de06
|
Added changes to finish rr feature. Ticket #169
|
2017-02-14 09:36:11 +01:00 |
|
Arturo Gonzalez
|
5b7f4a5139
|
Merge branch 'develop' into feature/rolling_release
Conflicts:
pandora_console/general/header.php
pandora_console/include/functions.php
pandora_console/index.php
pandora_console/pandoradb_data.sql
|
2017-02-13 14:19:25 +01:00 |
|
Arturo Gonzalez
|
cafda2a116
|
Added new option to see the menu bar in classic mode. Ticket #234
|
2017-02-07 12:58:29 +01:00 |
|
daniel
|
543fd0c7ea
|
delete shortcut bar
|
2017-02-03 12:23:58 +01:00 |
|
daniel
|
1b26423867
|
Merge branch 'develop' into 135-informe-de-eventos-sale-agrupado-int-4330-open
|
2017-01-18 17:39:04 +01:00 |
|
m-lopez-f
|
12f28a00b2
|
Add logout from session if user have a not login active
|
2017-01-18 11:57:15 +01:00 |
|
daniel
|
993bad314d
|
fixed errors in events reports #135
|
2017-01-11 13:26:50 +01:00 |
|
m-lopez-f
|
3b0344298c
|
Revert "Fixed problems with double pandora in servers. Ticket: #3557"
This reverts commit e7021d8a0f.
|
2016-11-18 13:01:13 +01:00 |
|
m-lopez-f
|
e7021d8a0f
|
Fixed problems with double pandora in servers. Ticket: #3557
|
2016-11-07 09:12:58 +01:00 |
|
Arturo Gonzalez
|
63b19a6a54
|
Added new parameter to configure the saml path in authentication setup
|
2016-09-08 17:36:56 +02:00 |
|
m-lopez-f
|
14a627fc33
|
Only show error of licences if user is admin. Ticket: #3999
|
2016-09-06 16:05:24 +02:00 |
|
Arturo Gonzalez
|
902d0fac9a
|
Control PHP restrictions to minor release process.
|
2016-07-20 10:08:31 +02:00 |
|
Arturo Gonzalez
|
70c771013c
|
Fixed things in rolling release develop
|
2016-07-19 15:39:31 +02:00 |
|
Arturo Gonzalez
|
8c20874a88
|
Changed rolling release manager system.
|
2016-07-19 12:39:03 +02:00 |
|
Arturo Gonzalez
|
318ba4f049
|
Added some changes to SAML login system.
|
2016-07-13 15:33:43 +02:00 |
|
Daniel Maya
|
d6b614199a
|
Fixed path. Ticket #3364.
|
2016-06-27 11:56:39 +02:00 |
|
Daniel Maya
|
a75e416b8c
|
redirect mobile. Ticket #3364.
|
2016-06-27 11:13:34 +02:00 |
fermin831
|
d4795bc039
|
Login wizard may be displayed on enterprise version
(cherry picked from commit 08dacd5f43)
|
2016-06-21 12:01:57 +02:00 |
|
fermin831
|
e2fb16cf63
|
Added unmerged changes from identification wizard feature
|
2016-06-16 13:27:19 +02:00 |
|
fermin831
|
e8ce7e7a13
|
Changed Mail to XXX to Mail to Admin and email is retrieved from initial wizard
|
2016-06-16 13:13:23 +02:00 |
|
fermin831
|
d5cad00655
|
Added language and fixed last_um_check functionality
|
2016-06-16 13:11:04 +02:00 |
|
fermin831
|
7717d633fd
|
Fixed download messages for first time
|
2016-06-16 13:10:47 +02:00 |