Dante 710297dfc4 Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 ...

Conflicts:
	workflow/engine/templates/strategicDashboard/formDashboard.js

2015-04-27 16:20:52 -04:00

..

actionsByEmail

…

additionalTables

…

admin

…

app

…

appFolder

…

authSources

…

cases

…

dashboard

…

dbConnections

…

departments

PM-2316

2015-04-24 14:34:06 -04:00

designer

PM-2167 and PM-2194 Add waiting/loading icon/gif when the process is being created or loaded.(fixed)

2015-04-23 15:43:51 -04:00

dynaforms

…

emailServer

…

enterprise

…

events

…

groups

PM-2316

2015-04-24 14:34:06 -04:00

home

…

installer

PM-2255 Error de escritura en el mensaje.

2015-04-22 10:29:24 -04:00

javaBridgePM

…

login

…

mails

…

main

…

oauth2

…

outputdocs

…

packCreator

…

pmTables

…

processCategory

…

processes

Merged in richardnoel/processmaker (pull request #2013)

2015-04-27 15:27:03 -04:00

reportTables

…

roles

…

services

…

setup

…

steps

…

strategicDashboard

Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2

2015-04-27 16:20:52 -04:00

tools

…

tracker

…

triggers

…

users

PM-2422 Cost by hour admite valores negativos

2015-04-23 14:30:51 -04:00

authListUsers.html

…

dummyTemplate.html

…

exception.tpl

…

filterform.html

…

form.html

…

grid_preview.html

…

grid_view.html

…

grid.html

…

image.php

…

index.html.tpl

…

paged-table.html

…

pagedTableLdap.html

…

popupMenu.html

…

publish-raw.php

…

publish-treeview.php

…

publish-twocolumns.php

…

publish.php

…

publishBlank.php

…

testAuthenticationSource.html

…

testAuthenticationUser.php

…

toolbar.html

…

tree.html

…

xmlform_preview.html

…

xmlform.html

…

xmlformScript.html

…

xmlmenu.html

…

xmlmenuDyn.html

…