rodrigo quelca f2d57db608 solve conflicts

2015-07-15 17:28:17 -04:00

..

actionsByEmail

…

additionalTables

…

admin

…

app

0016160: Cases Summary: La pantalla por defecto deberír More information SOLVED

2015-07-07 16:45:12 -04:00

appFolder

…

authSources

PM-2973: Fourth migration ldapAdvanced

2015-06-15 17:12:59 -04:00

cases

PM-3011, PM-3012, PM-3089 Zimbra issues SOLVED

2015-07-06 16:55:09 -04:00

dashboard

…

dbConnections

…

departments

…

designer

solve conflicts

2015-07-15 17:28:17 -04:00

dynaforms

…

emailServer

…

enterprise

0017583: Clicking on the folder icon with a plus sign for Enterprise Features causes an error SOLVED

2015-07-13 12:11:57 -04:00

events

…

groups

…

home

…

installer

…

javaBridgePM

…

ldapAdvanced

PM-2973: Fourth migration ldapAdvanced

2015-06-15 17:12:59 -04:00

login

…

mails

…

main

…

oauth2

PM-2876 0017471 Change text from "ProcessMaker Dev Tools/User Applications" to "User Applications" SOLVED

2015-06-19 15:07:50 -04:00

outputdocs

…

packCreator

…

pmTables

PM-803

2015-06-23 14:14:25 -04:00

processCategory

…

processes

PM-2913 "(Code Scanner) Designer>Import: La alerta..." SOLVED

2015-07-03 12:18:26 -04:00

reportTables

…

roles

PM-386 "En Firefox de un edit permissions..." SOLVED

2015-07-03 16:56:21 -04:00

services

…

setup

…

steps

…

strategicDashboard

2787

2015-07-13 11:56:59 -04:00

tools

…

tracker

…

triggers

…

users

…

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

…