Commit graph

153 commits

Author SHA1 Message Date
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