jennylee c90a99bb38 Merge remote branch 'upstream/master' ...

Conflicts:
	workflow/engine/methods/services/xpdl.php

2012-10-17 14:36:11 -04:00

..

bin

BUG 9814 Proposal pivot skin: UNDER CONSTRUCTION

2012-10-16 10:17:25 -04:00

classes

CODE STYLE removing the xpdl class and related files

2012-10-17 13:43:05 -04:00

config

BUG 5765 I add the triggers t process SOLVED

2012-10-16 00:29:52 -04:00

content

…

controllers

CODE STYLE removing the xpdl class and related files

2012-10-17 13:43:05 -04:00

data

BUG 5765 I add the triggers t process SOLVED

2012-10-16 00:29:52 -04:00

includes

…

js

BUG 5285 I add the height to panel the edit process

2012-10-11 16:40:09 -04:00

lib

BUG Rest generated php files has not descrive the data types of the fields

2012-10-08 19:16:42 -04:00

menus

…

methods

Merge remote branch 'upstream/master'

2012-10-17 14:36:11 -04:00

plugins

…

services/rest

BUG 5765 I add the triggers t process SOLVED

2012-10-16 00:29:52 -04:00

skinEngine

Merge pull request #776 from brayanpereyra/f5df808988df07410598e55384df5ec3971b74bf

2012-10-17 09:48:53 -07:00

templates

CODE STYLE removing the xpdl class and related files

2012-10-17 13:43:05 -04:00

test

…

xmlform

BUG 9877 PM table Dynaform Title size could grows up to infinite

2012-10-16 15:00:15 -04:00

gulliver-win.bat

…

PmBootstrap.php

…