2c801cc558
no errors but no connections
2014-11-01 22:36:19 +00:00
a67e805da0
basics, still not working
2014-11-01 21:25:49 +00:00
124ae31137
blah push back for imports
2014-11-01 21:15:31 +00:00
1530757d8e
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-01 21:12:53 +00:00
ff549db261
use latest jsdom
2014-11-01 20:58:56 +00:00
9b8398d0bd
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-01 20:20:19 +00:00
d54bb52b75
Fixes #1414
...
https://github.com/ether/etherpad-lite/issues/1414
2014-11-01 18:18:25 +00:00
bf380eea50
take line breaks and treat them appropriatly instead of creating a space for them..
2014-11-01 18:07:34 +00:00
4b488bc8af
Merge pull request #2116 from jdittrich/updateUnderscore
...
Underscore Version: Update package.json
2014-11-01 16:37:00 +00:00
41b7f99204
Bump resolve
...
Update dep fixes https://github.com/ether/etherpad-lite/issues/2050
2014-11-01 16:25:14 +00:00
51b9af9df0
bump ueberdb again
2014-10-30 16:12:17 +00:00
cd8ea040ad
bump ueber to require working mysql
2014-10-30 14:41:21 +00:00
f104644297
Fix for MySQL issues
...
See https://github.com/Pita/ueberDB/issues/63
2014-10-29 12:15:53 +00:00
45611561e6
Localisation updates from https://translatewiki.net .
2014-10-27 18:53:33 +01:00
3fce9f8309
Localisation updates from https://translatewiki.net .
2014-10-23 21:32:44 +02:00
086bf83e6c
Localisation updates from https://translatewiki.net .
2014-10-20 18:57:22 +02:00
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
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
bba97e94f0
Merge pull request #2271 from prtksxna/keyboard-error
...
Use 'evt.shiftKey' instead of matching 'charCodes'
2014-10-14 14:12:39 +01:00
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
68c805070a
Merge pull request #2270 from prtksxna/tooltip
...
Replace "-" with "+" in tooltips with keyboard shortcuts
2014-10-14 13:47:55 +01:00
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
aee652dafc
Merge pull request #2269 from prtksxna/fonticons
...
Add a subset of FontAwesome icons using Fontello
2014-10-14 13:29:41 +01:00
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
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
743eaff202
Merge pull request #2266 from prtksxna/list-keyboard-shortcuts
...
Add keyboard shortcuts for ordered and unordered lists
2014-10-12 14:38:06 +01:00
7b8953ee75
Add keyboard shortcuts for ordered and unordered lists and update tooltips #1987
...
Ordered List: Ctrl-Shift-N
Unordered List: Ctrl-Shift-L
2014-10-12 17:40:57 +05:30
000648fac8
Merge pull request #2265 from prtksxna/keyboard-shortcut
...
Add 'Ctrl-5' keyboard shortcut for 'strikethrough' #1987
2014-10-11 23:53:31 +01:00
001d75cd1e
Add 'Ctrl-5' keyboard shortcut for 'strikethrough' #1987
...
A quick search revealed that 'Ctrl-5' is a popular shortcut
for strikethrough. Implemented in 'ace2_inner' and updated
the English l10n file for the tooltip.
2014-10-11 22:51:20 +05:30
437b2bfc64
Move `title` attribute of buttons from `<span>` to `<a>`
...
The `.toolbar ul li a` that holds the `span.button` has a
padding of `4px 5px`. This means if the mouse is on the edge
of the button the `:hover` state is active but the relevant
tooltip does not show up. Moving the `title` attribute to
the `<a>` itself solves this problem.
Also removed some extra whitespace.
2014-10-11 20:22:31 +05:30
6ec55309a7
Merge pull request #2261 from ether/fix-xss-on-useragent
...
Fix xss on useragent
2014-10-06 17:11:33 +01:00
0962f65c08
I prefer this..
2014-10-06 14:23:13 +01:00
f0c12d3884
escape useragent before displaying
2014-10-06 14:18:54 +01:00
64c89613a1
Localisation updates from https://translatewiki.net .
2014-10-06 11:39:09 +02:00
fb940897ee
Merge pull request #2257 from 0ip/fix/user-count
...
Fix broken user count
2014-10-05 12:42:52 +01:00
f3f653f07f
Merge pull request #2258 from 0ip/fix/button-select
...
Prevent selection on buttons
2014-10-05 12:41:40 +01:00
29f8f13423
Prevent selection on buttons
2014-10-05 13:35:20 +02:00
5008ad10c6
Fix user count
...
Still dirty, but really works.
2014-10-05 13:14:07 +02:00
4569e91592
Merge pull request #2256 from 0ip/develop
...
Fix active button UI, when a popup is shown
2014-10-03 20:53:03 +01:00
ee68d43932
Fix import/export popup margin @ timeslider
2014-10-03 17:39:15 +02:00
12c1d3b05a
Fix active button ui
2014-10-03 17:35:48 +02:00
d25d81b9e2
Merge pull request #2252 from otetard/bugfix/fix_export_filename
...
If exportFileName hook isn’t defined don’t return empty filename.
2014-09-28 14:05:59 +01:00
bfde869948
If exportFileName hook isn’t defined don’t return empty filename.
...
This commit should fix #2251 .
If ``exportFileName`` hook is not defined, ``hookFileName`` should be an empty array. Test the length of ``hookFileName`` before overriding ``fileName``, the export filename.
2014-09-28 14:53:07 +02:00
2e6348b8aa
Merge pull request #2249 from Gared/support_npm2
...
Add support for npm 2
2014-09-27 11:35:39 +01:00
94968e69be
Add support for npm 2
2014-09-27 12:30:11 +02:00
d3b45ef2c9
Merge pull request #2243 from mrshu/patch-1
...
readme: Add formatting sugar for readibility
2014-09-23 15:09:47 +01:00
72a328cf11
readme: Add formatting sugar for readibility
...
* Added a bit more formatting for UNIX-like systems dependencies installation.
2014-09-23 16:04:22 +02:00
35a1e1ea23
Merge pull request #2232 from ether/master
...
Merge branch 'release/1.4.1'
2014-09-14 19:42:37 +01:00
bc8b5cc066
Merge pull request #2220 from Gared/timeslider_improvements
...
Timeslider improvements
2014-09-06 18:15:37 +01:00
1932d240e5
Merge branch 'release/1.4.1'
2014-09-06 17:37:09 +01:00
John McLear