fernando/luos
1
0
Fork 0
Code Releases Activity
7,171 Commits 1 Branch 0 Tags
b51f036e19d55cc18be80090a7fa5dfc1ef3f06c
Commit Graph

7171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
julceslauhub
3c050e64db Merge pull request #1016 from ralpheav/master 
Removing not in use directory ./server from gulliver/js/maborak/core
 2012-11-29 11:58:26 -08:00
norahmollo
6a2b32f77d Merge remote branch 'origin/master' 2012-11-29 19:53:44 +00:00
ralph
b12cb36a9e Adding forgotten Isolation.php include. 2012-11-29 15:51:00 -04:00
julceslauhub
2499c39ab1 Merge pull request #1015 from marcoAntonioNina/BUG-7384 
BUG 7384 JavaScript getControlsInTheRow() function does not work... SOLVED
 2012-11-29 11:43:57 -08:00
Marco Antonio Nina
b3d66a84b0 BUG 7384 JavaScript getControlsInTheRow() function does not work... SOLVED 
- No loaded the all fields of grid.
- Was add the fields missing.
 2012-11-29 15:39:08 -04:00
julceslauhub
2dc2d8f7fa Merge pull request #1014 from ralpheav/master 
Changing deprecated json functions
 2012-11-29 11:12:36 -08:00
ralph
5e2db4b348 Removing not in use directory ./server from gulliver/js/maborak/core 2012-11-29 14:30:11 -04:00
ralph
2df7ff709a Changing deprecated json->decode json->encode by Bootstrap functions. 2012-11-29 14:25:06 -04:00
Gustavo Cruz
58af1e569e Merge branch 'pm_wysiwyg' 2012-11-29 13:35:28 -04:00
Gustavo Cruz
13ac6fa95a Merge remote-tracking branch 'upstream/master' 2012-11-29 13:28:24 -04:00
Gustavo Cruz
81270e1567 Fixed the changes in order to register the class in the sysgeneric.php and bootstrap files 2012-11-29 13:25:59 -04:00
Gustavo Cruz
05d6a3181b Fixed the variable picker in the wysiwyg editor now correctly shows the process variables, and also the maborak.js has been rebuild in order to add the tinymce library 2012-11-29 12:46:24 -04:00
julceslauhub
c6f965c9a1 Merge pull request #1012 from ralpheav/master 
adding Bootstrap::json_encode to translations
 2012-11-29 08:32:56 -08:00
Gustavo Cruz
f55ff5bdae Automatic merge with the upstream master branch 2012-11-29 12:18:58 -04:00
ralph
5c89c9d499 Adding new Bootstrap::json_encode() 2012-11-29 11:21:52 -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