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

274 Commits

Author SHA1 Message Date
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
fermin831 55db630b36 Removed some unwanted traces 2016-06-16 13:09:25 +02:00
fermin831 92563961a9 Added um messages pop-up and fixed popup order 
Conflicts:
	pandora_console/index.php
 2016-06-16 13:09:09 +02:00
fermin831 fcafb16648 Added connection with update manager and some design changes 
Conflicts:
	pandora_console/index.php
 2016-06-16 13:02:29 +02:00
fermin831 dbde4ffc43 Added dummy and undesigned identification wizard 
Conflicts:
	pandora_console/godmode/update_manager/update_manager.setup.php
	pandora_console/include/functions_config.php
	pandora_console/index.php
 2016-06-16 12:59:11 +02:00
Arturo Gonzalez 9bc9bb9cc3 Saml login. Added restiction to admin users and saml button 2016-06-03 12:48:04 +02:00
Arturo Gonzalez b706e92b34 Rolling release in progress... (Fixed an important thing) 2016-06-01 15:26:19 +02:00
Arturo Gonzalez 0618dbbab3 Rolling release in progress... (Added minor releases) 2016-06-01 14:43:31 +02:00
Arturo Gonzalez c0ccd438a9 Saml login fixed 
(cherry picked from commit 02344033f3)
 2016-05-26 16:42:35 +02:00
Arturo Gonzalez 5fb6c1cbcd Fixed some errors in saml login system 2016-04-28 12:39:27 +02:00
Arturo Gonzalez 497e56510a Fixed error when log in as admin with saml login method. 2016-04-06 11:07:26 +02:00
Arturo Gonzalez e9eb16a848 Some changes in saml login system. 2016-02-18 12:29:50 +01:00
Arturo Gonzalez a3a38c9bb6 New login method (saml). Ticket#3393 2016-02-17 13:05:22 +01:00
KIKUCHI Koichiro 0038e7c6e6 Use relative path for renaming install.php 2015-11-13 11:17:47 +09:00
m-lopez-f 7ca6cff969 Fixed problems with view godmode extensions. Tiquet: #2912 2015-10-20 09:42:34 +02:00
m-lopez-f 256da3bc3d Add new functions from acl enterprise menu 2015-10-19 15:08:44 +02:00
Arturo Gonzalez Diaz 5230a9eaa6 Now with the installer 'install.php', in the final step, you can choose if rename the file 'install.php'. Ticket #2539 2015-07-27 18:31:55 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
Ramon Novoa c32c167b6e Ask for the old password before letting a user renew his password. 
(cherry picked from commit 0840c20764)
 2015-05-19 11:38:30 +02:00