-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #42 from omnuvito/issue/tinymce3x
Issue/tinymce3x
- Loading branch information
Showing
101 changed files
with
832 additions
and
893 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,10 +6,10 @@ To install the plugin, place the files in a directory labelled "TinyMCE/" in you | |
Git Submodule | ||
------------- | ||
|
||
If you're using git for version control, you may want to add the **Migrations** plugin as a submodule on your repository. To do so, run the following command from the base of your repository: | ||
If you're using git for version control, you may want to add the **TinyMCE** plugin as a submodule on your repository. To do so, run the following command from the base of your repository: | ||
|
||
``` | ||
git submodule add [email protected]:CakeDC/TinyMCE.git app/Plugin/Migrations | ||
git submodule add [email protected]:CakeDC/TinyMCE.git app/Plugin/TinyMCE | ||
``` | ||
|
||
After doing so, you will see the submodule in your changes pending, plus the file ".gitmodules". Simply commit and push to your repository. | ||
|
@@ -20,7 +20,7 @@ To initialize the submodule(s) run the following command: | |
git submodule update --init --recursive | ||
``` | ||
|
||
To retreive the latest updates to the plugin, assuming you're using the "master" branch, go to "app/Plugin/Migrations" and run the following command: | ||
To retreive the latest updates to the plugin, assuming you're using the "master" branch, go to "app/Plugin/TinyMCE" and run the following command: | ||
|
||
``` | ||
git pull origin master | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.