John McLear
|
af7cd91a82
|
formatting
|
2015-01-24 15:14:19 +00:00 |
|
John McLear
|
85c1787184
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2015-01-24 15:13:34 +00:00 |
|
John McLear
|
e41b3ae0a3
|
updated CL
|
2015-01-24 15:13:26 +00:00 |
|
John McLear
|
3f08bf7405
|
Merge pull request #2490 from Gared/https_plugins_json
Use https to download plugins.json
|
2015-01-24 13:34:41 +00:00 |
|
John McLear
|
85c5cc80d0
|
Merge pull request #2488 from webzwo0i/fix-session-without-auth-crash
Stop processing a message without auth (i.e. a client did not send
|
2015-01-24 13:15:58 +00:00 |
|
John McLear
|
10d4e27073
|
Merge pull request #2489 from Gared/update_column_plugin_list
Add 'last update' column to plugins table
|
2015-01-24 13:14:52 +00:00 |
|
Stefan
|
da86110f58
|
Use https to download plugins.json
|
2015-01-24 12:55:17 +01:00 |
|
Stefan
|
713b369fc3
|
Add 'last update' column to plugins table
|
2015-01-24 12:49:17 +01:00 |
|
webzwo0i
|
6b0cf29af6
|
Stop processing a message without auth (i.e. a client did not send
CLIENT_READY)
|
2015-01-24 06:34:41 +01:00 |
|
John McLear
|
4ecf0dfad2
|
docs for export HTML
|
2015-01-24 02:24:10 +00:00 |
|
John McLear
|
4fa47ea969
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2015-01-24 02:20:34 +00:00 |
|
John McLear
|
c878a957b7
|
fix issue in docs
|
2015-01-24 02:18:59 +00:00 |
|
John McLear
|
7493cd994e
|
Merge pull request #2484 from kaystrobach/patch-1
Add: How to create an issue
|
2015-01-23 12:27:47 +00:00 |
|
Kay Strobach
|
1f023c52bc
|
Add: How to create an issue
How to create an issue and which information should be given
|
2015-01-23 08:14:01 +01:00 |
|
John McLear
|
6fd0285d4d
|
include lineContent in hok
|
2015-01-21 21:36:11 +00:00 |
|
John McLear
|
036dea3d0f
|
styling
|
2015-01-21 17:25:06 +00:00 |
|
John McLear
|
657974b518
|
move saved revs notification to gritter
|
2015-01-21 16:40:44 +00:00 |
|
John McLear
|
aee0fd797d
|
working translation
|
2015-01-21 16:11:00 +00:00 |
|
John McLear
|
753e8fdf0b
|
working logic
|
2015-01-21 16:08:54 +00:00 |
|
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 |