Commit Graph

4262 Commits

Author SHA1 Message Date
julceslauhub
ff3a5eca60 Merge pull request #1073 from krimson-rayne/master
WYSIWYG Additional features.
2012-12-10 10:39:42 -08:00
julceslauhub
dac309ccfb Merge pull request #1074 from julceslauhub/master
BUG 10148 JavaScript function saveForm does not work properly IMPROVEMENT
2012-12-10 10:32:29 -08:00
Julio Cesar Laura
df2f64a55d BUG 10148 JavaScript function saveForm does not work properly IMPROVEMENT 2012-12-10 14:29:29 -04:00
Gustavo Cruz
991d3f2a0a The dynaform editor now have the tables controls, content_css atribute now is reffered to the skin css, the editor view now refflects the real dynaform styles 2012-12-10 14:15:51 -04:00
Gustavo Cruz
5c37fed782 Commit of some changes, adding the styles plugin to all editors, with this plugin settings like backgroud color, or other styles settings can be added more easily, color picker included in the background options of this plugin 2012-12-10 13:58:30 -04:00
julceslauhub
88398cf0f4 Merge pull request #1072 from brayanpereyra/BUG-10158
BUG 10158 I added the colors in case tracker to stages SOLVED
2012-12-10 09:11:37 -08:00
Brayan Osmar Pereyra Suxo
8f71c54eab BUG 10158 I added the colors in case tracker to stages SOLVED
I added the colors in case tracker to stages
2012-12-10 13:03:08 -04:00
julceslauhub
f4186e6653 Merge pull request #1071 from julceslauhub/master
BUG 10162 Can not use poedit-1.5.4 to translate SOLVED
2012-12-07 13:02:52 -08:00
Julio Cesar Laura
cf24c78f5d BUG 10162 Can not use poedit-1.5.4 to translate SOLVED
- Only "X-Poedit-Language" header was accepted
- Now accepts the header "X-Poedit-Language" and "Language"
2012-12-07 17:01:37 -04:00
julceslauhub
5152adaca7 Merge pull request #1068 from krimson-rayne/master
Additional comments, Documentation, and Fixes for the WYSIWYG Feature
2012-12-07 13:00:18 -08:00
julceslauhub
aabe9b98ff Merge pull request #1070 from ralpheav/master
Adding sysGeneric Model Classes to the autoloader into Cron.
2012-12-07 12:58:10 -08:00
ralph
95132e7892 Adding sysGeneric Model Classes to the autoloader. 2012-12-07 16:10:36 -04:00
julceslauhub
f8d7ce24b0 Merge pull request #1069 from ralpheav/master
Adding classes to the Autoloader in Cron
2012-12-07 12:00:56 -08:00
ralph
f058c1b7c5 Merge branch 'master' of github.com:ralpheav/processmaker 2012-12-07 15:56:48 -04:00
ralph
c990eac5eb Adding Groupwf 2012-12-07 15:55:38 -04:00
Gustavo Cruz
85e028d03f Merge branch 'pm_wysiwyg' 2012-12-07 15:39:37 -04:00
Gustavo Cruz
9a82155717 Commit comments and additional documentation about the features and changes made 2012-12-07 15:33:45 -04:00
norahmollo
4471a8b2cc WYSIWYG EDITOR comments
WYSIWYG EDITOR comments
2012-12-07 19:28:59 +00:00
julceslauhub
7892e2c452 Merge pull request #1067 from brayanpereyra/master
I add validation to assigned of triggers
2012-12-07 11:28:20 -08:00
Brayan Osmar Pereyra Suxo
18f0b9764e I add validation to assigned of triggers 2012-12-07 15:13:38 -04:00
norahmollo
5b7eea1154 WYSIWYG EDITOR functions or methods comments
WYSIWYG EDITOR functions or methods comments
2012-12-07 18:53:26 +00:00
Gustavo Cruz
6f5a620e3d Commit in order to fix the correct render ot thegrid table 2012-12-07 12:22:42 -04:00
julceslauhub
7dced3e4e4 Merge pull request #1066 from ralpheav/master
Adding fix for unit-test  +  resolving git conflict
2012-12-07 08:19:10 -08:00
Ralph Asendeteufrer
59aaa55e33 Merge remote branch 'upstream/master'
Conflicts:
	tests/bootstrap.php
2012-12-07 10:35:46 -04:00
Ralph Asendeteufrer
fa511fd0ee Adding changes at time to resolve a comflict 2012-12-07 10:28:20 -04:00
Gustavo Cruz
484eef4962 Rebuilding the tinyMCE-maborak library 2012-12-07 10:11:28 -04:00
Gustavo Cruz
610072205b Fixing an mceInsertContent bug, the execCommand is now the mceInsertRawHTML 2012-12-07 09:54:12 -04:00
julceslauhub
88e18c83ac Merge pull request #1065 from ralpheav/master
Adding fix for unit Test, after autoloader
2012-12-06 13:06:05 -08:00
Ralph Asendeteufrer
2d796cd37d Adding fix for unit-Tests 2012-12-06 17:03:04 -04:00
julceslauhub
ca1d8a1b1d Merge pull request #1064 from brayanpereyra/BUG-10148
BUG 10148 I added validation to the function saveForm SOLVED
2012-12-06 13:01:11 -08:00
ralph
6883da7e58 Adding fix for unit Test, after autoloader 2012-12-06 16:54:53 -04:00
julceslauhub
f716aa7a53 Merge pull request #1063 from ralpheav/master
Adding CaseTrackerObjectPeer  to the autoloader
2012-12-06 12:54:12 -08:00
ralph
15e7df5912 Adding CaseTrackerObjectPeer 2012-12-06 16:47:05 -04:00
Brayan Osmar Pereyra Suxo
da560d606f BUG 10148 I added validation to the function saveForm SOLVED
I added validation to the function saveForm
2012-12-06 16:44:10 -04:00
julceslauhub
e51803626e Merge pull request #1062 from julceslauhub/master
BUG 10157 Cuando se configura el Estimated Task Duration del evento no genera el grafico del mismo SOLVED
2012-12-06 12:36:59 -08:00
Julio Cesar Laura
ffe3a13f32 BUG 10157 Cuando se configura el Estimated Task Duration del evento no genera el grafico del mismo SOLVED
- El factor de conversion estaba siendo redoendado solo a 2 decimales
- Ahora se redondea a 5 decimales
2012-12-06 16:35:30 -04:00
julceslauhub
f0b7d9c1d9 Merge pull request #1060 from ralpheav/master
Adding GroupUserPeer and GroupwfPeer
2012-12-06 12:00:16 -08:00
ralph
3a52bc3a27 Adding GroupUserPeer GroupwfPeer 2012-12-06 15:57:34 -04:00
Brayan Osmar Pereyra Suxo
171b94ed1e BUG 10148 I removed merge and added method POST SOLVED
I removed merge and added method POST
2012-12-06 15:56:33 -04:00
Brayan Osmar Pereyra Suxo
0510888b5e BUG 10148 I added validation to value 1 in checkbox SOLVED
I added validation to value 1 in checkbox
2012-12-06 15:30:36 -04:00
julceslauhub
4ba71a398c Merge pull request #1058 from ralpheav/master
Adding ReportVarPeer  to the autoloader
2012-12-06 11:08:41 -08:00
ralph
46d3d4a81c adding ReportVarPeer 2012-12-06 14:27:11 -04:00
Gustavo Cruz
758528ba9a Definitive styles to the Grid Wizard feature for TinyMCE 2012-12-06 12:16:39 -04:00
norahmollo
bc29b14328 WYSIWYG EDITOR pmGrids style
WYSIWYG EDITOR pmGrids style
2012-12-06 15:32:14 +00:00
norahmollo
add6c662ac WYSIWYG EDITOR styles bug
WYSIWYG EDITOR styles bug
2012-12-06 13:26:28 +00:00
Gustavo Cruz
d45c6bbd73 Another update to the grids wizard feature 2012-12-05 18:07:10 -04:00
julceslauhub
03907cbb7d Merge pull request #1057 from Jennydmz/BUG-7987
BUG-7987 When importing a process which is created by a user that does not   exist, the 'Process Owner' column shows empty.
2012-12-05 12:20:50 -08:00
jennylee
b9cbaa695d BUG-7987 When importing a process which is created by a user that does not exist, the 'Process Owner' column shows empty.
I added a validation in file 'workflow/engine/methods/processes/processes_Import_Ajax.php' to change PROCESS.PRO_CREATE_USER value in the database to the current user.
2012-12-05 16:13:08 -04:00
julceslauhub
925f25f515 Merge pull request #1056 from brayanpereyra/BUG-9549
BUG 9549 I added the width the form and dropdown SOLVED
2012-12-05 12:05:08 -08:00
julceslauhub
71f5699d54 Merge pull request #1052 from brayanpereyra/BUG-9549
BUG 9549 I added a confirm to import dynaform SOLVED
2012-12-05 11:50:07 -08:00