a19ea71cf4
Merge pull request #775 from jhollinger/master
...
Fix npm version
2012-06-12 09:01:36 -07:00
638e4cf9d3
Merge pull request #774 from jhollinger/develop
...
Fix npm version
2012-06-12 08:59:40 -07:00
23075138b9
Lock down npm version to avaoid bug in later version
2012-06-12 11:03:09 -04:00
e0540122fe
Lock down npm version to avaoid bug in later version
2012-06-12 10:59:11 -04:00
5d6c80c55d
Merge pull request #772 from jhollinger/develop
...
Bugfix to setHTML
2012-06-12 07:47:05 -07:00
3811a844a9
Merge pull request #773 from jhollinger/master
...
Bugfix to setHTML
2012-06-12 07:47:03 -07:00
b118903f4e
Bugfix to setHTML - it was ignoring the last letter of each line. fixes issue #768
2012-06-11 23:34:28 -04:00
486f7c904e
Bugfix to setHTML - it was ignoring the last letter of each line. fixes issue #768
2012-06-11 23:33:17 -04:00
2f8aa26864
Merge pull request #767 from jhollinger/master
...
Bugfix to setHTML
2012-06-09 08:33:35 -07:00
6653a3b6f0
Bugfix to setPadHTML. resolves #764
2012-06-09 11:32:05 -04:00
d83e1d5b71
Merge pull request #765 from jhollinger/develop
...
Fix setHTML in API
2012-06-09 08:24:11 -07:00
d5faefdeae
Bugfix to setPadHTML. resolves #764
2012-06-09 10:53:51 -04:00
ae179ba01d
Fix pad.js' customStart.
...
Appears that sourcing of static/custom/pad.js was removed from
templates/pad.html. This prevented static/custom/pad.js:customStart
from running. Add it back to get customStart working again.
2012-06-07 10:58:29 -07:00
3338db9485
Bugfixes
2012-06-05 13:32:33 +02:00
63588bd11a
Merge branch 'master' of https://github.com/Pita/etherpad-lite into develop
2012-06-04 14:18:16 +01:00
de90f0db4e
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
2012-06-04 14:18:11 +01:00
cc72868636
Merge pull request #757 from redhog/aceEditEvent
...
Ace edit event as hook to modify changes as they happen
2012-06-04 06:17:09 -07:00
cf2f0b72a3
More plugin information
2012-06-04 14:33:38 +02:00
e23da5127b
No longer need bin/installDeps.sh
2012-05-30 23:59:06 +02:00
3e44b0e0d5
Merge branch 'timeslider-realtimeupdate+readonly-pads'
2012-05-30 23:01:47 +02:00
dc678a458f
Merge pull request #746 from redhog/timeslider-realtimeupdate+readonly-pads
...
Timeslider realtimeupdate+readonly pads
2012-05-30 11:07:25 -07:00
7ca7a5c3fa
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
2012-05-30 19:31:33 +02:00
ad68a6e3bf
Bugfix for Chads new toolbar styling
2012-05-30 17:41:43 +02:00
27f25b8c61
Added hook to catch edit events
2012-05-30 17:18:43 +02:00
f032cddf66
Merge pull request #743 from redhog/master
...
Bugfix for aceInitInnerdocbodyHead broken by jquery packaging commit
2012-05-30 04:59:26 -07:00
357ca73a99
Bugfix for bug introduced by 96ab3dc3b46a0f5d02d8ddb64d7ba2dcdb6b8aa6: jQuery is packaged - this is pure duplication.
2012-05-30 10:00:36 +02:00
afb868fd2b
Update CHANGELOG.md
2012-05-30 00:20:03 +02:00
96877bc2b6
Merge branch 'develop'
2012-05-29 21:48:48 +01:00
15a7d24450
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
...
Conflicts:
src/node/handler/PadMessageHandler.js
src/static/css/pad.css
src/templates/pad.html
2012-05-29 21:26:12 +02:00
dfd81b79d4
Merge pull request #738 from cweider/packaging
...
Packaging
2012-05-28 17:08:23 -07:00
819fb76dcd
These definitions are meaningless.
2012-05-28 16:43:20 -07:00
a28bbd0b3f
Definition will not have an effect if already defined - force redefinition.
2012-05-28 16:43:20 -07:00
774e2a1517
Fix indentation.
2012-05-28 16:43:20 -07:00
95b9cf4f62
Merge pull request #737 from cweider/packaging
...
Packaging
2012-05-28 15:28:50 -07:00
a8340dfbbe
Remove the libraries that are a part of ace2_common package.
2012-05-28 15:14:52 -07:00
7f9bfd6b26
Add comments to templates.
2012-05-28 15:14:52 -07:00
96ab3dc3b4
jQuery is packaged - this is pure duplication.
2012-05-28 15:14:52 -07:00
d5ac2bfb71
Explicitly require jQuery before using it.
2012-05-28 15:14:52 -07:00
595fc5710e
Add ace2_common to bottom of the page includes.
2012-05-28 15:14:52 -07:00
c4c30bf725
Correct parent_require path.
2012-05-28 15:14:51 -07:00
299a90b3ba
Fix paths for ace files.
2012-05-28 15:14:51 -07:00
cf9c250373
Merge pull request #736 from cweider/fix-ie
...
Fix ie
2012-05-28 14:48:06 -07:00
9def552d3c
Remove trailing comma added in e661f653b1. Fixes #733 .
2012-05-28 14:40:08 -07:00
bd07589e0f
fixing start.bat so server begins..
2012-05-28 20:19:49 +02:00
50b061cb6a
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
2012-05-28 19:09:43 +01:00
d4b4ca0a5c
Center user icon and fix overlapping chat
2012-05-23 20:40:24 +03:00
26614bf2d5
You can't use $ if no jQuery is available.. Apologies for so much spam on this issue, this finally resolves #594
2012-05-23 01:01:50 +02:00
d1c2d12150
Import Should now work in IE
2012-05-23 00:52:10 +02:00
dafa44e6b4
I hate how hacky this change is.
2012-05-23 00:51:03 +02:00
b27287ce37
Update src/node/handler/ImportHandler.js
2012-05-23 00:49:12 +02:00
John McLear