Merge remote branch 'upstream/master'

2014-07-03 14:56:32 -04:00
parent 83368cc38e 4aa633d3cb
commit 16425c72f7
5 changed files with 7187 additions and 5336 deletions
--- a/gulliver/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
+++ b/gulliver/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
@@ -1,7 +1,7 @@
 /* Reset */
 .o2k7Skin table, .o2k7Skin tbody, .o2k7Skin a, .o2k7Skin img, .o2k7Skin tr, .o2k7Skin div, .o2k7Skin td, .o2k7Skin iframe, .o2k7Skin span, .o2k7Skin *, .o2k7Skin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}
 .o2k7Skin a:hover, .o2k7Skin a:link, .o2k7Skin a:visited, .o2k7Skin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
-.o2k7Skin table td {vertical-align:middle}
+.o2k7Skin table td {vertical-align:top; background-color: white;}
 /* Containers */
 .o2k7Skin table {background:transparent}
--- a/workflow/engine/content/languages/translation.en
+++ b/workflow/engine/content/languages/translation.en
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
--- a/workflow/engine/data/mssql/insert.sql
+++ b/workflow/engine/data/mssql/insert.sql
--- a/workflow/engine/data/mysql/insert.sql
+++ b/workflow/engine/data/mysql/insert.sql