John McLear
|
aefd8d8d0d
|
nice chars n no cruft
|
2013-02-13 18:45:45 +00:00 |
|
John McLear
|
dea892213e
|
Revert "allow non ascii chars in txt export"
This reverts commit be56272e66.
|
2013-02-13 18:41:04 +00:00 |
|
John McLear
|
be56272e66
|
allow non ascii chars in txt export
|
2013-02-13 18:30:55 +00:00 |
|
John McLear
|
d3f730e2ba
|
fix various issues dont stop random *'s appearing
|
2013-02-13 18:01:15 +00:00 |
|
John McLear
|
da246d183d
|
Correct license header
|
2013-02-12 19:47:53 +00:00 |
|
John McLear
|
0b5c948549
|
Move code from Html export to a Helper file
|
2013-02-12 19:45:46 +00:00 |
|
John McLear
|
60ef5f210a
|
remove duplicate code to the best of my ability right now
|
2013-02-10 23:41:14 +00:00 |
|
John McLear
|
28f6d50011
|
remove console warn
|
2013-02-10 22:14:05 +00:00 |
|
John McLear
|
bcf9c23b4e
|
dont use HTML filter hooks on txt export
|
2013-02-10 19:38:16 +00:00 |
|
John McLear
|
626ee97669
|
kinda brutal way of stopping plugins being able to pass *s instead of attributes
|
2013-02-10 19:36:46 +00:00 |
|
John McLear
|
a67a0950dd
|
stop urls being encoded, not sure about other security implications here...
|
2013-02-10 19:21:27 +00:00 |
|
John McLear
|
a378f48c00
|
remove console warns
|
2013-02-10 17:39:02 +00:00 |
|
John McLear
|
d16b15f3eb
|
begin support for better txt output
|
2013-02-10 17:34:34 +00:00 |
|
Marcel Klehr
|
ab04a4e511
|
Merge pull request #1472 from ether/plugin-test-dcs
docs for plugin-defined specs
|
2013-02-09 07:57:33 -08:00 |
|
John McLear
|
bb1d462612
|
plugin test docs
|
2013-02-09 15:45:00 +00:00 |
|
Marcel Klehr
|
5f79546c2a
|
Merge pull request #1465 from mluto/kill-ep-stuff
Removing old etherpad code
|
2013-02-08 13:21:57 -08:00 |
|
mluto
|
f2cd9e3adc
|
Removed sidebar-code since the sidebar got removed in EPL, there is only the stickychat which is not affected by this.
|
2013-02-08 22:06:28 +01:00 |
|
mluto
|
e6454af5ed
|
Removed fullWidth/resizing-code as the pad is always fullscreen, unlike the old EP
|
2013-02-08 22:00:17 +01:00 |
|
John McLear
|
af022c8427
|
Merge pull request #1468 from mluto/fix-timeslider-test
Fix the "jumps to a revision given in the url"-test
|
2013-02-07 08:38:36 -08:00 |
|
mluto
|
ae6a9c25ae
|
Fixed "jumps to a revision given in the url" test
|
2013-02-07 17:34:31 +01:00 |
|
John McLear
|
f65ad93fb9
|
Merge pull request #1467 from ether/fix-timeslider-tests
fix timeslider tests
|
2013-02-07 07:52:13 -08:00 |
|
John McLear
|
8c0fb090eb
|
works in all 3 major browsers
|
2013-02-07 15:50:59 +00:00 |
|
John McLear
|
52afe86377
|
Merge branch 'develop' of github.com:ether/etherpad-lite into fix-timeslider-tests
|
2013-02-07 15:27:43 +00:00 |
|
John McLear
|
f42d3820a5
|
fix timeslider tests
|
2013-02-07 15:24:30 +00:00 |
|
John McLear
|
ea04e9c997
|
Merge pull request #1466 from mluto/timeslider-remove-debugging
Removed debug code from Timeslider
|
2013-02-07 06:36:30 -08:00 |
|
mluto
|
fc60ab24fa
|
Removed debug code, moved hash-setting after the param-checking
|
2013-02-07 15:34:10 +01:00 |
|
mluto
|
0d5b98a338
|
Removed isProPad, since all pads are public except for group-pads
|
2013-02-07 14:30:09 +01:00 |
|
mluto
|
0cbd4034b1
|
Killed pad_docbar.js as it's from the old etherpad and not used
|
2013-02-07 13:59:41 +01:00 |
|
John McLear
|
889cec8f7c
|
Merge pull request #1464 from mluto/old-chat-code
Removed some old chat-code
|
2013-02-07 04:12:46 -08:00 |
|
mluto
|
6e8dcee650
|
Removed old chat-code
|
2013-02-07 11:15:16 +01:00 |
|
John McLear
|
e78879c300
|
Merge pull request #1461 from ether/slider-nan
stop slider showing NaN on tiny pads
|
2013-02-06 15:45:39 -08:00 |
|
John McLear
|
7bf8dad6f9
|
Merge pull request #1460 from ether/timeslider-labels
timeslider label tests, fix and fix firefox page up down
|
2013-02-06 15:43:54 -08:00 |
|
John McLear
|
488ebc20a4
|
Merge pull request #1446 from ether/allow-plugins-to-specify-specs
Allow plugins to specify specs
|
2013-02-06 15:43:39 -08:00 |
|
John McLear
|
a9436f290a
|
Merge pull request #1457 from ether/fix-IE8-error
fixes IE8 error by only redifining if firefox
|
2013-02-06 15:43:18 -08:00 |
|
John McLear
|
284748adb7
|
stop slider showing NaN on tiny pads
|
2013-02-06 23:35:58 +00:00 |
|
John McLear
|
e4032f4d74
|
timeslider label tests
|
2013-02-06 23:28:46 +00:00 |
|
John McLear
|
adaded343d
|
better fix for IE8 page up down
|
2013-02-06 20:09:30 +00:00 |
|
root
|
9fcabfa8ac
|
fix IE8 styling y u no do this 0ip?
|
2013-02-06 20:02:24 +00:00 |
|
John McLear
|
dd49c71af9
|
fixes IE8 error by only redifining if firefox
|
2013-02-06 19:43:28 +00:00 |
|
John McLear
|
5b31030958
|
Merge pull request #1454 from dmitryuv/feature/socketio-rooms
socket.io rooms instead of own session management
|
2013-02-05 16:09:25 -08:00 |
|
Dmitry
|
34f9f15150
|
socket.io rooms instead of own session management
Replaces homegrown pad session management with socket.io build-in rooms
|
2013-02-05 23:33:44 +04:00 |
|
John McLear
|
a5fb1e33de
|
Merge pull request #1447 from jhollinger/develop
Bugfixes to getChatHistory API method
|
2013-02-04 07:07:47 -08:00 |
|
Jordan Hollinger
|
718421a46d
|
Bugfixes to getChatHistory API method
|
2013-02-04 00:57:51 -05:00 |
|
John McLear
|
de07d5a3e1
|
make plugin specs finally work
|
2013-02-04 00:03:25 +00:00 |
|
John McLear
|
da0b331502
|
Make async and cleaner
|
2013-02-04 00:00:39 +00:00 |
|
Peter 'Pita' Martischka
|
eaa835630c
|
Support Page Up and Page Down in ace
|
2013-02-03 17:39:49 +00:00 |
|
Peter 'Pita' Martischka
|
cba001341f
|
Remove legacy mozilla specific code from ace inner
|
2013-02-03 14:03:10 +00:00 |
|
John McLear
|
8b8cf01785
|
put tests in static folder, still have a race condition no biggy
|
2013-02-03 13:53:44 +00:00 |
|
Peter 'Pita' Martischka
|
d30daccb10
|
Don't handle selections that are not from the inner frame
|
2013-02-03 13:44:37 +00:00 |
|
John McLear
|
0ff9f53297
|
correct path
|
2013-02-03 00:18:24 +00:00 |
|