prueba
prueba dos
prueba final
funk
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Adding feature to coloring and check syntaxis on trigger editor.
Adding codeMirror Editor to Trigger custom and Trigger copy options.
BUG10870 - "A better trigger editor is needed"
error: The current trigger editor has no syntax check
Sol: Using CodeMirror as well as XMl editor, will give trigger editor the feature that it needs. + removing auto tabs at code begin.
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Enter php-hint
BUG 10920 "Add subtitles inside a drop-down" SOLVED

- New feature, add subtitles inside a drop-down
- Solved problem, added grouping elements in DropDowns
- If a DropDown has enabled optgroup, an example with SQL would be the following:
    (SELECT 'optgroup1' AS UID, 'Users' AS NAME)
    UNION
    (SELECT USR.USR_UID AS UID, USR.USR_USERNAME AS NAME
     FROM   USERS AS USR
     WHERE  USR.USR_USERNAME <> '' AND USR.USR_USERNAME LIKE 'u%'
    )
    UNION
    (SELECT 'optgroup2' AS UID, 'Countries' AS NAME)
    UNION
    (SELECT COUNTRY.IC_UID AS UID, COUNTRY.IC_NAME AS NAME
     FROM   ISO_COUNTRY AS COUNTRY
     WHERE  COUNTRY.IC_NAME LIKE 'b%'
    )
* Available from version ProcessMaker-2.0.47 (2.5.1)