Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/remove utube #18

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

Feature/remove utube #18

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0615b46
Merge branch 'hotfix/v0.4.6'
Oct 4, 2011
d7c268f
Merge branch 'release/v0.5.0'
Oct 28, 2011
2e953b0
Merge branch 'release/v0.5.1'
Nov 24, 2011
f14f4cf
Merge branch 'release/v0.5.2'
Dec 12, 2011
89ff323
Merge branch 'release/v0.5.3'
Dec 12, 2011
d3e7ab4
Fix broken sign out link. Needs DELETE method.
jordelver Dec 16, 2011
cf2495d
Merge pull request #14 from jordelver/feature/fix-broken-sign-out-link
Dec 19, 2011
8ed8347
Merge branch 'release/v0.5.4'
Dec 19, 2011
7109906
Merge branch 'release/v0.5.5'
Dec 22, 2011
d7cea08
Merge branch 'release/v0.5.6'
Jan 20, 2012
3ed405e
Merge branch 'release/v0.5.7'
jordelver Feb 1, 2012
e715d03
Merge branch 'release/v0.5.8'
Feb 7, 2012
4796886
Merge branch 'release/v0.5.9'
Feb 7, 2012
d8a7c41
Merge branch 'release/v0.5.10'
Feb 7, 2012
d79b449
Merge branch 'develop' of https://github.com/noodall/noodall-ui into …
Pinto Feb 15, 2012
3a0178c
removed youtube addvideo plugin
Pinto Feb 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/javascripts/admin/tiny_mce_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lite_tiny_mce_config = {
editor_selector : "lite-editor",
strict_loading_mode : 1,
convert_urls : false,
plugins : "safari,inlinepopups,xhtmlxtras,paste,media,advimage,table,addvideo",
plugins : "safari,inlinepopups,xhtmlxtras,paste,media,advimage,table",
//"safari,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking",
// Theme options
theme_advanced_blockformats : "h2,h3,h4,p",
Expand Down