Daniel Rojas ce0dae6a01 Merge branch 'master' of bitbucket.org:colosa/processmaker

2014-04-02 17:03:08 -04:00

..

bin

Add mafe-translation

2014-04-02 13:26:15 -04:00

classes

Merged in marcoAntonioNina/processmaker (pull request #357)

2014-04-02 14:26:25 -04:00

config

Merge remote-tracking branch 'upstream/master'

2014-04-02 09:34:54 -04:00

content

…

controllers

Refactoring of classes that where in workflow/engine/src , now all of them have a unique parent namespace \ProcessMaker

2014-04-02 16:51:28 -04:00

data

Merge remote-tracking branch 'upstream/master'

2014-04-02 09:34:54 -04:00

includes

…

js

Rename maborak concat funtion in Object.prototype to concatMaborak to avoid name conflicts

2014-02-26 15:42:12 -04:00

lib

…

menus

…

methods

adding validations while importing pm file

2014-04-02 11:14:40 -04:00

plugins

…

skinEngine

Merge remote-tracking branch 'upstream/master'

2014-04-02 09:34:54 -04:00

src

Merge branch 'master' of bitbucket.org:colosa/processmaker

2014-04-02 17:03:08 -04:00

templates

Merged in marcoAntonioNina/processmaker (pull request #357)

2014-04-02 14:26:25 -04:00

test

…

xmlform

Merge remote-tracking branch 'upstream/master'

2014-04-02 09:34:54 -04:00

gulliver-win.bat

…

PmBootstrap.php

…