9c2f8808be
bump swagger
2014-10-14 14:38:47 +01:00
09acdda4f7
bump semver
2014-10-14 14:37:57 +01:00
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
2530bf0a86
add changelog and bump v number
2014-09-06 17:25:09 +01:00
4b7562de58
Merge pull request #2184 from qknight/patch-1
...
added /abs/path/settings.json handling
2014-08-23 21:24:46 +01:00
cf6e5aa3ca
Fix click on timeslider loads two different revisions
2014-08-09 18:56:18 +02:00
bb21759d78
Fix timeslider revision not changing in most cases
2014-08-09 18:52:44 +02:00
e34a4ea4ee
Merge pull request #2218 from simong/userLeave-hook
...
Added a `userLeave` hook that gets called when a user leaves a pad
2014-08-08 16:45:20 +01:00
2f8b860e69
Added a `userLeave` hook that gets called when a user leaves a pad
2014-08-08 15:49:15 +01:00
49bba7dfe2
Localisation updates from https://translatewiki.net .
2014-08-06 16:49:48 +02:00
14f9c91976
Merge pull request #2210 from Gared/pad-repair-script
...
Add a script to reinsert all db values of a pad
2014-07-29 18:37:01 +01:00
63b89b693d
Update Settings.js
...
added brackets to match etherpad lite devs' coding style
2014-07-24 12:06:52 +02:00
9d1eca42b3
Merge pull request #2174 from ether/fix/copy-pad-update-lists
...
Fix #2136 : update cache and group list when copying pads
2014-07-08 19:07:35 +00:00
3cafd689af
Fix Pad#copy routine for updating group list
2014-07-07 21:14:00 +02:00
03ead389ba
Merge pull request #2193 from kpn3m000/develop
...
Fixes exception on search (plugins without description)
2014-07-03 19:03:39 +01:00
da0fe98edc
Fixes search on plugins without Description
...
example "tables_ssl"
2014-07-03 14:24:41 +02:00
a3a40e1bcc
Merge pull request #2186 from ether/font-on-innerdoc-body
...
Font on innerdoc body
2014-06-28 15:19:59 +01:00
2ee4e9e7fd
change to line 73
2014-06-28 15:19:28 +01:00
b657676bdd
gah can only do 1/2 a fix
2014-06-24 19:02:40 +01:00
25ace65374
don't lose comment
2014-06-24 18:46:41 +01:00
db045c6ffd
CSS fix for pasting plain-text in chrome, needs thorough testing
2014-06-24 18:45:54 +01:00
a76dc697f0
Localisation updates from https://translatewiki.net .
2014-06-23 12:39:04 +00:00
e17044d60e
added /abs/path/settings.json handling
...
before this path, one could only supply a relative path like:
--settings ../relative/path/settings.js
now one can also use it with absolute paths like:
--settings /abs/path/settings.json
2014-06-22 20:56:21 +02:00
John McLear