f2891e3b8b
working
2015-01-21 14:55:29 +00:00
ce40cacafa
mheh looks fixed
2015-01-21 14:49:06 +00:00
990e14c904
working with a big hack
2015-01-21 14:25:24 +00:00
34d6b31c98
some sanity
2015-01-21 13:24:21 +00:00
f880b0feb7
clean up iojs
2015-01-21 12:18:38 +00:00
eacf1118f8
blind attempt to try
2015-01-21 02:55:03 +00:00
ee48b8b93a
Merge pull request #2479 from ether/export-privacy
...
Export privacy
2015-01-21 01:20:51 +00:00
cbeb464358
ie now uses keydown
2015-01-21 01:16:12 +00:00
cb65224997
better logic for author handling
2015-01-21 00:28:00 +00:00
5f9bbd0666
restrict expor4t to only expose this pad ID
2015-01-21 00:03:39 +00:00
9e8bad021c
Merge pull request #2478 from ether/static-deps
...
freeze deps
2015-01-20 23:52:01 +00:00
531d25ab84
freeze deps
2015-01-20 23:50:55 +00:00
b8af62fdef
Add subdirectory installation instructions
...
Out of the box, etherpad-lite does not work correctly if cloned/installed into a subdirectory within an existing project. To do so, a few minor tweaks to the installation process are necessary which are documented here.
2015-01-20 10:53:52 -05:00
84638a39b7
Merge pull request #2469 from ether/new-sethtml-tests
...
I need to do some more work on this at some point.. Leaving here
2015-01-19 15:51:37 +00:00
860c584b42
remove pointless comments
2015-01-19 15:44:16 +00:00
5967e085b7
fix ul tests
2015-01-19 15:37:29 +00:00
f31b2fc9b5
Merge pull request #2471 from ether/ie-fix-backspace
...
Ie fix backspace
2015-01-19 15:16:55 +00:00
c315defc31
temp bodge fix
2015-01-19 15:15:52 +00:00
ab71bc7c20
hrm
2015-01-19 14:45:49 +00:00
edbeb66d5e
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-01-19 14:33:17 +00:00
44d1d6cc13
fix ie editing
2015-01-19 14:32:58 +00:00
4ab4c9998b
Merge pull request #2470 from cetra3/timeslider_proxy_fix
...
Timeslider proxy fix
2015-01-19 13:32:03 +00:00
28aeeff154
Localisation updates from https://translatewiki.net .
2015-01-19 09:28:03 +01:00
f1c9c58c2d
Update to timeslider to include base path for easier proxying
2015-01-19 14:28:30 +10:30
3649118194
Update to timeslider to include base path for easier proxying
2015-01-19 14:25:06 +10:30
3463b16d1a
nearly there...
2015-01-19 03:04:23 +00:00
7958f3b723
nearly fully working
2015-01-19 03:02:34 +00:00
4f637befeb
more fixing
2015-01-19 02:59:17 +00:00
85fffbe14c
more handling
2015-01-19 02:57:10 +00:00
cadb83ac5a
bumpage
2015-01-19 02:51:32 +00:00
13eff60dfe
mheh I suck at css 0ip would do a way better job of this
2015-01-19 02:13:34 +00:00
63c65f784b
semi working example
2015-01-19 01:45:49 +00:00
73d6030762
boop
2015-01-19 00:36:12 +00:00
33c62329ba
better regexp for line items
2015-01-19 00:28:32 +00:00
0bd7914c3b
dont paste on middle click of link
2015-01-18 23:58:47 +00:00
6bc74a9adb
more export logic handling
2015-01-18 23:33:29 +00:00
e50ea6ffea
whoops proper regexp fix for listNumber
2015-01-18 23:24:20 +00:00
bd9ff770fe
reset all numbers on first item
2015-01-18 23:21:34 +00:00
ce41bcea2f
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-01-18 23:17:06 +00:00
af70902bef
support deeper nested elements on exports
2015-01-18 23:16:58 +00:00
cbdfea9d16
Merge pull request #2466 from ether/remove-infinite
...
remove infinite load was causing pain
2015-01-18 23:04:55 +00:00
7e69bc65ce
remove infinite load was causing pain
2015-01-18 23:03:54 +00:00
689ced8443
and this one..
2015-01-18 20:15:17 +00:00
c0a4051b7a
use etherpads own yajsml
2015-01-18 20:12:02 +00:00
ca6b729ace
fix for ep page view pageup/down
2015-01-18 19:58:38 +00:00
83fae22279
allow list text entry up to 16 items
2015-01-18 15:32:48 +00:00
3c692faa8c
Merge pull request #2465 from Gared/change_domain_plugins_json
...
Change domain for plugins.json request
2015-01-18 13:26:56 +00:00
3c6db077ed
Change domain for plugins.json request
2015-01-18 14:22:27 +01:00
df47bb9b04
Merge pull request #2464 from Gared/plugin_page_improvements
...
Plugin page improvements
2015-01-18 13:21:54 +00:00
4644073399
Prevent dublicates in search results
2015-01-18 13:56:30 +01:00
John McLear