Erik Amaru Ortiz 0f234df1db Merge branch 'master' of github.com:colosa/processmaker ...

Conflicts:
	workflow/engine/classes/model/Process.php

2014-01-23 21:26:44 -04:00

..

appFolder

…

authSources

…

cases

Merge pull request #2248 from norahmollo/BUG-13829

2014-01-23 10:36:57 -08:00

controls

…

dashboard

…

dbConnections

…

departments

…

dynaforms

BUG 13536 "Save as option inside a Dyanform is..." SOLVED

2013-12-03 10:23:19 -04:00

events

…

groups

…

inputdocs

…

install

…

login

Merge branch 'master' of github.com:colosa/processmaker

2014-01-23 21:26:44 -04:00

mails

…

messages

…

oauth2

Litle fix, adding user agent on curl call, for access token exchenge script.

2014-01-15 19:56:44 -04:00

outputdocs

…

patterns

…

processCategory

…

processes

BUG-FILES Upload files templates IMPROVEMENT

2013-12-19 15:55:17 -04:00

reports

…

reportTables

…

roles

…

services

…

setup

B-Fails importing plugins

2014-01-15 15:14:36 -04:00

steps

…

tasks

…

tools

Improvement list i18

2013-03-18 14:39:10 -04:00

tracker

Bug 8665 3K issue:

2013-04-29 16:48:29 -04:00

triggers

Validación de Trigger Wizard, Popup, Steps

2013-11-28 17:05:58 -04:00

users

Merge branch 'master' of github.com:colosa/processmaker

2013-12-11 19:04:25 -04:00