libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5078 commits 2 branches 0 tags 24 MiB
Commit graph

209 commits

Author SHA1 Message Date
Stefan
1b9a51c879 Release version 1.5.4 2015-04-11 10:19:02 +02:00
John McLear
402e53d88e Merge pull request #2584 from devoidfury/express4 
Express 4 support
 2015-04-11 00:13:45 +01:00
Stefan
d3277deafc Increase etherpad version to 1.5.3 2015-04-11 00:32:18 +02:00
Tom Hunkapiller
d0b39c01fb update for express 4.x 2015-04-08 23:12:11 -05:00
John McLear
a5aa58e28b bump ueber 2015-04-06 13:18:44 +01:00
John McLear
e0270d0ba8 bump vs 2015-04-06 13:16:21 +01:00
Simon Gaeremynck
9bde17b91c Bumped ueberDB to 0.2.14 so Cassandra suport is included 2015-03-22 12:27:54 +00:00
John McLear
4e0353b3ef bump ueber 2015-03-02 08:59:53 +00:00
John McLear
38a4f1be5f bump ueberdb 2015-02-26 12:14:01 +00:00
John McLear
e39b442840 bump v for #2505 fix 2015-02-13 01:25:29 +00:00
John McLear
b9802616b6 use latest cleanCSS 2015-02-04 17:57:34 +00:00
John McLear
9afcd89167 bump versions to see if it's stable 2015-02-04 17:52:27 +00:00
John McLear
b6e7ddf874 bump v 2015-01-26 16:11:15 +00:00
John McLear
7237a3b7cc bump ueberdb 2015-01-21 14:58:47 +00:00
John McLear
531d25ab84 freeze deps 2015-01-20 23:50:55 +00:00
John McLear
73d6030762 boop 2015-01-19 00:36:12 +00:00
John McLear
c0a4051b7a use etherpads own yajsml 2015-01-18 20:12:02 +00:00
John McLear
a553b44dbc refix plugins 2015-01-11 23:59:18 +00:00
Timothy Gu
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
John McLear
f2c443809f roll ejs back as its broken at v2 2015-01-07 15:18:54 +00:00
John McLear
45e90e138c v number bump 2015-01-01 16:57:31 +00:00
John McLear
ee3f3b8060 move clean css back to fix minification on TS 2014-12-21 23:42:56 +00:00
John McLear
12f25d8a45 bump cleancss 2014-11-29 01:31:04 +00:00
John McLear
74ffbdea79 bump vs 2014-11-28 18:02:11 +00:00
John McLear
3224122f7e correct kernel v# 2014-11-28 17:47:55 +00:00
John McLear
3bf9f3cf1d Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change 2014-11-28 17:43:01 +00:00
John McLear
61c6deda2e use a forked require-kernel 2014-11-27 02:44:48 +00:00
John McLear
cff8f4a61e remember to add supertest 2014-11-26 21:58:27 +00:00
John McLear
88b3d99fbd Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests 2014-11-26 15:33:13 +00:00
John McLear
a4be5b4fd7 mocha version 2014-11-26 01:03:57 +00:00
John McLear
ad7de8277d mocha 2014-11-25 22:12:25 +00:00
John McLear
60d44cd3df use cheerio instead of jsdom 2014-11-25 17:26:09 +00:00
John McLear
4986dd11ee merging 2014-11-15 15:39:46 +00:00
John McLear
cce2d7279a resolve merge issues 2014-11-15 15:34:18 +00:00
John McLear
3eb0652b21 fix pg 2014-11-06 16:38:31 +00:00
John McLear
57f56d8fe1 bump express to a working version 2014-11-04 23:42:40 +00:00
John McLear
b61d8d99d1 Update package.json 2014-11-03 17:15:22 +00:00
John McLear
a67e805da0 basics, still not working 2014-11-01 21:25:49 +00:00
John McLear
124ae31137 blah push back for imports 2014-11-01 21:15:31 +00:00
John McLear
ff549db261 use latest jsdom 2014-11-01 20:58:56 +00:00
John McLear
4b488bc8af Merge pull request #2116 from jdittrich/updateUnderscore 
Underscore Version: Update package.json
 2014-11-01 16:37:00 +00:00
John McLear
41b7f99204 Bump resolve 
Update dep fixes https://github.com/ether/etherpad-lite/issues/2050
 2014-11-01 16:25:14 +00:00
John McLear
51b9af9df0 bump ueberdb again 2014-10-30 16:12:17 +00:00
John McLear
cd8ea040ad bump ueber to require working mysql 2014-10-30 14:41:21 +00:00
John McLear
f104644297 Fix for MySQL issues 
See https://github.com/Pita/ueberDB/issues/63
 2014-10-29 12:15:53 +00:00
John McLear
226e0bf0e3 bump resolve 2014-10-14 14:41:18 +01:00
John McLear
9c2f8808be bump swagger 2014-10-14 14:38:47 +01:00
John McLear
09acdda4f7 bump semver 2014-10-14 14:37:57 +01:00
John McLear
2530bf0a86 add changelog and bump v number 2014-09-06 17:25:09 +01:00
John McLear
37f6dde365 bump ueberdb for more performance on mysql 2014-05-21 13:20:39 +01:00
jdittrich
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
John McLear
e23af7e439 changelog, package file and fix for redo 2014-03-26 15:44:04 +00:00
vvision
eb32835ea1 Updated npm version. 2014-02-24 13:29:21 +01:00
s1341
5181b3e467 add josnminify to package.json 2013-11-26 10:28:33 +02:00
Marcel Klehr
7b84e7308b Merge branch 'metrics' into develop 
Conflicts:
	src/node/handler/PadMessageHandler.js
 2013-10-28 12:11:25 +01:00
Marcel Klehr
940f114a84 Record metrics with 'measured' 2013-10-27 17:42:55 +01:00
Marcel Klehr
e8c69a5474 Update changelog and bump version 2013-10-21 20:18:16 +02:00
Marcel Klehr
74bc2bd761 Prepare release 2013-10-12 14:16:06 +02:00
John McLear
98a9a24d02 repo url as latest npm shows warn if non existant 2013-06-26 20:19:38 +01:00
John McLear
ba1a5da76d bump and changelog 2013-06-24 13:35:17 +01:00
dummys
8278ef3c7c added log4js 0.6.6 2013-06-13 15:10:32 +02:00
John McLear
2273cf9ed6 Merge pull request #1740 from ether/feature/add-cs-queue 
add a changeset queue
 2013-04-28 13:58:08 -07:00
Marcel Klehr
2c855de6f6 Add a server-side changeset queue per pad 
fixes #1573
 2013-04-27 23:04:42 +02:00
John McLear
e7a80b7b77 still express is stuck at 3.1.0 2013-04-16 00:12:11 +01:00
John McLear
9a863824c9 update connect and express 2013-04-15 19:06:22 +01:00
John McLear
2c8699506d push express back as it breaks sessions 2013-04-15 12:21:10 +01:00
Marcel Klehr
e8d953a15c Use the correct version number 2013-04-11 19:08:07 +03:00
John McLear
f4123d2904 bump v and readme 2013-04-11 17:04:54 +01:00
John McLear
7492fb18a4 version bump 2013-04-06 14:29:21 +01:00
Marcel Klehr
04a53c4402 Merge branch 'feature/support-node-0.10' into develop 
Conflicts:
	src/package.json
 2013-04-01 13:29:07 +02:00
Marcel Klehr
98f00e293c Update ueberDB to add support for node 0.10.x 2013-04-01 13:27:06 +02:00
Marcel Klehr
b297784288 Make npm registry access code more sane 2013-03-25 16:51:12 +01:00
Marcel Klehr
ef7fb5c7f0 Update npm 2013-03-25 12:18:06 +01:00
Simon Gaeremynck
cbde18945c Bumped the ueberDB package version to 0.1.96 to add in Cassandra support. 2013-03-22 15:22:17 +00:00
Marcel Klehr
cb45c44b4d Merge pull request #1588 from disy-mk/patch-2 
fix #1586
 2013-03-19 08:47:26 -07:00
John McLear
e49620ea07 update ueber for pg 2013-03-18 21:36:50 +00:00
Marcel Klehr
54433db47f release v1.2.9 2013-03-15 21:43:29 +01:00
John McLear
0b16d96c97 Merge pull request #1527 from nelsonsilva/swagger 
Initial work on new swagger based REST API
 2013-03-07 08:07:46 -08:00
John McLear
0c9214bb27 bump v and changelog 2013-03-06 15:08:27 +00:00
Nelson Silva
1cfc8eda19 Initial work on swagger 2013-03-06 10:10:21 +00:00
Manuel Knitza
67a0730710 added nodemailer to package.json - fix #1586 2013-03-05 21:28:38 +01:00
John McLear
3dee4098b0 update ueberdb 2013-03-05 13:24:24 +00:00
John McLear
a4e5adab3e Update Ueber DB to fix MySQL Bug! 2013-02-13 02:47:24 +00:00
John McLear
9c54f024aa Bump to latest ueber to support sqlite 2013-02-12 13:15:57 +00:00
Peter 'Pita' Martischka
17a02bb024 Merge branch 'develop' of github.com:ether/etherpad-lite into dep-cleanup 2013-02-10 22:41:49 +00:00
Peter 'Pita' Martischka
b0f555e669 Revert "no longer dep on npm as it's native" 
This reverts commit 85f18d1f92.
 2013-02-10 22:26:39 +00:00
John McLear
d7992a1366 begin putting files together for a release 2013-02-10 21:13:51 +00:00
John McLear
69a6d5468e a bit fairer 2013-02-10 17:53:17 +00:00
John McLear
85f18d1f92 no longer dep on npm as it's native 2013-02-10 03:39:20 +00:00
John McLear
f617cefe54 no need for jshint and update wd 2013-02-10 03:30:08 +00:00
John McLear
594d53ee8b changelog and package file 2013-01-30 14:58:23 +00:00
John McLear
4b5d993f0d bump v and create CHANGELOG 2013-01-20 13:45:16 +00:00
Thomas Weißschuh
9ee5098ad6 listAllPads needs findKeys from ueberDB 0.1.9 2013-01-19 19:17:52 +00:00
John McLear
96989e63c7 prepare for release 2013-01-18 13:30:46 +00:00
mluto
27c5498c54 Require ueberDB 0.1.9, not 0.1.8; this is needed for findKeys 2013-01-14 23:22:12 +01:00
John McLear
fadfa6772e changelog and package file 2013-01-07 19:31:29 +00:00
Marcel Klehr
53459fe160 release v1.2.3 2012-12-31 15:57:16 +01:00
John McLear
b681359dfa bump version # in package and update CHANGELOG 2012-12-27 20:09:14 +00:00
Iván Eixarch
5f949b8457 Update language4translatewiki 0.1.3 2012-12-04 12:12:58 +01:00
Iván Eixarch
795a20b3f2 get languages availables through translatewiki API 2012-11-28 23:54:23 +01:00