Gustavo Cruz dd4e044296 Merge branch 'pm_wysiwyg'

2012-12-12 17:32:13 -04:00

..

bin

Merge pull request #1084 from ralpheav/master

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

classes

Merge branch 'pm_wysiwyg'

2012-12-12 17:32:13 -04:00

config

BUG 10088 I added a index to APPLICATION table SOLVED

2012-12-04 16:15:40 -04:00

content

Fixing additional file permissions before final commit

2012-11-30 10:47:17 -04:00

controllers

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

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

data

BUG 10088 I added a index to APPLICATION table SOLVED

2012-12-04 16:15:40 -04:00

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

Fixing additional file permissions before final commit

2012-11-30 10:47:17 -04:00

menus

BUG 10106 "Verify php settings" SOLVED

2012-12-03 08:47:48 -04:00

methods

Merge branch 'pm_wysiwyg'

2012-12-12 17:32:13 -04:00

plugins

Changing deprecated json->decode json->encode by Bootstrap functions.

2012-11-29 14:25:06 -04:00

services/rest

Fixed the permissions for the template folder

2012-11-30 08:23:37 -04:00

skinEngine

BUG 10106 "Verify php settings" SOLVED

2012-12-03 08:47:48 -04:00

templates

CASES PARTICIPATED

2012-12-12 21:18:58 +00:00

test

…

xmlform

Merge branch 'pm_wysiwyg'

2012-12-12 17:32:13 -04:00

gulliver-win.bat

…

PmBootstrap.php

merging some changes from the upstream master branch

2012-11-30 11:27:38 -04:00