Hector Cortez 95e1a60f31 Merge remote branch 'upstream/master' into BUG-10054

2012-12-11 18:14:39 -04:00

..

bin

Merge pull request #1084 from ralpheav/master

2012-12-11 12:06:56 -08:00

classes

Merge pull request #1082 from ralpheav/master

2012-12-11 11:50:47 -08:00

config

…

content

…

controllers

Adding fix for session loose at time to load inexistent png file.

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

data

…

includes

…

js

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

lib

…

menus

…

methods

Merge remote branch 'upstream/master' into BUG-10054

2012-12-11 18:14:39 -04:00

plugins

…

services/rest

…

skinEngine

…

templates

Merge pull request #1081 from ralpheav/master

2012-12-11 11:14:58 -08:00

test

…

xmlform

Merge remote branch 'upstream/master' into BUG-10054

2012-12-11 18:14:39 -04:00

gulliver-win.bat

…

PmBootstrap.php

…