daniel
|
f954b92aae
|
fixed error in mr for WUX
|
2017-09-05 11:06:49 +02:00 |
|
daniel
|
d74a3f74b4
|
Merge branch 'develop' into 1056-pandora-wux-grid-server
|
2017-09-01 10:51:54 +02:00 |
Enrique Camargo
|
6b4a15534d
|
Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR'
# Conflicts:
# pandora_console/extras/mr/6.sql
|
2017-08-31 18:21:08 +02:00 |
|
Enrique Camargo
|
afd184f466
|
Update 6.sql
|
2017-08-31 17:58:34 +02:00 |
Arturo Gonzalez
|
2fe8849708
|
Added db changes to mr 6
|
2017-08-31 11:33:08 +02:00 |
|
daniel
|
b078d48918
|
fixed errors in wux
|
2017-08-30 09:47:57 +02:00 |
enriquecd
|
068be133ed
|
Add password reset table in MR - #1211
|
2017-08-28 12:22:59 +02:00 |
|
daniel
|
c29d8a4fdb
|
Revert "merge develop"
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
|
2017-08-23 09:35:17 +02:00 |
|
daniel
|
8232911713
|
merge develop
|
2017-08-22 18:39:34 +02:00 |
|
daniel
|
1d7d55a451
|
fixed errors in form wux
|
2017-08-09 13:27:51 +02:00 |
Daniel Maya
|
3ef3679f10
|
Fixed issue with cascade_protection_module
|
2017-08-08 10:38:30 +02:00 |
vanessa gil
|
7c94400e7b
|
MR
|
2017-03-22 10:29:10 +01:00 |
|
vanessa gil
|
0b564c2866
|
new file
|
2017-03-21 13:43:01 +01:00 |