Trix#5

Open

artemaminov wants to merge 228 commits intoromul:masterfrom

artemaminov:trix

Commits on May 10, 2011

Add Versionfile
schof
committed

Commits on May 18, 2011

Remove loading from yui editor
bfkelsey
committed

Commits on May 26, 2011

Commits on Jun 5, 2011

Added specific locale support for en-AU (Australia) so that YUIEditor works
tgmcclen
committed

Commits on Jun 24, 2011

Added spanish translation

Juan Pablo Avello
authored and
romul
committed
Bump version
romul
committed

Commits on Aug 11, 2011

Rails 3.1 Asset pipeline compatibility
fabien
committed

Commits on Sep 7, 2011

Minor updates for edge support
BDQ
committed

Commits on Oct 15, 2011

Commits on Nov 2, 2011

Commits on Nov 6, 2011

Invalid </ tr> closing tag.
humancopy
committed

Commits on Nov 7, 2011

Merge pull request #7 from humancopy/master
JDutil
committed

Commits on Nov 26, 2011

Merge pull request #1 from dissection/master
peterberkenbosch
committed

Commits on Nov 28, 2011

Add Gemfile
Cluster444
committed

Commits on Jan 1, 2012

add FR translation
bricesanchez
committed

Commits on Jan 10, 2012

Updated WYM support to be 3.1 asset ready.

bricesanchez
authored and
romul
committed
Switch default editor ofr WYMEditor

bricesanchez
authored and
romul
committed

Commits on Jan 11, 2012

Switched to use tinymce-jquery gem
romul
committed

Commits on Jan 12, 2012

Move folder with tinymce to allow tinymce-rails use additional languages, plugins, etc.
romul
committed

Commits on Jan 13, 2012

Revert "Switch default editor ofr WYMEditor", b/c of issue #10
romul
committed

Commits on Jan 18, 2012

JS code should go inside the head.
pjmorse
committed

Commits on Jan 19, 2012

Commits on Jan 21, 2012

first attempt to 1.0.x compat
kpitn
committed

Commits on Jan 22, 2012

Commits on Jan 24, 2012

Commits on Jan 31, 2012

'Spree' namespace for Asset and Image models
divineforest
committed

Commits on Feb 18, 2012

Commits on Feb 19, 2012

Update README.md
peterberkenbosch
committed

Commits on Mar 6, 2012

Now using spree 1.0.0
LBRapid
committed

Commits on Mar 13, 2012

Require spree_core >= 1.0.0
LBRapid
committed

Commits on May 2, 2012

Updated README.md

gogogoaldi
authored and
GeekOnCoffee
committed

Commits on Jun 15, 2012

Commits on Jun 16, 2012

removed unused ids
maleko
committed

Commits on Jun 20, 2012

Merge pull request #25 from maleko/master
peterberkenbosch
committed

Commits on Oct 11, 2012

Raw javascript output (by fabien)
Brice Sanchez
committed

Commits on Jan 31, 2013

Merge pull request #26 from bricesanchez/master
romul
committed

Commits on Feb 26, 2013

Use correct GitHub URL for installation instructions
radar
committed

Commits on Mar 10, 2013

README fix
Tima Maslyuchenko
committed

Commits on Mar 11, 2013

Merge pull request #30 from timsly/master
JDutil
committed

Commits on Mar 15, 2013

Support Spree 2.0.x
Jeff Dutil
committed

Commits on Mar 25, 2013

Allow configuration from initializers. [Fix #29]
Jeff Dutil
committed
CKEditor support

bob-frost
authored and
Jeff Dutil
committed
Document CKEditor
Jeff Dutil
committed
Improve CKEditor, Drop WYMEditor & YUI Editor, and Add Spec Coverage :beers: [Fix #28]
Jeff Dutil
committed
Simplify instructions.
Jeff Dutil
committed
Tweak README to fix numbering.
JDutil
committed
Update Versionfile.
Jeff Dutil
committed

Commits on Apr 7, 2013

Issue #36 - Fixed the editor css overflow in the product description page.

robertmassaioli
authored and
Jeff Dutil
committed
Fix typo.
JDutil
committed

Commits on Apr 12, 2013

Issue #39 - Allow raw product descriptions.

robertmassaioli
authored and
Jeff Dutil
committed
Update Capybara.
Jeff Dutil
committed

Commits on Apr 25, 2013

Commits on May 9, 2013

Port to Spree 2.0 translations
rterbush
committed

Commits on May 10, 2013

Namespace these to spree:
rterbush
committed

Commits on May 12, 2013

Commits on May 30, 2013

Bump to Spree 2.0 final.
Jeff Dutil
committed

Commits on Jun 26, 2013

Lockdown tinymce to fix asset precompiling issues.
Jeff Dutil
committed

Commits on Aug 6, 2013

Commits on Aug 24, 2013

Deface the partial shared/rich_editor_javascript into admin_footer_scripts instead of admin_inside_head to ensure that the editor javascript is loaded after jQuery
mamcinty
committed

Commits on Aug 26, 2013

Merge pull request #50 from Inventiverse/2-0-stable
JDutil
committed

Commits on Dec 15, 2013

Refactor engine.

futhr
authored and
FineLineAutomation
committed
Add locale spec.

futhr
authored and
FineLineAutomation
committed
Cleanup feature spec and change syntax.

futhr
authored and
FineLineAutomation
committed
Updated readme.

futhr
authored and
FineLineAutomation
committed
Add guardfile.

futhr
authored and
FineLineAutomation
committed
Cleanup settings.

futhr
authored and
FineLineAutomation
committed
Set dependency version for ckeditor.

futhr
authored and
FineLineAutomation
committed
Add Swedish locale.

futhr
authored and
FineLineAutomation
committed
Fix so specs pass.

futhr
authored and
FineLineAutomation
committed
Bump tinymce-rails to 4.0.2

futhr
authored and
FineLineAutomation
committed
Add translations for tinymce.

futhr
authored and
FineLineAutomation
committed
Bump version to 2.1.0

futhr
authored and
FineLineAutomation
committed
spree 2.1

tuxdapenguin
authored and
FineLineAutomation
committed
spree 2.1

tuxdapenguin
authored and
FineLineAutomation
committed

Commits on Feb 12, 2014

Merge branch 'master' of github.com:spree/spree_editor
FineLineAutomation
committed

Commits on Feb 13, 2014

Got the specs passing again.
FineLineAutomation
committed

Commits on Feb 14, 2014

Merge pull request #58 from FineLineAutomation/master
peterberkenbosch
committed

Commits on Feb 15, 2014

add italian locale
alepore
committed

Commits on Feb 16, 2014

Continued updates
futhr
committed
Merge branch 'it' of https://github.com/alepore/spree_editor
Jeff Dutil
committed
Remove unused translations.
Jeff Dutil
committed

Commits on Mar 1, 2014

Fix dependencies.
futhr
committed

Commits on Mar 2, 2014

Add generated ckeditor intializer and models to extension for extending w/other extensions in Rails 4.
Jeff Dutil
committed

Commits on Mar 3, 2014

make ckeditor work with rails 4 assets pipeline in production

sbasir
authored and
Jeff Dutil
committed
Remove s3support for spree 2.2.x
Jeff Dutil
committed
Config settings dont exist anymore.
Jeff Dutil
committed

Commits on Mar 4, 2014

Bump to spree 2.3.0.beta on master
futhr
committed

Commits on Mar 8, 2014

Update README.md
nskeip
committed

Commits on Mar 26, 2014

Lockdown ckeditor version to prevent pagination issues.
Jeff Dutil
committed

Commits on May 5, 2014

Merge pull request #69 from nskeip/patch-1
JDutil
committed

Commits on Jul 19, 2014

Fix specs.

Jeff Dutil
authored and
Jeff Dutil
committed

Commits on Sep 16, 2014

Update ckeditor dependency to 4.0.11, fix install problem

kfihihc
authored and
Jeff Dutil
committed
Fix specs.

Jeff Dutil
authored and
Jeff Dutil
committed
Dutch translations added

Daan
authored and
Jeff Dutil
committed
Remove unused override.

Jeff Dutil
authored and
Jeff Dutil
committed

Commits on Oct 31, 2014

Fix Travis CI badge
rbngzlv
committed

Commits on Nov 3, 2014

Fix config file for TinyMCE 4
rbngzlv
committed

Commits on Nov 4, 2014

Commits on Jan 25, 2015

Commits on Feb 6, 2015

improved README.md adding precompile ckeditor in assets.rb

dalawwa
authored and
futhr
committed

Commits on Feb 19, 2015

Commits on Mar 11, 2015

Upgrade to CKEditor ~> 4.1.1

rbngzlv
authored and
futhr
committed
Fixes configuration path in override.
futhr
committed

Commits on May 21, 2015

Commits on Sep 17, 2015

Avoid for..in loops in JavaScript

elia
authored and
alepore
committed
Remove hardcoded CKEDITOR_BASEPATH

Fabrizio Monti
authored and
alepore
committed

Commits on Sep 19, 2015

Bumped TinyMCE version
Ryan Heneise
committed

Commits on Sep 21, 2015

Merge pull request #108 from mysmallidea/master
alepore
committed

Commits on Oct 7, 2015

Update README.md
alepore
committed

Commits on Nov 21, 2015

Deface: don't manually require override files
alepore
committed

Commits on Nov 22, 2015

adds hint to change editor to ckeditor

krazedkrish
authored and
futhr
committed

Commits on Feb 17, 2016

sass-rails version upgrade to ~> 5.0.0
Priyank Gupta
committed
bump version to 3.1.0.beta
Priyank Gupta
committed

Commits on Feb 19, 2016

Merge pull request #116 from priyank-gupta/master
damianlegawiec
committed

Commits on Apr 12, 2016

add tinymce-jquery.js to assets.precompile
Priyank Gupta
committed
bump version to 3.1.0, change spree branch to 3-1-stable
Priyank Gupta
committed
Merge pull request #119 from priyank-gupta/master
damianlegawiec
committed

Commits on Apr 13, 2016

bump version to 3.2.0.alpha, change spree dependency version to 3.2.0.alpha, change spree branch to master
Priyank Gupta
committed

Commits on Apr 18, 2016

Merge pull request #120 from priyank-gupta/master
damianlegawiec
committed

Commits on Jun 13, 2016

Updated installation instructions
damianlegawiec
authored

Commits on Jul 13, 2016

Remove ruby 2.1 from travis.yml and set ruby 2.2.4
mauazua
authored

Commits on Jul 14, 2016

Test against ruby 2.3.0
mauazua
authored

Commits on Jul 15, 2016

Commits on Feb 1, 2017

Commits on May 30, 2017

Bump ruby 2.2 required version to 2.2.7 for travis
damianlegawiec
authored

Commits on Jul 27, 2017

Commits on Jul 28, 2017

Commits on Sep 19, 2017

Commits on Oct 29, 2017

Commits on Nov 30, 2017

Commits on Jan 15, 2018

Commits on Mar 6, 2018

Commits on Mar 14, 2018

replace poltergeist with selenium chromedriver
lani13
committed

Commits on Mar 15, 2018

Merge pull request #133 from lani13/master
bbonislawski
authored

Commits on Mar 19, 2018

Update README.md
artplan1
authored

Commits on Apr 18, 2018

add puma to dependencies
bbonislawski
authored

Commits on Apr 26, 2018

Merge pull request #134 from artplan1/patch-1
damianlegawiec
authored

Commits on Jul 30, 2018

Update supporting versions of spree and ruby
VygovskySergey
committed

Commits on Sep 4, 2018

Merge pull request #137 from spark-solutions/feature/update_supporting_spree_version
VygovskySergey
authored

Commits on Feb 3, 2019

Lock factory-bot at 4.7
damianlegawiec
authored

Commits on Oct 22, 2019

Commits on Nov 25, 2019

Merge pull request #145 from spree-contrib/rails_6_spree_4
damianlegawiec
authored

Commits on Jun 19, 2020

add Trix editor
artemaminov
committed

Commits on Jun 30, 2020

replace trix gem with trix library
artemaminov
committed