Gustavo Cruz
f55ff5bdae
Automatic merge with the upstream master branch
2012-11-29 12:18:58 -04:00
user
0cc58c934b
Merge remote-tracking branch 'upstream/master'
2012-11-29 11:06:30 -04:00
norahmollo
f89014c14a
WYSIWYG EDITOR changes
...
WYSIWYG EDITOR changes
2012-11-29 14:50:22 +00:00
user
f84505750c
The variable picker in the event section is now the same as the rest of ProcessMaker
2012-11-28 17:43:19 -04:00
julceslauhub
a561214aec
Merge pull request #1011 from julceslauhub/master
...
Improvement to avoid the old queries for get the cases list
2012-11-28 13:35:06 -08:00
Julio Cesar Laura
0055a303fa
Improvement to avoid the old queries for get the cases list
2012-11-28 17:32:31 -04:00
norahmollo
dc2c19f288
WYSIWYG EDITOR resize popup Variable Picker
...
WYSIWYG EDITOR Variable Picker
2012-11-28 21:20:41 +00:00
julceslauhub
a6f0e664f1
Merge pull request #1010 from julceslauhub/master
...
Changed references to deprecated file "cases_List"
2012-11-28 11:59:25 -08:00
Julio Cesar Laura
4cdbd2668a
Changed references to deprecated file "cases_List"
2012-11-28 15:57:55 -04:00
julceslauhub
5cd3e24e4b
Merge pull request #1009 from marcoAntonioNina/BUG-10110
...
BUG 10110 Añadir modulo de logs para envio de correos electronicos SOLVED
2012-11-28 10:56:24 -08:00
Marco Antonio Nina
9e40d41b67
BUG 10110 Añr modulo de logs para envio de correos electronicos SOLVED
...
- According to the specifications.
- Was add the the list of emails.
2012-11-28 14:50:36 -04:00
Marco Antonio Nina
43c320d7fd
BUG 10110 Añr modulo de logs para envio de correos electronicos SOLVED
...
- According to the specifications.
- Was add the the list of emails.Merge remote branch 'origin/BUG-10110' into BUG-10110
Conflicts:
workflow/engine/templates/mails/emailList.js
2012-11-28 14:43:59 -04:00
Marco Antonio Nina
f26704e315
BUG 10110 Añr modulo de logs para envio de correos electronicos SOLVED
...
- According to the specifications.
- Was add the the list of emails.
2012-11-28 14:30:12 -04:00
julceslauhub
f5f13d83a9
Merge pull request #1006 from julceslauhub/master
...
BUG 7222 Etiquetas con HTML muestran caracteres html extra en las filas SOLVED
2012-11-28 10:24:44 -08:00
Julio Cesar Laura
9581c9d3e7
BUG 7222 Etiquetas con HTML muestran caracteres html extra en las filas SOLVED
...
- El valor que se coloca en el atributo pm:label no estaba siendo validado
- El valor ahora es validado usando entidades
2012-11-28 14:19:35 -04:00
Marco Antonio Nina
29d4cb3fa0
BUG 10110 Añr modulo de logs para envio de correos electronicos SOLVED
...
- According to the specifications.
- Was add the the list of emails.
enter the commit message for your changes. Lines starting
2012-11-28 12:54:11 -04:00
Marco Antonio Nina
39d79e398b
$title = ucfirst (strtolower ( G::LoadTranslation('ID_EMAILS')));
2012-11-28 12:50:02 -04:00
julceslauhub
db795a872c
Merge pull request #1004 from victorsl/BUG-10036
...
BUG 10036 "No esta rezalizando un buen conteo de la..." SOLVED
2012-11-28 08:40:37 -08:00
Victor Saisa Lopez
378f6a095e
BUG 10036 "No esta rezalizando un buen conteo de la..." SOLVED
...
- Incorrect the displaying of the paging toolbar
- Fix the displaying of the paging toolbar
* Available from version 2.0.46
2012-11-28 12:29:23 -04:00
norahmollo
f34e7b8e9f
WYSIWWG EDITOR add table control option
...
WYSIWYG EDITOR changes options
2012-11-28 15:57:08 +00:00
julceslauhub
b80ea5c5f3
Merge pull request #1003 from ralpheav/master
...
inputDoc save procedure fix
2012-11-28 05:51:13 -08:00
ralph
66c8366e8f
$_POST["functions"] is not arriving, seemed maborak.loader is not sending it. Fix.
2012-11-28 09:04:52 -04:00
user
bd126b0371
Merge remote-tracking branch 'upstream/master'
2012-11-28 09:04:51 -04:00
julceslauhub
dd58a6b131
Merge pull request #1002 from ralpheav/master
...
removing deprecated function G::getModel
2012-11-27 13:51:27 -08:00
ralph
72c53d4503
Removing G::getModel, deprecated function.
2012-11-27 17:15:57 -04:00
norahmollo
8a7598bc3c
WYSIWYG EDITOR validation
...
WYSIWYG EDITOR validation
2012-11-27 21:10:12 +00:00
julceslauhub
bd83c55c2e
Merge pull request #1001 from julceslauhub/master
...
BUG 9894 Active Directory User Import not working IMPROVEMENT
2012-11-27 13:03:36 -08:00
Julio Cesar Laura
5e75009b64
BUG 9894 Active Directory User Import not working IMPROVEMENT
2012-11-27 17:02:25 -04:00
julceslauhub
71c24e9158
Merge pull request #1000 from julceslauhub/master
...
BUG 9894 Active Directory User Import not working SOLVED
2012-11-27 12:34:11 -08:00
Julio Cesar Laura
6d7c9f5da7
BUG 9894 Active Directory User Import not working SOLVED
...
- Fields deprecated and wrong default filter for the ldap class
- Those parameters are not used, now it is only used the additional filter, with this field you can create the same filters or more complex filters.
Also, we've detected that the filter by default we are using the following condition: (objectCategory=person)
So, your filter is not working anymore, now we have been removed that condition to search in all objects and if you want to limit the objects on which searches can be done, you have to add your own filter.
2012-11-27 16:32:20 -04:00
julceslauhub
a46063d6bd
Merge pull request #999 from brayanpereyra/master
...
Performance to cron
2012-11-27 11:51:56 -08:00
Brayan Osmar Pereyra Suxo
b54dcce906
Performance to cron
2012-11-27 15:46:44 -04:00
user
8dd2b641da
Changes to the variable picker feature before revision meeting with the CTO
2012-11-27 15:42:28 -04:00
norahmollo
c8f209d90d
WYSIWYG EDITOR variable picker changes
...
WYSIWYG EDITOR
2012-11-27 19:14:33 +00:00
norahmollo
1f00433203
WYSIWYG EDITOR
...
WYSIWYG EDITOR
2012-11-27 18:13:56 +00:00
julceslauhub
86087f7993
Merge pull request #998 from ralpheav/master
...
Performace adds
2012-11-27 09:49:44 -08:00
julceslauhub
6eb44b71f1
Merge pull request #997 from victorsl/BUG-8283
...
BUG 8283 "PMFAddInputDocument function request" SOLVED
2012-11-27 09:47:51 -08:00
ralph
4d53c8af4f
Performace adds:
...
- jpeg MIME content.
- changing echo instead print for js and css files.
2012-11-27 13:44:02 -04:00
norahmollo
892a48eba0
WYSIWYG EDITOR Variable Picker
...
WYSIWYG EDITOR variable picker changes
2012-11-27 17:24:38 +00:00
Victor Saisa Lopez
23d03a7d2e
BUG 8283 "PMFAddInputDocument function request" SOLVED
...
- New feature
- PM Function for add a input document
- Added function "PMFAddInputDocument" in "class.pmFunctions.php"
- The QA team should test with:
* Dynaforms
* KnowledgeTree plugin
* Available from version 2.0.46
2012-11-27 12:56:10 -04:00
julceslauhub
295ca5216c
Merge pull request #996 from Jennydmz/BUG-6855
...
BUG-6855 Error message in 'Database Conections' clicking in Edit or Delete title.
2012-11-27 07:07:27 -08:00
jennylee
7604e72740
BUG-6855 Error message in 'Database Conections' clicking in Edit or Delete title.
...
I put an 'IF' validation in file 'workflow/engine/classes/class.propelTable.php.php', to prevent that this columns were sortable.
2012-11-27 10:47:34 -04:00
jennylee
11c7fe3b42
BUG-6855 Error message in 'Database Conections' clicking in Edit or Delete title.
...
I put an 'IF' validation in file 'workflow/engine/classes/class.propelTable.php.php', to prevent that this columns were sortable.
2012-11-27 10:21:32 -04:00
julceslauhub
1804224a12
Merge pull request #994 from ralpheav/master
...
Adding SteepSuperVisorPeer interface class
2012-11-27 05:11:56 -08:00
user
2f1ded16f5
Merging some changes to the variable picker feature inside the processmaker core
2012-11-27 08:55:29 -04:00
ralph
c0ec55ee2b
Fix for Json message makes Trigger dropdown list fail.
2012-11-26 18:03:59 -04:00
julceslauhub
17453ebc78
Merge pull request #993 from ralpheav/master
...
Adding fix for Save button at Dynaform Fields properties
2012-11-26 13:59:57 -08:00
ralph
8eaacc678a
Adding SteepSuperVisorPeer interface class
2012-11-26 17:51:55 -04:00
ralph
3d12c70be4
Adding js library to set classes instance abbr and adding maborak.loader.js
2012-11-26 17:42:27 -04:00
julceslauhub
16feb42a49
Merge pull request #992 from ralpheav/master
...
Adding fix for installation incomplete loading.
2012-11-26 13:36:08 -08:00
