Tom Hunkapiller
|
3ebb19d8a2
|
fix an issue in the path handling that allowed directory traversal
|
2015-04-10 20:03:00 -05:00 |
|
John McLear
|
be0a96af6e
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2015-04-11 00:24:30 +01:00 |
|
John McLear
|
15470c9dc3
|
fix chrome test
|
2015-04-11 00:23:06 +01:00 |
|
John McLear
|
402e53d88e
|
Merge pull request #2584 from devoidfury/express4
Express 4 support
|
2015-04-11 00:13:45 +01:00 |
|
John McLear
|
7cb12ac10c
|
Merge pull request #2592 from ether/master
Master
|
2015-04-11 00:05:46 +01:00 |
|
John McLear
|
b95395a130
|
Merge pull request #2590 from ether/release/1.5.3
Release/1.5.3
|
2015-04-11 00:04:45 +01:00 |
|
Stefan
|
d47e201232
|
Merge branch 'develop' of git://github.com/ether/etherpad-lite into release/1.5.3
|
2015-04-11 00:49:26 +02:00 |
|
John McLear
|
8f8303415d
|
Merge pull request #2589 from Gared/add_version_number
Add version number to plugins-info page
|
2015-04-10 23:48:52 +01:00 |
|
Stefan
|
d3277deafc
|
Increase etherpad version to 1.5.3
|
2015-04-11 00:32:18 +02:00 |
|
Stefan
|
db5bdc8719
|
Log version number and git-sha on server start
|
2015-04-11 00:13:04 +02:00 |
|
Stefan
|
8e4c961207
|
Add version number to plugins-info page
|
2015-04-10 23:52:17 +02:00 |
|
John McLear
|
fc60ddded1
|
changelog
|
2015-04-10 22:23:07 +01:00 |
|
John McLear
|
9d4e5f6e35
|
dont allow directory traversal
|
2015-04-10 22:02:22 +01:00 |
|
Tom Hunkapiller
|
fd1d285a77
|
fix the rest of the deprecation warnings
|
2015-04-10 14:18:30 -05:00 |
|
Tom Hunkapiller
|
6fad2ca39a
|
fix vulnerability
|
2015-04-10 06:16:17 -05:00 |
|
Tom Hunkapiller
|
de67714cf8
|
fix minify route path; update deprecated calls
|
2015-04-10 05:52:58 -05:00 |
|
Tom Hunkapiller
|
4385598de6
|
update node version checking to 0.10+ or io.js
|
2015-04-08 23:12:12 -05:00 |
|
Tom Hunkapiller
|
63cbab484d
|
express dropped support for node 0.8; update engine requirements
|
2015-04-08 23:12:11 -05:00 |
|
Tom Hunkapiller
|
d0b39c01fb
|
update for express 4.x
|
2015-04-08 23:12:11 -05:00 |
|
John McLear
|
7b86eb09bc
|
new fix for #1766
|
2015-04-08 09:24:19 +01:00 |
|
John McLear
|
a5345524e1
|
Merge pull request #2566 from ether/editbar-accessibility
Accessibility
|
2015-04-07 21:25:27 +01:00 |
|
John McLear
|
a2e6a1bb4f
|
Merge pull request #2579 from ether/warnings-in-pad-contents
pass error messages to pad text if shown during startup
|
2015-04-07 21:24:47 +01:00 |
|
John McLear
|
7e99724fec
|
Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility
|
2015-04-06 13:19:42 +01: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 |
|
John McLear
|
3a969f8dd8
|
pass error messages to pad text if shown during startup
|
2015-04-06 00:13:38 +01:00 |
|
John McLear
|
e027083136
|
timeslider settings for fonts
|
2015-04-05 15:18:36 +01:00 |
|
John McLear
|
56ce8e80ac
|
hacky fix for opendyslexic
|
2015-04-05 14:50:53 +01:00 |
|
John McLear
|
41bb4ef094
|
support for open dyslexic font
|
2015-04-05 14:03:09 +01:00 |
|
John McLear
|
e49bb4017c
|
use ctrl shift 2 instead of alt a
|
2015-04-05 13:42:26 +01:00 |
|
John McLear
|
db0bcdd696
|
fix issue where focus on timeslider wouldnt work
|
2015-04-05 13:39:20 +01:00 |
|
John McLear
|
b26956be4b
|
Merge pull request #2576 from rdubigny/develop
Fix minor typo in installDeps.sh
|
2015-04-04 18:06:59 +01:00 |
|
Raphaël Dubigny
|
119fc82387
|
Update installDeps.sh
|
2015-04-04 17:30:41 +02:00 |
|
Raphaël Dubigny
|
dfd17d1aba
|
Update installDeps.sh
|
2015-04-04 17:14:59 +02:00 |
|
John McLear
|
c65ddad7d6
|
title for chat
|
2015-04-03 13:06:03 +01:00 |
|
John McLear
|
9090d76dcf
|
temp solution for alt 9 to show editbar label
|
2015-04-03 12:33:31 +01:00 |
|
John McLear
|
f79e2c7de2
|
final accessibility for Timeslider hopefully
|
2015-04-03 12:29:47 +01:00 |
|
John McLear
|
139edceb66
|
Merge branch 'editbar-accessibility' of github.com:ether/etherpad-lite into editbar-accessibility
|
2015-04-02 16:50:43 +01:00 |
|
John McLear
|
85fc012bac
|
change to alt shit and a to show authors
|
2015-04-02 15:13:16 +01:00 |
|
John McLear
|
900595355f
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2015-04-02 13:17:01 +01:00 |
|
John McLear
|
644536b27b
|
fix for #2574
|
2015-04-02 13:16:49 +01:00 |
|
John McLear
|
ee5833b9c6
|
Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility
|
2015-04-02 00:05:25 +01:00 |
|
John McLear
|
f6b4b5603d
|
fix timeslider title issues
|
2015-04-02 00:03:34 +01:00 |
|
John McLear
|
ced2206aa9
|
Merge pull request #2573 from ether/append-chat-api
Append chat api -- includes tests.
|
2015-04-01 13:58:04 +01:00 |
|
John McLear
|
27ae48686d
|
reintroduce removed api points that were removed by mistake
|
2015-04-01 13:56:52 +01:00 |
|
John McLear
|
32a09ff461
|
tests and fix up sloppy code by original author
|
2015-04-01 13:52:56 +01:00 |
|
John McLear
|
c705a058fb
|
Merge branch 'feature/append-chat-api' of github.com:derosm2/etherpad-lite into append-chat-api
|
2015-04-01 13:32:07 +01:00 |
|
John McLear
|
fef746e80e
|
fix import issue with txt files and abiword #2572
|
2015-04-01 00:19:42 +01:00 |
|
John McLear
|
733deb613e
|
fix font type test
|
2015-03-31 23:51:40 +01:00 |
|
John McLear
|
0b90da19d2
|
Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility
|
2015-03-31 23:32:15 +01:00 |