Commit Graph

996 Commits

Author SHA1 Message Date
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
Gustavo Cruz
f55ff5bdae Automatic merge with the upstream master branch 2012-11-29 12:18:58 -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
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
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
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
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
user
8dd2b641da Changes to the variable picker feature before revision meeting with the CTO 2012-11-27 15:42:28 -04:00
norahmollo
1f00433203 WYSIWYG EDITOR
WYSIWYG EDITOR
2012-11-27 18:13:56 +00: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
user
2f1ded16f5 Merging some changes to the variable picker feature inside the processmaker core 2012-11-27 08:55:29 -04:00
user
b0c556064c integrating changes in order to enable the double click selection/insertion in the variable picker 2012-11-26 12:29:29 -04:00
user
ccd87965e8 Adding some changes to the interface in order to fix the list filters in the variable picker feature 2012-11-26 12:18:03 -04:00
norahmollo
52461ddc8c WYSIWYG EDITOR Variable picker.js
WYSIWYG EDITOR Variable picker.js
2012-11-26 16:08:09 +00:00
julceslauhub
ae7daba540 Merge pull request #990 from brayanpereyra/BUG-9549
BUG 9549 I added button to import dynaform SOLVED
2012-11-25 19:33:55 -08:00
user
adb1ae1c34 Changes to the ajax function in order to obtain the list of variables 2012-11-23 16:54:38 -04:00
Brayan Osmar Pereyra Suxo
21013b00f6 BUG 9549 I added button to import dynaform SOLVED
I added button to import dynaform
2012-11-23 16:05:35 -04:00
Brayan Osmar Pereyra Suxo
9b2c1343e4 BUG 9549 I added button to import dynaform SOLVED
I added button to import dynaform
2012-11-23 15:47:10 -04:00
user
209cdfbed7 Adding some updates to the ajax function and also, the Ajax call to the variable picker form 2012-11-23 15:23:44 -04:00
norahmollo
2d3f7bc8cc WYSIWYG EDITOR events attach
WYSIWYG EDITOR events attach
2012-11-23 19:01:17 +00:00
norahmollo
b50e802391 WYSIWYG EDITOR Variable Picker Layout
WYSIWYG EDITOR Variable Picker Layout
2012-11-23 14:05:44 +00:00
ralph
d7962637a8 Commenting DB interface requiere files from processMap class, already in Autoloader. 2012-11-22 16:33:58 -04:00
user
f38c4d368c Removing requiere_once call to gain loading time. 2012-11-20 16:45:09 -04:00
user
24cb5bce52 Merge remote-tracking branch 'upstream/master' into speedy 2012-11-20 14:04:40 -04:00
jennylee
7c8b33049a BUG-7802 In Advanced Search -> Information -> Dynaform, the Submit Button was enabled, like in edition mode.
I added a javascript code to disable the Submit Button on file 'workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php'.
2012-11-20 10:58:11 -04:00
jennylee
7c1902a68e BUG-7802 In Advanced Search -> Information -> Dynaform, the Submit Button was enabled, like in edition mode.
I added a javascript code to disable the Submit Button on file 'workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php'.
2012-11-20 09:56:34 -04:00
user
3ef0b0bbc5 Commenting include DB interface files require, to gain time loading. 2012-11-19 17:19:19 -04:00
Victor Saisa Lopez
e10d68ba58 BUG 7752 "No webservice to add notes" SOLVED
- New feature
- Web Services for add case note
- Added functions "PMFAddCaseNote, WSAddCaseNote" in "class.pmFunctions.php"
- Added function "addCaseNote" in "class.wsBase.php"
- Added functionality for applications using Web Services
* Available from version 2.0.46
2012-11-19 14:35:10 -04:00
user
1448ac728d Merge branch 'master' into pm_wysiwyg 2012-11-19 14:04:22 -04:00
Victor Saisa Lopez
55ee745105 BUG 0000 "In HOME>Documents pager does not work" SOLVED
- In HOME>Documents pager does not work
- Fixed, Added total records variable, The pager now work correctly
* Available from version 2.0.46
2012-11-16 13:32:07 -04:00
user
8226caad6b Merge remote-tracking branch 'upstream/master' into speedy 2012-11-16 11:27:46 -04:00
Victor Saisa Lopez
97cef89539 BUG 8391 "Request that an "Edit" button be added to the..." SOLVED
- New feature
- Request that an "Edit" button be added to the page to view the
  profile of a particular user
- Added edit button in Summary view
* Available from version 2.0.46
2012-11-16 10:05:20 -04:00
Julio Cesar Laura
59bf5dd6d7 Fix little bug when edit intermediate events 2012-11-15 16:46:44 -04:00
user
923e375e5a Merge remote-tracking branch 'upstream/master' into speedy 2012-11-15 15:11:31 -04:00
user
7e589fd4f8 Fixed some isses with the integration with TinyMCE and also Created the plugin pmSimpleUploader for TinyMCE 2012-11-15 13:07:06 -04:00
Victor Saisa Lopez
ebd1a4747c BUG 8596 "Web Services needs a userInfo() function" SOLVED
- New feature
- Web Services for getting information of user
- Added functions "PMFInformationUser, WSInformationUser" in "class.pmFunctions.php"
- Added function "informationUser" in "class.wsBase.php"
- Added functionality for applications using Web Services
* Available from version 2.0.46
2012-11-15 12:56:33 -04:00
user
22cc9125d1 Merge branch 'master' into pm_wysiwyg 2012-11-15 12:36:31 -04:00
Brayan Osmar Pereyra Suxo
bb92d18f64 BUG 9962 I added a validation to field SOLVED
I added a validation to text field
2012-11-15 10:10:04 -04:00