John McLear
|
17fa87552d
|
styling
|
2015-01-21 15:48:21 +00:00 |
|
John McLear
|
941cc3c24b
|
url param
|
2015-01-21 15:37:55 +00:00 |
|
John McLear
|
920ec9c553
|
Merge pull request #2467 from ether/chat-and-users
Show users and Chat at the same time
|
2015-01-21 15:22:23 +00:00 |
|
John McLear
|
a58507e811
|
Merge pull request #2480 from ether/IE-again
Butching an IE fix..
|
2015-01-21 15:21:53 +00:00 |
|
John McLear
|
3cd8759cec
|
expose modernIE value
|
2015-01-21 15:21:31 +00:00 |
|
John McLear
|
26a1584470
|
fix tests w/ new context
|
2015-01-21 15:21:15 +00:00 |
|
John McLear
|
3fd6e72657
|
try again
|
2015-01-21 15:06:29 +00:00 |
|
John McLear
|
a2cb8a2f19
|
rename back to browser
|
2015-01-21 15:01:39 +00:00 |
|
John McLear
|
7237a3b7cc
|
bump ueberdb
|
2015-01-21 14:58:47 +00:00 |
|
John McLear
|
f2891e3b8b
|
working
|
2015-01-21 14:55:29 +00:00 |
|
John McLear
|
ce40cacafa
|
mheh looks fixed
|
2015-01-21 14:49:06 +00:00 |
|
John McLear
|
990e14c904
|
working with a big hack
|
2015-01-21 14:25:24 +00:00 |
|
John McLear
|
34d6b31c98
|
some sanity
|
2015-01-21 13:24:21 +00:00 |
|
John McLear
|
f880b0feb7
|
clean up iojs
|
2015-01-21 12:18:38 +00:00 |
|
John McLear
|
eacf1118f8
|
blind attempt to try
|
2015-01-21 02:55:03 +00:00 |
|
John McLear
|
ee48b8b93a
|
Merge pull request #2479 from ether/export-privacy
Export privacy
|
2015-01-21 01:20:51 +00:00 |
|
John McLear
|
cbeb464358
|
ie now uses keydown
|
2015-01-21 01:16:12 +00:00 |
|
John McLear
|
cb65224997
|
better logic for author handling
|
2015-01-21 00:28:00 +00:00 |
|
John McLear
|
5f9bbd0666
|
restrict expor4t to only expose this pad ID
|
2015-01-21 00:03:39 +00:00 |
|
John McLear
|
9e8bad021c
|
Merge pull request #2478 from ether/static-deps
freeze deps
|
2015-01-20 23:52:01 +00:00 |
|
John McLear
|
531d25ab84
|
freeze deps
|
2015-01-20 23:50:55 +00:00 |
|
John McLear
|
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 |
|
John McLear
|
860c584b42
|
remove pointless comments
|
2015-01-19 15:44:16 +00:00 |
|
John McLear
|
5967e085b7
|
fix ul tests
|
2015-01-19 15:37:29 +00:00 |
|
John McLear
|
f31b2fc9b5
|
Merge pull request #2471 from ether/ie-fix-backspace
Ie fix backspace
|
2015-01-19 15:16:55 +00:00 |
|
John McLear
|
c315defc31
|
temp bodge fix
|
2015-01-19 15:15:52 +00:00 |
|
John McLear
|
ab71bc7c20
|
hrm
|
2015-01-19 14:45:49 +00:00 |
|
John McLear
|
edbeb66d5e
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2015-01-19 14:33:17 +00:00 |
|
John McLear
|
44d1d6cc13
|
fix ie editing
|
2015-01-19 14:32:58 +00:00 |
|
John McLear
|
4ab4c9998b
|
Merge pull request #2470 from cetra3/timeslider_proxy_fix
Timeslider proxy fix
|
2015-01-19 13:32:03 +00:00 |
|
Siebrand Mazeland
|
28aeeff154
|
Localisation updates from https://translatewiki.net.
|
2015-01-19 09:28:03 +01:00 |
|
Cetra Free
|
f1c9c58c2d
|
Update to timeslider to include base path for easier proxying
|
2015-01-19 14:28:30 +10:30 |
|
Cetra Free
|
3649118194
|
Update to timeslider to include base path for easier proxying
|
2015-01-19 14:25:06 +10:30 |
|
John McLear
|
3463b16d1a
|
nearly there...
|
2015-01-19 03:04:23 +00:00 |
|
John McLear
|
7958f3b723
|
nearly fully working
|
2015-01-19 03:02:34 +00:00 |
|
John McLear
|
4f637befeb
|
more fixing
|
2015-01-19 02:59:17 +00:00 |
|
John McLear
|
85fffbe14c
|
more handling
|
2015-01-19 02:57:10 +00:00 |
|
John McLear
|
cadb83ac5a
|
bumpage
|
2015-01-19 02:51:32 +00:00 |
|
John McLear
|
13eff60dfe
|
mheh I suck at css 0ip would do a way better job of this
|
2015-01-19 02:13:34 +00:00 |
|
John McLear
|
63c65f784b
|
semi working example
|
2015-01-19 01:45:49 +00:00 |
|
John McLear
|
73d6030762
|
boop
|
2015-01-19 00:36:12 +00:00 |
|
John McLear
|
33c62329ba
|
better regexp for line items
|
2015-01-19 00:28:32 +00:00 |
|
John McLear
|
0bd7914c3b
|
dont paste on middle click of link
|
2015-01-18 23:58:47 +00:00 |
|
John McLear
|
6bc74a9adb
|
more export logic handling
|
2015-01-18 23:33:29 +00:00 |
|
John McLear
|
e50ea6ffea
|
whoops proper regexp fix for listNumber
|
2015-01-18 23:24:20 +00:00 |
|
John McLear
|
bd9ff770fe
|
reset all numbers on first item
|
2015-01-18 23:21:34 +00:00 |
|
John McLear
|
ce41bcea2f
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2015-01-18 23:17:06 +00:00 |
|
John McLear
|
af70902bef
|
support deeper nested elements on exports
|
2015-01-18 23:16:58 +00:00 |
|
John McLear
|
cbdfea9d16
|
Merge pull request #2466 from ether/remove-infinite
remove infinite load was causing pain
|
2015-01-18 23:04:55 +00:00 |
|
John McLear
|
7e69bc65ce
|
remove infinite load was causing pain
|
2015-01-18 23:03:54 +00:00 |
|