Skip to content

Tags: promil23/GetSimpleCMS

Tags

v3.3.4b1

Toggle v3.3.4b1's commit message 
v 3.3.4

v3.3.3_cke_4.3.2

Toggle v3.3.3_cke_4.3.2's commit message 
Merge branch 'stable' into patch_cke

stable_cke_4.3.2

Toggle stable_cke_4.3.2's commit message 
Merge branch 'stable' into patch_cke

v3.3.3

Toggle v3.3.3's commit message 
Version 3.3.3

Merge branch 'hotfixes' into stable

Conflicts:
	admin/inc/configuration.php

v3.3.2_cke_4.3.2

Toggle v3.3.2_cke_4.3.2's commit message 
Merge branch 'stable' into patch_cke

v3.3.2

Toggle v3.3.2's commit message 
Version 3.3.2

Merge branch 'hotfixes' into stable

Conflicts:
	admin/edit.php
	admin/inc/configuration.php

v3.3.1_cke_4.3.2

Toggle v3.3.1_cke_4.3.2's commit message 
Merge branch 'stable' into patch_cke

v3.3.1

v3.3.0

Toggle v3.3.0's commit message 
Merge pull request GetSimpleCMS#741 from GetSimpleCMS/release

Release v3.3.0

patch_cke_4.1.1

Toggle patch_cke_4.1.1's commit message 
Merge branch 'stable' into patch_cke

Conflicts:
	admin/backup-edit.php
	admin/inc/template_functions.php
	admin/template/js/ckeditor/ckeditor.js
	admin/template/js/ckeditor/config.js
	admin/template/js/ckeditor/lang/de.js
	admin/template/js/ckeditor/lang/en.js
	admin/template/js/ckeditor/lang/es.js
	admin/template/js/ckeditor/lang/fr.js
	admin/template/js/ckeditor/lang/it.js
	admin/template/js/ckeditor/lang/nl.js
	admin/template/js/ckeditor/lang/pl.js
	admin/template/js/ckeditor/lang/pt.js
	admin/template/js/ckeditor/lang/ru.js
	admin/template/js/ckeditor/lang/sv.js
	admin/template/js/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
	admin/template/js/ckeditor/plugins/a11yhelp/lang/en.js
	admin/template/js/ckeditor/plugins/about/dialogs/about.js
	admin/template/js/ckeditor/plugins/adobeair/plugin.js
	admin/template/js/ckeditor/plugins/ajax/plugin.js
	admin/template/js/ckeditor/plugins/autogrow/plugin.js
	admin/template/js/ckeditor/plugins/bbcode/plugin.js
	admin/template/js/ckeditor/plugins/clipboard/dialogs/paste.js
	admin/template/js/ckeditor/plugins/colordialog/dialogs/colordialog.js
	admin/template/js/ckeditor/plugins/devtools/lang/en.js
	admin/template/js/ckeditor/plugins/devtools/plugin.js
	admin/template/js/ckeditor/plugins/dialog/dialogDefinition.js
	admin/template/js/ckeditor/plugins/div/dialogs/div.js
	admin/template/js/ckeditor/plugins/docprops/dialogs/docprops.js
	admin/template/js/ckeditor/plugins/docprops/plugin.js
	admin/template/js/ckeditor/plugins/find/dialogs/find.js
	admin/template/js/ckeditor/plugins/flash/dialogs/flash.js
	admin/template/js/ckeditor/plugins/forms/dialogs/button.js
	admin/template/js/ckeditor/plugins/forms/dialogs/checkbox.js
	admin/template/js/ckeditor/plugins/forms/dialogs/form.js
	admin/template/js/ckeditor/plugins/forms/dialogs/hiddenfield.js
	admin/template/js/ckeditor/plugins/forms/dialogs/radio.js
	admin/template/js/ckeditor/plugins/forms/dialogs/select.js
	admin/template/js/ckeditor/plugins/forms/dialogs/textarea.js
	admin/template/js/ckeditor/plugins/forms/dialogs/textfield.js
	admin/template/js/ckeditor/plugins/iframe/dialogs/iframe.js
	admin/template/js/ckeditor/plugins/iframedialog/plugin.js
	admin/template/js/ckeditor/plugins/image/dialogs/image.js
	admin/template/js/ckeditor/plugins/link/dialogs/anchor.js
	admin/template/js/ckeditor/plugins/link/dialogs/link.js
	admin/template/js/ckeditor/plugins/liststyle/dialogs/liststyle.js
	admin/template/js/ckeditor/plugins/pastefromword/filter/default.js
	admin/template/js/ckeditor/plugins/pastetext/dialogs/pastetext.js
	admin/template/js/ckeditor/plugins/placeholder/dialogs/placeholder.js
	admin/template/js/ckeditor/plugins/placeholder/lang/en.js
	admin/template/js/ckeditor/plugins/placeholder/plugin.js
	admin/template/js/ckeditor/plugins/scayt/dialogs/options.js
	admin/template/js/ckeditor/plugins/scayt/dialogs/toolbar.css
	admin/template/js/ckeditor/plugins/smiley/dialogs/smiley.js
	admin/template/js/ckeditor/plugins/specialchar/dialogs/specialchar.js
	admin/template/js/ckeditor/plugins/specialchar/lang/en.js
	admin/template/js/ckeditor/plugins/styles/styles/default.js
	admin/template/js/ckeditor/plugins/stylesheetparser/plugin.js
	admin/template/js/ckeditor/plugins/table/dialogs/table.js
	admin/template/js/ckeditor/plugins/tableresize/plugin.js
	admin/template/js/ckeditor/plugins/tabletools/dialogs/tableCell.js
	admin/template/js/ckeditor/plugins/templates/dialogs/templates.js
	admin/template/js/ckeditor/plugins/templates/templates/default.js
	admin/template/js/ckeditor/plugins/uicolor/dialogs/uicolor.js
	admin/template/js/ckeditor/plugins/uicolor/lang/en.js
	admin/template/js/ckeditor/plugins/uicolor/plugin.js
	admin/template/js/ckeditor/plugins/uicolor/yui/assets/yui.css
	admin/template/js/ckeditor/plugins/uicolor/yui/yui.js
	admin/template/js/ckeditor/plugins/wsc/dialogs/ciframe.html
	admin/template/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
	admin/template/js/ckeditor/plugins/wsc/dialogs/wsc.css
	admin/template/js/ckeditor/plugins/wsc/dialogs/wsc.js
	admin/template/js/ckeditor/plugins/xml/plugin.js
	admin/template/js/ckeditor/themes/default/theme.js