Gustavo Cruz 58af1e569e Merge branch 'pm_wysiwyg'

2012-11-29 13:35:28 -04:00

..

bin

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

classes

Merge branch 'pm_wysiwyg'

2012-11-29 13:35:28 -04:00

config

Automatic merge with the upstream master branch

2012-11-29 12:18:58 -04:00

content

adding the patches to the tinyMCE editor in order to solve the maborak/leinmud conflicts

2012-11-14 09:39:24 -04:00

controllers

Automatic merge with the upstream master branch

2012-11-29 12:18:58 -04:00

data

Automatic merge with the upstream master branch

2012-11-29 12:18:58 -04:00

includes

…

js

Automatic merge with the upstream master branch

2012-11-29 12:18:58 -04:00

lib

adding the patches to the tinyMCE editor in order to solve the maborak/leinmud conflicts

2012-11-14 09:39:24 -04:00

menus

Automatic merge with the upstream master branch

2012-11-29 12:18:58 -04:00

methods

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

plugins

…

services/rest

adding the patches to the tinyMCE editor in order to solve the maborak/leinmud conflicts

2012-11-14 09:39:24 -04:00

skinEngine

Merge branch 'master' into pm_wysiwyg

2012-11-19 14:04:22 -04:00

templates

Automatic merge with the upstream master branch

2012-11-29 12:18:58 -04:00

test

BUG 10037 Error in ws_sendMessage & ws_sendEmailMessage in wsClient.php SOLVED

2012-11-12 15:02:55 -04:00

xmlform

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

gulliver-win.bat

…

PmBootstrap.php

adding the patches to the tinyMCE editor in order to solve the maborak/leinmud conflicts

2012-11-14 09:39:24 -04:00