rodrigo quelca f2d57db608 solve conflicts

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

..

actionsByEmail

Removing feature folder definitively. Core integration of the Actions By Email feature complete.

2015-03-13 12:42:51 -04:00

additionalTables

…

admin

PM-2694

2015-05-12 17:43:51 -04:00

app

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

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

appFolder

I reviewed the XSS - MEDIUM in 7 files

2015-03-16 15:24:35 -04:00

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

UPDATE autoResizeScreen Iframes

2015-05-06 18:36:33 -04:00

dbConnections

…

departments

PM-2316

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

designer

solve conflicts

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

dynaforms

…

emailServer

PM-2835 "Adicionar los siguientes features..." SOLVED

2015-06-01 14:15:53 -04:00

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

PM-2694

2015-05-12 17:43:51 -04:00

home

…

installer

PM-2255 Error de escritura en el mensaje.

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

javaBridgePM

…

ldapAdvanced

PM-2973: Fourth migration ldapAdvanced

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

login

I corrected some files

2015-03-11 12:07:16 -04:00

mails

PM-2211: I added new column Error_mail in Email's log

2015-04-20 16:24:01 -04:00

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

PM-2750

2015-05-19 11:16:24 -04:00

processes

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

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

reportTables

PM-2694

2015-05-12 17:43:51 -04:00

roles

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

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

services

PM-2691 "En Internet Explorer el contenido..." SOLVED

2015-05-14 17:06:56 -04:00

setup

PM-2694

2015-05-12 17:43:51 -04:00

steps

…

strategicDashboard

2787

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

tools

…

tracker

PM-2681 "Case Tracker: En Internet Explorer..." SOLVED

2015-05-14 15:35:23 -04:00

triggers

…

users

PM-2615

2015-06-10 15:53:18 -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

…