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
John McLear
2c801cc558
no errors but no connections
2014-11-01 22:36:19 +00:00
John McLear
a67e805da0
basics, still not working
2014-11-01 21:25:49 +00:00
John McLear
124ae31137
blah push back for imports
2014-11-01 21:15:31 +00:00
John McLear
1530757d8e
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-01 21:12:53 +00:00
John McLear
ff549db261
use latest jsdom
2014-11-01 20:58:56 +00:00
John McLear
a22b558a2c
change to proper IE check
2014-11-01 20:21:48 +00:00
John McLear
9b8398d0bd
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-01 20:20:19 +00:00
John McLear
d54bb52b75
Fixes #1414
...
https://github.com/ether/etherpad-lite/issues/1414
2014-11-01 18:18:25 +00:00
John McLear
bf380eea50
take line breaks and treat them appropriatly instead of creating a space for them..
2014-11-01 18:07:34 +00:00
John McLear
4b488bc8af
Merge pull request #2116 from jdittrich/updateUnderscore
...
Underscore Version: Update package.json
2014-11-01 16:37:00 +00:00
John McLear
41b7f99204
Bump resolve
...
Update dep fixes https://github.com/ether/etherpad-lite/issues/2050
2014-11-01 16:25:14 +00:00
John McLear
3ebcaad31f
Update README.md
2014-11-01 12:36:57 +00:00
John McLear
51b9af9df0
bump ueberdb again
2014-10-30 16:12:17 +00:00
John McLear
cd8ea040ad
bump ueber to require working mysql
2014-10-30 14:41:21 +00:00
John McLear
f104644297
Fix for MySQL issues
...
See https://github.com/Pita/ueberDB/issues/63
2014-10-29 12:15:53 +00:00
talexand
69b17f5088
changed link wording for readme plugin reference
2014-10-28 15:13:05 -10:00
Trevor Alexander
9a01f905eb
Added explicit reference to plugins and themes in readme
2014-10-28 13:07:02 -10:00
Siebrand Mazeland
45611561e6
Localisation updates from https://translatewiki.net .
2014-10-27 18:53:33 +01:00
John McLear
ac2e949c3e
chrome browser change wrapping type
2014-10-24 00:13:34 +01:00
Siebrand Mazeland
3fce9f8309
Localisation updates from https://translatewiki.net .
2014-10-23 21:32:44 +02:00
Siebrand Mazeland
086bf83e6c
Localisation updates from https://translatewiki.net .
2014-10-20 18:57:22 +02:00
John McLear
226e0bf0e3
bump resolve
2014-10-14 14:41:18 +01:00
John McLear
9c2f8808be
bump swagger
2014-10-14 14:38:47 +01:00
John McLear
09acdda4f7
bump semver
2014-10-14 14:37:57 +01:00
John McLear
8c1868f0e9
Merge pull request #2272 from prtksxna/lang-tests
...
Update frontend language tests for new keyboard shortcut convention
2014-10-14 14:17:49 +01:00
Prateek Saxena
2dd874376a
Update frontend language tests for new keyboard shortcut convention
...
8af34a2295https://travis-ci.org/ether/etherpad-lite/builds/37931978
This commit updates both the German and English strings even though
the German locale files haven't been updated yet. The tests will
continue to fail but will stop as soon as translatewiki catches up.
2014-10-14 18:46:12 +05:30
John McLear
bba97e94f0
Merge pull request #2271 from prtksxna/keyboard-error
...
Use 'evt.shiftKey' instead of matching 'charCodes'
2014-10-14 14:12:39 +01:00
Prateek Saxena
6f5f89bc6b
Use 'evt.shiftKey' instead of matching 'charCodes'
...
The shortcut wasn't running consistently and was blocking
'Cmd+L' on Chrome 38. Instead of going to the location bar
it would tooggle the list. Strangely, it did not override
'Cmd+N'. Using `evt.shiftKey` instead of matching the `charCode`
to the uppercase letter solves the problem.
2014-10-14 18:37:35 +05:30
John McLear
68c805070a
Merge pull request #2270 from prtksxna/tooltip
...
Replace "-" with "+" in tooltips with keyboard shortcuts
2014-10-14 13:47:55 +01:00
Prateek Saxena
8af34a2295
Replace "-" with "+" in tooltips with keyboard shortcuts
...
Ctrl-Shift-L seems counter intuitive as you have to press
the keys together.
2014-10-14 18:14:47 +05:30
John McLear
aee652dafc
Merge pull request #2269 from prtksxna/fonticons
...
Add a subset of FontAwesome icons using Fontello
2014-10-14 13:29:41 +01:00
John McLear
b62c82575f
Merge pull request #2264 from prtksxna/a-span-title
...
Move `title` attribute of buttons from `<span>` to `<a>`
2014-10-14 13:29:00 +01:00
Prateek Saxena
ca32ac89b6
Add a subset of FontAwesome icons using Fontello
...
Most of the code here has been taken from @LaKing's #2554 .
Only icons required for etherpad have been added. Here is a
list of the code points that are being used:
0xe800 0xe801 0xe802 0xe803
0xe804 0xe805 0xe806 0xe807
0xe808 0xe809 0xe80a 0xe80b
0xe80c 0xe80d 0xe80e 0xe80f
0xe810 0xe811 0xe812 0xe813
0xe814 0xe815 0xe816 0xe817
Their related icon names can be seen in:
/src/static/css/fontawesome-etherpad.css
Even though this patch *adds* all the required icons it only
uses them in the in toolbar. The switch to using only FontAwesome
icons and the removal of old PNG files will only happen after the
timeslider interface has been updated.
This is the first step for #2253
2014-10-14 09:16:44 +05:30
