John McLear
|
77c805a2bf
|
Merge branch 'master' of github.com:ether/etherpad-lite into develop
|
2014-11-15 16:01:03 +00:00 |
|
John McLear
|
3bf108f3b4
|
Merge pull request #2203 from ether/setting-to-not-import-unknown-file-types
Allow for a setting so you can stop unknown file types from being imported
|
2014-11-15 15:41:08 +00:00 |
|
John McLear
|
f5fbcbbc81
|
Merge pull request #2273 from ether/bump-swagger
Bumps version # to remove legacy ERRORS on pad access in latest versions of node
|
2014-11-15 15:39:55 +00:00 |
|
John McLear
|
4986dd11ee
|
merging
|
2014-11-15 15:39:46 +00:00 |
|
John McLear
|
9c935a6997
|
Merge pull request #2285 from talexand/develop
Added explicit reference to plugins and themes in readme
|
2014-11-15 15:38:18 +00:00 |
|
John McLear
|
eff4863a22
|
Merge pull request #2290 from ether/IE11-null-password
change to proper IE check
|
2014-11-15 15:37:53 +00:00 |
|
John McLear
|
12914e68ff
|
Merge pull request #2294 from ether/go-away-npm
Use request and a remote ep plugin only endpoint
|
2014-11-15 15:37:44 +00:00 |
|
John McLear
|
8d2fa35b3f
|
Merge pull request #2298 from ether/reflow-toolbar-properly
Reflow toolbar properly
|
2014-11-15 15:37:28 +00:00 |
|
John McLear
|
ab4819fb85
|
Merge pull request #2296 from ether/new-express
New express
|
2014-11-15 15:36:52 +00:00 |
|
John McLear
|
cce2d7279a
|
resolve merge issues
|
2014-11-15 15:34:18 +00:00 |
|
John McLear
|
a75f02cddf
|
Merge pull request #2300 from cristo-rabani/patch-1
Added option to restore revisions #1791
|
2014-11-15 15:32:24 +00:00 |
|
Siebrand Mazeland
|
e8fda27ead
|
Localisation updates from https://translatewiki.net.
|
2014-11-14 13:42:39 +01:00 |
|
John McLear
|
a52743d8f1
|
Merge pull request #2282 from ether/chrome-paste
Chrome browser change wrapping type
|
2014-11-13 13:00:32 +00:00 |
|
John McLear
|
e5d77c3763
|
indentation
|
2014-11-12 21:39:03 +00:00 |
|
Cristo
|
0253156dbb
|
Update APIHandler.js
|
2014-11-12 19:55:37 +01:00 |
|
Cristo
|
f7dd756642
|
Update API.js
|
2014-11-12 19:53:56 +01:00 |
|
Cristo
|
f59238fe58
|
Update API.js
|
2014-11-12 19:50:43 +01:00 |
|
Cristo
|
24ac082cae
|
Update API.js
|
2014-11-12 19:49:08 +01:00 |
|
Cristo
|
9d39c9591a
|
update pad clients
|
2014-11-12 19:46:50 +01:00 |
|
John McLear
|
07d29a5d7a
|
Merge pull request #2219 from Gared/fix_css
Fix position of import/export popup in timeslider
|
2014-11-12 15:18:25 +00:00 |
|
John McLear
|
f0423349b5
|
Merge pull request #2303 from prtksxna/kbdtitle
Add keyboard shortcut for "Clear Authorshop Colors" in en locale
|
2014-11-09 11:57:01 +00:00 |
|
Prateek Saxena
|
60b698f69b
|
Add keyboard shortcut for "Clear Authorshop Colors" in en locale
Translate wiki should pick this up and the translations will
start coming in a while. #2292
|
2014-11-09 09:18:50 +05:30 |
|
Cristo
|
46bc328896
|
new api ver
|
2014-11-08 01:41:23 +01:00 |
|
Cristo
|
c33c6e085e
|
comment addded
|
2014-11-08 01:39:27 +01:00 |
|
Cristo
|
d246a191c6
|
Added option to restore revisions #1791
|
2014-11-08 01:12:40 +01:00 |
|
John McLear
|
e1fe1f0f9c
|
Merge pull request #2299 from prtksxna/colorauth
Add keyboard shortcut to Clear Authorship Colors. Fixes #2292
|
2014-11-07 10:40:26 +00:00 |
|
Prateek Saxena
|
2d597a4cab
|
Add keyboard shortcut to Clear Authorship Colors. Fixes #2292
|
2014-11-07 14:01:32 +05:30 |
|
John McLear
|
fc5152c2f3
|
remove logging
|
2014-11-06 17:38:38 +00:00 |
|
John McLear
|
3eb0652b21
|
fix pg
|
2014-11-06 16:38:31 +00:00 |
|
John McLear
|
d13b6162f0
|
this looks way better
|
2014-11-06 15:50:55 +00:00 |
|
John McLear
|
0685e563ed
|
working on resize
|
2014-11-06 15:43:21 +00:00 |
|
John McLear
|
96d6e7c1b7
|
cleaner reflow
|
2014-11-06 15:12:40 +00:00 |
|
John McLear
|
9170effb27
|
working redraw and draw on startup
|
2014-11-06 15:09:44 +00:00 |
|
John McLear
|
7d04d7309f
|
reflow buttons based on browser size, much better
|
2014-11-06 14:32:20 +00:00 |
|
John McLear
|
57f56d8fe1
|
bump express to a working version
|
2014-11-04 23:42:40 +00:00 |
|
John McLear
|
053ff3097d
|
whoops I missed this one
|
2014-11-04 23:29:45 +00:00 |
|
John McLear
|
9fa77cdea2
|
working handling of setting client ip and anonymizing etc
|
2014-11-04 23:25:18 +00:00 |
|
John McLear
|
f418dfa205
|
fix author notification handler
|
2014-11-04 22:37:10 +00:00 |
|
John McLear
|
af3e8e5e15
|
fix room client leave
|
2014-11-04 22:34:43 +00:00 |
|
John McLear
|
8391f902fb
|
re-apply roomsize
|
2014-11-04 22:31:09 +00:00 |
|
John McLear
|
a6cbb4af40
|
working messages
|
2014-11-04 19:58:38 +00:00 |
|
John McLear
|
68eaa09708
|
Begin to repair damage done to rooms logic
|
2014-11-04 19:55:05 +00:00 |
|
John McLear
|
95e7b0f156
|
transports
|
2014-11-04 19:11:06 +00:00 |
|
John McLear
|
cb28d10963
|
move logging into debug environment variable .. sighs
|
2014-11-04 18:32:26 +00:00 |
|
John McLear
|
5d0ccb5f8f
|
auth fix
|
2014-11-04 18:17:39 +00:00 |
|
John McLear
|
adef0af227
|
more stuff required to stop it crashing, now we have identified what needs fixing we can fix it
|
2014-11-04 18:01:41 +00:00 |
|
John McLear
|
1e53c4f5f0
|
identify which parts are causing issues and comment them out, obviously this needs fixing
|
2014-11-04 17:57:18 +00:00 |
|
John McLear
|
c7061e47db
|
use request and a remote ep plugin only endpoint
|
2014-11-04 17:06:47 +00:00 |
|
John McLear
|
b59f6a4d6f
|
Update ace2_inner.js
|
2014-11-04 15:50:53 +00:00 |
|
John McLear
|
b61d8d99d1
|
Update package.json
|
2014-11-03 17:15:22 +00:00 |
|