Commit graph

493 commits

Author SHA1 Message Date
Wes Cossick 6abda7ab68 Merge pull request #361 from NextStepWebs/development
Fix broken dependency
2016-06-14 12:57:04 -05:00
Wes Cossick 1471a4e662 Merge branch 'master' into development 2016-06-14 12:50:07 -05:00
Wes Cossick 0d9f7d9012 Update code and version 2016-06-14 12:48:07 -05:00
Wes Cossick 2c35e6782f 1.11.2 2016-06-14 12:46:09 -05:00
Wes Cossick cb10536dd4 Update bower version 2016-06-14 12:46:03 -05:00
Wes Cossick 00e0f69d93 Merge pull request #356 from NextStepWebs/development
Republishing to NPM
2016-06-09 15:42:10 -05:00
Wes Cossick 98bc1e52a1 Update version 2016-06-09 15:26:41 -05:00
Wes Cossick 47b2667e86 1.11.1 2016-06-09 15:22:15 -05:00
Wes Cossick 316b8a58f8 Merge pull request #353 from NextStepWebs/development
Development
2016-06-07 22:54:06 -05:00
Wes Cossick 6676411766 Update version in comments 2016-06-07 22:46:55 -05:00
Wes Cossick 3653d4f81d 1.11.0 2016-06-07 22:46:32 -05:00
Wes Cossick 7dc2a8f7fe Revert "Revert this"
This reverts commit 021e705242.
2016-06-07 22:46:19 -05:00
Wes Cossick 021e705242 Revert this 2016-06-07 22:46:15 -05:00
Wes Cossick e74572ac4a Update version in bower 2016-06-07 22:46:11 -05:00
Wes Cossick 487ff36385 Rebuild project 2016-06-07 22:36:54 -05:00
Wes Cossick d963582f16 Fix line and word count on init (#299) 2016-06-07 21:53:23 -05:00
Wes Cossick 69bff3ed78 Fix CodeMirror bug with init text (#344) 2016-06-07 21:43:25 -05:00
Wes Cossick b4d4e89129 Fix selection bug when toggling between side-by-side (#309) 2016-06-07 21:40:40 -05:00
Wes Cossick c949cad2d8 Update URLs; prefer SSL 2016-06-07 21:33:34 -05:00
Wes Cossick c8f23a3aa9 Clean up build process, Use new CodeMirror Spell Checker 2016-06-07 21:28:01 -05:00
Wes Cossick dbb1c25843 Travis CI now tests against Node.js 6 2016-06-07 21:28:01 -05:00
Wes Cossick a30d8f6183 Fix #326 2016-06-07 21:28:01 -05:00
Wes Cossick 51ef0cd81d Merge pull request #351 from amka/patch-2
Add support for count Cyrillic words
2016-06-07 21:18:55 -05:00
Wes Cossick 97154e2bfc Merge pull request #345 from jbutz/development
Prevent onclick event from bubbling
2016-06-07 21:07:01 -05:00
Andrey M bd33cd3c2b Add support for count Cyrillic words
Add unicode range for Cyrillic characters
2016-06-07 03:39:01 +04:00
Jason Butz 7187fb26fb Adjust whitespace characters 2016-06-03 09:09:33 -04:00
Jason Butz f21cca3068 Prevent onclick event from bubbling 2016-06-03 09:07:15 -04:00
Wes Cossick b6b1f7c1ef Merge pull request #304 from bbemis017/readmeError
Readme error
2016-04-22 18:56:43 -05:00
Wes Cossick 0ce450a7a7 Merge pull request #301 from JHeiner/issue150
Fix issue #150: use correct paths for dependencies.
2016-04-22 18:52:01 -05:00
Benjamin Bemis d9d0cd50d5 Fixed Syntax Error in readme file 2016-04-22 19:38:20 -04:00
Jeremy Heiner 7b1e8deeaa Fix issue #150: use correct paths for dependencies.
https://nodejs.org/api/modules.html specifies what paths are
correct. One should never explicitly put "node_modules" in
dependency paths because npm is under no obligation to put things
where you told it to look for them. Issue #150 arises when
SimpleMDE is a dependency in some other project, so it and its
dependencies are peers under that project's "node_modules", and
there is no "./node_modules" within the SimpleMDE folder.

TL/DR: npm tells you where it puts dependencies, not vice versa.
2016-04-19 20:02:53 -04:00
Wes Cossick e72e51c94f Merge pull request #297 from prostoandrei/development
Fix #286
2016-04-09 21:19:59 -05:00
Wes Cossick 4ec9ab8be0 Tweak documentation for styleSelectedText 2016-04-09 21:18:03 -05:00
Wes Cossick 6ed8344248 Fix documentation for styleSelectedText 2016-04-09 21:17:07 -05:00
Wes Cossick 2f4e7e4d9b Merge pull request #289 from foreachlt/style-selected-text
Added mark-selection plugin
2016-04-09 21:16:09 -05:00
andrey.vaganov 318b4c175f Merge branch 'development' of https://github.com/prostoandrei/simplemde-markdown-editor into development
Conflicts:
	debug/simplemde.debug.js
	debug/simplemde.js
	dist/simplemde.min.js
	src/js/simplemde.js
2016-03-31 13:36:05 +03:00
andrey.vaganov fe1318dd39 fix issue #286 2016-03-31 13:34:12 +03:00
andrey.vaganov 4a8ce0bd12 fix issue #286 2016-03-31 12:14:39 +03:00
Kasparas Galdikas 490e57ded1 Added mark-selection plugin from CodeMirror with config option on simplemde 2016-03-25 15:56:44 +00:00
Wes Cossick 9eb0411d82 Merge pull request #284 from foreachlt/console
Removed console.log left overs
2016-03-25 09:58:32 -05:00
Kasparas Galdikas be3fbf15b5 Removed console.log left overs 2016-03-20 14:55:19 +00:00
Wes Cossick 6eae597a69 Merge pull request #277 from NextStepWebs/development
Allow destroying instance, Prompts, README changes, Fix bugs, More
2016-03-14 21:39:46 -05:00
Wes Cossick 507e8ce67d Merge branch 'master' into development 2016-03-14 21:34:58 -05:00
Wes Cossick 24ec612c44 Fix linting and update dependencies 2016-03-14 21:28:56 -05:00
Wes Cossick 747b3ef065 Rebuild project 2016-03-14 20:59:59 -05:00
Wes Cossick 26391efa26 Better localStorage detection 2016-03-14 20:59:16 -05:00
Wes Cossick d77d4b318b Update version 2016-02-25 15:08:38 -06:00
Wes Cossick 1def5aabc2 1.10.1 2016-02-25 15:08:38 -06:00
Wes Cossick 711af1b472 Merge pull request #264 from NextStepWebs/pr/256
Pull request #256 remove conflicts
2016-02-25 15:07:33 -06:00
Wes Cossick 75b6c82940 Make compatible and able to be merged 2016-02-25 15:00:52 -06:00