a97c63b809
Fix issue caused by broken async update
2012-10-04 18:53:02 +01:00
66475f32f3
Merge pull request #1003 from Pita/express-v3
...
Upgrade Express to v3 [proposal]
2012-10-03 06:25:44 -07:00
2684a1d295
Merge branch 'develop' into express-v3
...
Conflicts:
src/node/hooks/express/errorhandling.js
2012-10-03 10:09:00 +02:00
b29fc11e9d
Upgrade to Yajsml bug fix.
2012-10-02 19:57:23 -07:00
0c9c1f514f
Fix socket.io auth: Use connect to parse signed cookies (migrate to express v3)
2012-09-22 16:03:40 +02:00
49915dfeb8
Upgrade to Yajsml with another Windows backslash fix.
2012-09-21 22:09:44 -07:00
ff7cf991c9
Upgrade log4js to v0.5
2012-09-21 21:39:08 +02:00
6f37de2fae
Update src/package.json
...
Bump to v 1.1.2
2012-09-14 17:33:45 +02:00
603f251824
error handling and close is removed in express 3
2012-09-12 19:34:33 +01:00
03bcd07741
Use packaged version of Tinycon.
2012-09-09 18:18:59 -07:00
1541237654
Use packaged version of UNorm.
2012-09-09 18:18:59 -07:00
b47f6ae905
Use packaged edition of security module.
2012-09-09 18:18:59 -07:00
67088e5b7f
upd version resolve
2012-08-18 01:03:18 +02:00
da30c8983a
fix issue #955 : upd resolve library to 0.2.3
2012-08-17 00:45:02 +02:00
cb0066f7b4
Update socket.io
2012-08-07 19:40:45 +02:00
cd11717b99
Eliminate the loopback that has been causing so much trouble.
...
`localhost`, `0.0.0.0`, `127.0.0.1` each works only in some places some of the time, this works around the problem by overriding Yajsml's built-in request mechanism in favor of a hacked together one. TODO: Serve files from another service, or directly from the file system in order to make this unnecessary.
Fixes #747
2012-07-22 23:55:07 -07:00
42bbbd426f
Add latest versions of async, express and connect.
2012-07-05 18:11:18 +02:00
23075138b9
Lock down npm version to avaoid bug in later version
2012-06-12 11:03:09 -04:00
4680bfaee8
Upgrade yajsml version.
...
Fixes parent-relative redirects and prints results more nicely.
2012-05-14 18:14:50 -07:00
c70d88eedc
Merge pull request #667 from fourplusone/feature/cleaner_code
...
Removing unused code - All looks good, some minor tweeks are probably worthwhile in the future.
2012-05-13 06:51:58 -07:00
c406d076de
Updated socket.io
2012-05-02 19:12:57 +03:00
d554420f57
Remove my fix and allow @redhogs to be the proper one.. (even though it's exactly the same thing)
2012-04-21 01:23:13 +02:00
3798f53f94
Merge pull request #660 from redhog/master
...
Unbreak last pull request (I forgot a dependency)
2012-04-20 16:21:04 -07:00
d08f3ff5ee
Bugfix dependencies
2012-04-21 01:17:27 +02:00
16edda7d46
luke warm fix.
2012-04-21 00:16:10 +02:00
6fc45d6252
added etherpad-lite to "bin" in package.json
2012-04-20 17:00:32 +02:00
ac36a99a72
More general basic auth
2012-04-19 14:25:12 +02:00
b2173a1084
get rid of node.extend (since duplicated by underscorejs)
2012-04-04 09:40:18 +02:00
6120a0b7aa
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
2012-03-27 22:36:48 +02:00
c591efb352
Plugin list can now be reloaded 'live'
2012-03-19 17:16:49 +01:00
e559df18ce
use underscore.js
2012-03-17 13:38:26 +01:00
5f7f382a9e
Merge branch 'master' into eejs
2012-03-13 17:51:42 +01:00
6fb0e00f03
Bugfixes for eejs
2012-03-13 17:31:40 +01:00
ddda347f7a
Merge branch 'require-paths' into plugin
...
Conflicts:
node/server.js
src/static/js/Changeset.js
src/static/js/ace.js
src/static/js/ace2_common.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/changesettracker.js
src/static/js/chat.js
src/static/js/collab_client.js
src/static/js/contentcollector.js
src/static/js/domline.js
src/static/js/linestylefilter.js
src/static/js/pad.js
src/static/js/pad_connectionstatus.js
src/static/js/pad_docbar.js
src/static/js/pad_editbar.js
src/static/js/pad_editor.js
src/static/js/pad_impexp.js
src/static/js/pad_modals.js
src/static/js/pad_savedrevs.js
src/static/js/pad_userlist.js
src/static/js/pad_utils.js
src/static/js/timeslider.js
src/static/js/undomodule.js
src/static/pad.html
src/static/timeslider.html
2012-03-10 15:08:09 -08:00
ce5d2d8685
Merge branch 'pita'
...
Resolved conflicts:
.gitignore
src/static/js/ace.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/domline.js
src/static/pad.html
src/static/timeslider.html
Ignored conflicts (please merge manually later):
node/server.js
src/node/utils/Minify.js
2012-03-02 22:00:20 +01:00
da52353ba3
The big rename of pluginbs from pluginomatic to ep
2012-02-26 13:54:32 +01:00
1239ce7f28
The Big Renaming - etherpad is now an NPM module
2012-02-26 13:07:51 +01:00
johnyma22