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

2014-04-07 09:03:27 -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

Updating .po and .sql files for release 2.5.2

2013-11-28 15:54:38 -04:00

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

Updates on Oauth register method and New designer open action on process list

2013-11-06 10:10:36 -04:00

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-07 09:03:27 -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

…