64d94cb346
Release version 1.5.5
2015-04-13 17:27:14 +02:00
4d009ba445
bump underscore and require kernel
2015-04-11 11:32:46 +01:00
2ca0214661
bump versions outdated
2015-04-11 10:24:50 +01:00
a69b2a9cd1
Merge pull request #2596 from ether/master
...
Master
2015-04-11 10:55:26 +02:00
acc1a0626a
use latest ejs
2015-04-11 09:53:27 +01:00
1b9a51c879
Release version 1.5.4
2015-04-11 10:19:02 +02:00
402e53d88e
Merge pull request #2584 from devoidfury/express4
...
Express 4 support
2015-04-11 00:13:45 +01:00
d3277deafc
Increase etherpad version to 1.5.3
2015-04-11 00:32:18 +02:00
d0b39c01fb
update for express 4.x
2015-04-08 23:12:11 -05:00
a5aa58e28b
bump ueber
2015-04-06 13:18:44 +01:00
e0270d0ba8
bump vs
2015-04-06 13:16:21 +01:00
9bde17b91c
Bumped ueberDB to 0.2.14 so Cassandra suport is included
2015-03-22 12:27:54 +00:00
4e0353b3ef
bump ueber
2015-03-02 08:59:53 +00:00
38a4f1be5f
bump ueberdb
2015-02-26 12:14:01 +00:00
e39b442840
bump v for #2505 fix
2015-02-13 01:25:29 +00:00
b9802616b6
use latest cleanCSS
2015-02-04 17:57:34 +00:00
9afcd89167
bump versions to see if it's stable
2015-02-04 17:52:27 +00:00
b6e7ddf874
bump v
2015-01-26 16:11:15 +00:00
7237a3b7cc
bump ueberdb
2015-01-21 14:58:47 +00:00
531d25ab84
freeze deps
2015-01-20 23:50:55 +00:00
73d6030762
boop
2015-01-19 00:36:12 +00:00
c0a4051b7a
use etherpads own yajsml
2015-01-18 20:12:02 +00:00
a553b44dbc
refix plugins
2015-01-11 23:59:18 +00:00
9b9a747167
Support ejs 2.0
...
Fixes #2437 .
This is still relying on undocumented behavior, but should unbreak the app
in the mean time.
2015-01-11 08:17:17 -08:00
f2c443809f
roll ejs back as its broken at v2
2015-01-07 15:18:54 +00:00
45e90e138c
v number bump
2015-01-01 16:57:31 +00:00
ee3f3b8060
move clean css back to fix minification on TS
2014-12-21 23:42:56 +00:00
12f25d8a45
bump cleancss
2014-11-29 01:31:04 +00:00
74ffbdea79
bump vs
2014-11-28 18:02:11 +00:00
3224122f7e
correct kernel v#
2014-11-28 17:47:55 +00:00
3bf9f3cf1d
Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change
2014-11-28 17:43:01 +00:00
61c6deda2e
use a forked require-kernel
2014-11-27 02:44:48 +00:00
cff8f4a61e
remember to add supertest
2014-11-26 21:58:27 +00:00
88b3d99fbd
Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests
2014-11-26 15:33:13 +00:00
a4be5b4fd7
mocha version
2014-11-26 01:03:57 +00:00
ad7de8277d
mocha
2014-11-25 22:12:25 +00:00
60d44cd3df
use cheerio instead of jsdom
2014-11-25 17:26:09 +00:00
4986dd11ee
merging
2014-11-15 15:39:46 +00:00
cce2d7279a
resolve merge issues
2014-11-15 15:34:18 +00:00
3eb0652b21
fix pg
2014-11-06 16:38:31 +00:00
57f56d8fe1
bump express to a working version
2014-11-04 23:42:40 +00:00
b61d8d99d1
Update package.json
2014-11-03 17:15:22 +00:00
a67e805da0
basics, still not working
2014-11-01 21:25:49 +00:00
124ae31137
blah push back for imports
2014-11-01 21:15:31 +00:00
ff549db261
use latest jsdom
2014-11-01 20:58:56 +00:00
4b488bc8af
Merge pull request #2116 from jdittrich/updateUnderscore
...
Underscore Version: Update package.json
2014-11-01 16:37:00 +00:00
41b7f99204
Bump resolve
...
Update dep fixes https://github.com/ether/etherpad-lite/issues/2050
2014-11-01 16:25:14 +00:00
51b9af9df0
bump ueberdb again
2014-10-30 16:12:17 +00:00
cd8ea040ad
bump ueber to require working mysql
2014-10-30 14:41:21 +00:00
f104644297
Fix for MySQL issues
...
See https://github.com/Pita/ueberDB/issues/63
2014-10-29 12:15:53 +00:00
226e0bf0e3
bump resolve
2014-10-14 14:41:18 +01:00
9c2f8808be
bump swagger
2014-10-14 14:38:47 +01:00
09acdda4f7
bump semver
2014-10-14 14:37:57 +01:00
2530bf0a86
add changelog and bump v number
2014-09-06 17:25:09 +01:00
37f6dde365
bump ueberdb for more performance on mysql
2014-05-21 13:20:39 +01:00
a4f2ebe57e
Update package.json
...
updated the underscore version number to 1.5.1 (from 1.3.1). Not lifted to most current version because frontend tests broke from 1.5.2 upwards.
2014-03-26 18:22:41 +01:00
e23af7e439
changelog, package file and fix for redo
2014-03-26 15:44:04 +00:00
eb32835ea1
Updated npm version.
2014-02-24 13:29:21 +01:00
5181b3e467
add josnminify to package.json
2013-11-26 10:28:33 +02:00
7b84e7308b
Merge branch 'metrics' into develop
...
Conflicts:
src/node/handler/PadMessageHandler.js
2013-10-28 12:11:25 +01:00
940f114a84
Record metrics with 'measured'
2013-10-27 17:42:55 +01:00
e8c69a5474
Update changelog and bump version
2013-10-21 20:18:16 +02:00
74bc2bd761
Prepare release
2013-10-12 14:16:06 +02:00
98a9a24d02
repo url as latest npm shows warn if non existant
2013-06-26 20:19:38 +01:00
ba1a5da76d
bump and changelog
2013-06-24 13:35:17 +01:00
8278ef3c7c
added log4js 0.6.6
2013-06-13 15:10:32 +02:00
2273cf9ed6
Merge pull request #1740 from ether/feature/add-cs-queue
...
add a changeset queue
2013-04-28 13:58:08 -07:00
2c855de6f6
Add a server-side changeset queue per pad
...
fixes #1573
2013-04-27 23:04:42 +02:00
e7a80b7b77
still express is stuck at 3.1.0
2013-04-16 00:12:11 +01:00
9a863824c9
update connect and express
2013-04-15 19:06:22 +01:00
2c8699506d
push express back as it breaks sessions
2013-04-15 12:21:10 +01:00
e8d953a15c
Use the correct version number
2013-04-11 19:08:07 +03:00
f4123d2904
bump v and readme
2013-04-11 17:04:54 +01:00
7492fb18a4
version bump
2013-04-06 14:29:21 +01:00
04a53c4402
Merge branch 'feature/support-node-0.10' into develop
...
Conflicts:
src/package.json
2013-04-01 13:29:07 +02:00
98f00e293c
Update ueberDB to add support for node 0.10.x
2013-04-01 13:27:06 +02:00
b297784288
Make npm registry access code more sane
2013-03-25 16:51:12 +01:00
ef7fb5c7f0
Update npm
2013-03-25 12:18:06 +01:00
cbde18945c
Bumped the ueberDB package version to 0.1.96 to add in Cassandra support.
2013-03-22 15:22:17 +00:00
cb45c44b4d
Merge pull request #1588 from disy-mk/patch-2
...
fix #1586
2013-03-19 08:47:26 -07:00
e49620ea07
update ueber for pg
2013-03-18 21:36:50 +00:00
54433db47f
release v1.2.9
2013-03-15 21:43:29 +01:00
0b16d96c97
Merge pull request #1527 from nelsonsilva/swagger
...
Initial work on new swagger based REST API
2013-03-07 08:07:46 -08:00
0c9214bb27
bump v and changelog
2013-03-06 15:08:27 +00:00
1cfc8eda19
Initial work on swagger
2013-03-06 10:10:21 +00:00
67a0730710
added nodemailer to package.json - fix #1586
2013-03-05 21:28:38 +01:00
3dee4098b0
update ueberdb
2013-03-05 13:24:24 +00:00
a4e5adab3e
Update Ueber DB to fix MySQL Bug!
2013-02-13 02:47:24 +00:00
9c54f024aa
Bump to latest ueber to support sqlite
2013-02-12 13:15:57 +00:00
17a02bb024
Merge branch 'develop' of github.com:ether/etherpad-lite into dep-cleanup
2013-02-10 22:41:49 +00:00
b0f555e669
Revert "no longer dep on npm as it's native"
...
This reverts commit 85f18d1f92
2013-02-10 22:26:39 +00:00
d7992a1366
begin putting files together for a release
2013-02-10 21:13:51 +00:00
69a6d5468e
a bit fairer
2013-02-10 17:53:17 +00:00
85f18d1f92
no longer dep on npm as it's native
2013-02-10 03:39:20 +00:00
f617cefe54
no need for jshint and update wd
2013-02-10 03:30:08 +00:00
594d53ee8b
changelog and package file
2013-01-30 14:58:23 +00:00
4b5d993f0d
bump v and create CHANGELOG
2013-01-20 13:45:16 +00:00
9ee5098ad6
listAllPads needs findKeys from ueberDB 0.1.9
2013-01-19 19:17:52 +00:00
96989e63c7
prepare for release
2013-01-18 13:30:46 +00:00
27c5498c54
Require ueberDB 0.1.9, not 0.1.8; this is needed for findKeys
2013-01-14 23:22:12 +01:00
fadfa6772e
changelog and package file
2013-01-07 19:31:29 +00:00
53459fe160
release v1.2.3
2012-12-31 15:57:16 +01:00
b681359dfa
bump version # in package and update CHANGELOG
2012-12-27 20:09:14 +00:00
5f949b8457
Update language4translatewiki 0.1.3
2012-12-04 12:12:58 +01:00
795a20b3f2
get languages availables through translatewiki API
2012-11-28 23:54:23 +01:00
9ec8a6e3d3
back to globalize... don't work :S
2012-11-28 04:02:55 +01:00
6fe6103632
added languages for translatewiki
2012-11-26 23:40:31 +01:00
1899e3f48d
Merge pull request #1197 from hcartiaux/urlfix
...
Fix urls, use github.com/ether
2012-11-21 16:22:21 -08:00
d6027726e6
Fix urls, use github.com/ether
...
Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
2012-11-22 01:12:30 +01:00
064051a30d
Bump stuff to 1.2.1
2012-11-21 18:20:54 +00:00
1e71797ad5
Replace Globalize with languages module
2012-11-20 19:46:17 +01:00
6d2391dba6
Fix version number in changelog and package.json
2012-11-14 22:02:40 +01:00
ae2fee8be8
Sigh. I must have forgotten to commit this..
...
Apologies.
2012-11-14 19:38:17 +00:00
8b50f194a3
fix README to use ether/
2012-11-14 19:26:37 +00:00
2657f06887
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/i18n
2012-11-14 10:19:52 +00:00
5b23e99d8c
resolve #1044
...
https://github.com/Pita/etherpad-lite/issues/1044
2012-11-13 19:23:55 +00:00
6de7634357
merged develop back in
2012-11-13 07:43:48 -08:00
a3504f70c4
Add i18n component
2012-11-10 14:12:17 +01:00
d6d07570bf
added webdriver to npm dependencies
2012-11-01 22:03:51 +00:00
12bd520846
bump version #
2012-10-30 13:51:29 +00:00
78e64ffea8
Mimic, replace or work around removed npm utils.
2012-10-28 18:34:20 +01:00
58d559b962
fix marcels trailing ,
2012-10-25 05:24:42 -07:00
9582881278
Merge pull request #1088 from marcelklehr/fix/update-npm
...
Update npm
2012-10-25 05:21:11 -07:00
ff2824ae7a
Add "Marcel Klehr" to contributers list
2012-10-25 13:45:40 +02:00
1bc9d61027
Update npm ( fix #1012 )
2012-10-25 13:38:28 +02:00
b7d0751b18
couch, level, mongo, postgres, redis DB support
...
Support for additional underlying databases
2012-10-15 13:09:55 +02:00
c45739becb
Update src/package.json
...
Bump version #
2012-10-11 23:38:56 +02:00
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
Stefan