Commit Graph

3744 Commits

Author SHA1 Message Date
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
8af34a2295 introduced a failing test frontend test-
https://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
John McLear 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
Prateek Saxena 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
John McLear 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
Prateek Saxena 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
Prateek Saxena 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
John McLear 6ec55309a7 Merge pull request #2261 from ether/fix-xss-on-useragent
Fix xss on useragent
2014-10-06 17:11:33 +01:00
John McLear 0962f65c08 I prefer this.. 2014-10-06 14:23:13 +01:00
John McLear f0c12d3884 escape useragent before displaying 2014-10-06 14:18:54 +01:00
Siebrand Mazeland 64c89613a1 Localisation updates from https://translatewiki.net. 2014-10-06 11:39:09 +02:00
John McLear fb940897ee Merge pull request #2257 from 0ip/fix/user-count
Fix broken user count
2014-10-05 12:42:52 +01:00
John McLear f3f653f07f Merge pull request #2258 from 0ip/fix/button-select
Prevent selection on buttons
2014-10-05 12:41:40 +01:00
0ip 29f8f13423 Prevent selection on buttons 2014-10-05 13:35:20 +02:00
0ip 5008ad10c6 Fix user count
Still dirty, but really works.
2014-10-05 13:14:07 +02:00
John McLear 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
0ip ee68d43932 Fix import/export popup margin @ timeslider 2014-10-03 17:39:15 +02:00
0ip 12c1d3b05a Fix active button ui 2014-10-03 17:35:48 +02:00
John McLear 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
Olivier Tétard 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
John McLear 2e6348b8aa Merge pull request #2249 from Gared/support_npm2
Add support for npm 2
2014-09-27 11:35:39 +01:00
Stefan 94968e69be Add support for npm 2 2014-09-27 12:30:11 +02:00
John McLear d3b45ef2c9 Merge pull request #2243 from mrshu/patch-1
readme: Add formatting sugar for readibility
2014-09-23 15:09:47 +01:00
Marek Šuppa 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
John McLear 35a1e1ea23 Merge pull request #2232 from ether/master
Merge branch 'release/1.4.1'
2014-09-14 19:42:37 +01:00
Stefan 0d95c8d1ec Revert change on position of imp/exp overlay 2014-09-14 20:26:35 +02:00
John McLear bc8b5cc066 Merge pull request #2220 from Gared/timeslider_improvements
Timeslider improvements
2014-09-06 18:15:37 +01:00
John McLear 1932d240e5 Merge branch 'release/1.4.1' 2014-09-06 17:37:09 +01:00
John McLear 2530bf0a86 add changelog and bump v number 2014-09-06 17:25:09 +01:00
John McLear 4b7562de58 Merge pull request #2184 from qknight/patch-1
added /abs/path/settings.json handling
2014-08-23 21:24:46 +01:00