V2 release.

froala · Nov 11, 2015 · a98b980 · a98b980
1 parent ae93687
commit a98b980
Show file tree

Hide file tree

Showing 61 changed files with 76 additions and 75 deletions.
diff --git a/Readme.md b/Readme.md
@@ -25,17 +25,17 @@ If you have questions or need help integrating the editor please [contact us](ht
 
 ## Licensing
 
-In order to use the Froala Editor you have to purchase one of the following licenses according to your needs. You can find more about that on our website on the [pricing plan page](https://www.froala.com/wysiwyg-editor/v2.0/pricing).
+In order to use the Froala Editor you have to purchase one of the following licenses according to your needs. You can find more about that on our website on the [pricing plan page](https://www.froala.com/wysiwyg-editor/pricing).
 
-1. Single Website - $59
-2. Advanced - $119
-4. OEM - $399
+1. One Domain - $99
+2. Advanced - $199
+4. OEM - $699
 
 ## Useful links
 
-* Official website v2:  [froala.com/wysiwyg-editor/v2.0](https://www.froala.com/wysiwyg-editor/v2.0)
-* Official download v2: [froala.com/wysiwyg-editor/v2.0/pricing](https://www.froala.com/wysiwyg-editor/v2.0/pricing)
-* Official documentation v2:  [froala.com/wysiwyg-editor/v2.0/docs](https://www.froala.com/wysiwyg-editor/v2.0/docs)
+* Official website:  [froala.com/wysiwyg-editor](https://www.froala.com/wysiwyg-editor)
+* Official download: [froala.com/wysiwyg-editor/pricing](https://www.froala.com/wysiwyg-editor/pricing)
+* Official documentation:  [froala.com/wysiwyg-editor/docs](https://www.froala.com/wysiwyg-editor/docs)
 * Changelog:  [froala.com/wysiwyg-editor/changelog](https://www.froala.com/wysiwyg-editor/changelog)
 * Licensing: [froala.com/wysiwyg-editor/terms](https://www.froala.com/wysiwyg-editor/terms)
 * FAQ: [froala.com/wysiwyg-editor/faq](https://www.froala.com/wysiwyg-editor/faq)

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "froala-wysiwyg-editor",
-    "version": "2.0.0-rc.3",
+    "version": "2.0.0",
     "description": "A beautiful jQuery WYSIWYG HTML rich text editor. High performance and modern design make it easy to use for developers and loved by users.",
     "main": [
       "css/froala_editor.min.css",
@@ -63,15 +63,15 @@
     "licenses": [
         {
           "type": "Single Website",
-          "url": "https://www.froala.com/wysiwyg-editor/v2.0/pricing"
+          "url": "https://www.froala.com/wysiwyg-editor/pricing"
         },
         {
           "type": "Advanced",
-          "url": "https://www.froala.com/wysiwyg-editor/v2.0/pricing"
+          "url": "https://www.froala.com/wysiwyg-editor/pricing"
         },
         {
           "type": "OEM",
-          "url": "https://www.froala.com/wysiwyg-editor/v2.0/pricing"
+          "url": "https://www.froala.com/wysiwyg-editor/pricing"
         }
     ],
     "dependencies": {

diff --git a/css/froala_editor.css b/css/froala_editor.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */

diff --git a/css/froala_editor.min.css b/css/froala_editor.min.css
diff --git a/css/froala_style.css b/css/froala_style.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */

diff --git a/css/froala_style.min.css b/css/froala_style.min.css
diff --git a/css/plugins/char_counter.css b/css/plugins/char_counter.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */

diff --git a/css/plugins/char_counter.min.css b/css/plugins/char_counter.min.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */.fr-box .fr-counter{position:absolute;bottom:5px;right:7px;color:#ccc;content:attr(data-chars);font-size:15px;font-family:"Times New Roman",Georgia,Serif;z-index:1}.fr-box.fr-rtl .fr-counter{left:7px;right:auto}.fr-box.fr-code-view .fr-counter{display:none}
diff --git a/css/plugins/code_view.css b/css/plugins/code_view.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */

diff --git a/css/plugins/code_view.min.css b/css/plugins/code_view.min.css
diff --git a/css/plugins/colors.css b/css/plugins/colors.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */

diff --git a/css/plugins/colors.min.css b/css/plugins/colors.min.css
diff --git a/css/plugins/emoticons.css b/css/plugins/emoticons.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */

diff --git a/css/plugins/emoticons.min.css b/css/plugins/emoticons.min.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */.clearfix::after{clear:both;display:block;content:""}.fr-popup .fr-emoticon{display:inline-block;font-size:20px;padding:5px;line-height:1;cursor:default;font-weight:400;font-family:"Apple Color Emoji","Segoe UI Emoji",NotoColorEmoji,"Segoe UI Symbol","Android Emoji",EmojiSymbols}
diff --git a/css/plugins/file.css b/css/plugins/file.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */

diff --git a/css/plugins/file.min.css b/css/plugins/file.min.css
diff --git a/css/plugins/fullscreen.css b/css/plugins/fullscreen.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */

diff --git a/css/plugins/fullscreen.min.css b/css/plugins/fullscreen.min.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */body.fr-fullscreen{overflow:hidden;height:100%;width:100%;position:fixed}.fr-box.fr-fullscreen{margin:0!important;position:fixed;top:0;left:0;bottom:0;right:0;z-index:9990!important}.fr-box.fr-fullscreen .fr-toolbar.fr-top{top:0!important}.fr-box.fr-fullscreen .fr-toolbar.fr-bottom{bottom:0!important}
diff --git a/css/plugins/image.css b/css/plugins/image.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */

diff --git a/css/plugins/image.min.css b/css/plugins/image.min.css
diff --git a/css/plugins/image_manager.css b/css/plugins/image_manager.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor/v2.0)
+ * froala_editor v2.0.0 (https://www.froala.com/wysiwyg-editor)
  * License http://editor.froala.com/license
  * Copyright 2014-2015 Froala Labs
  */