Commit graph

771 commits

Author SHA1 Message Date
John McLear
9712f852e9 remove connecting bar image 2014-11-18 19:16:50 +00:00
John McLear
9b5ee93bce spinning loading icons 2014-11-18 19:13:51 +00:00
John McLear
3ad9a58895 fontello config file 2014-11-18 18:47:12 +00:00
John McLear
21ce9b4dd3 correct font stuff 2014-11-18 18:44:45 +00:00
John McLear
c14e1696b3 remove stuff, new files 2014-11-18 18:09:29 +00:00
Simon Gaeremynck
d7a181be67 Nooping console.foo in html10n.js when the method is not defined. 2014-11-15 16:31:19 +00:00
John McLear
fc79c8a298 Merge pull request #1912 from ether/hide-chat-when-caret-behind
Hide Chat Icon when the Caret is on the same line
2014-11-15 16:13:53 +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
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
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
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
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
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
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
ac2e949c3e chrome browser change wrapping type 2014-10-24 00:13:34 +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
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
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
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
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
John McLear
fb940897ee Merge pull request #2257 from 0ip/fix/user-count
Fix broken user count
2014-10-05 12:42:52 +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
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
Stefan
0d95c8d1ec Revert change on position of imp/exp overlay 2014-09-14 20:26:35 +02:00
Stefan
cf6e5aa3ca Fix click on timeslider loads two different revisions 2014-08-09 18:56:18 +02:00
Stefan
bb21759d78 Fix timeslider revision not changing in most cases 2014-08-09 18:52:44 +02:00
Stefan
287a7805c9 Fix position of import/export popup in timeslider 2014-08-09 14:05:04 +02:00
kpn3m000
da0fe98edc Fixes search on plugins without Description
example "tables_ssl"
2014-07-03 14:24:41 +02:00
John McLear
2ee4e9e7fd change to line 73 2014-06-28 15:19:28 +01:00
John McLear
b657676bdd gah can only do 1/2 a fix 2014-06-24 19:02:40 +01:00
John McLear
25ace65374 don't lose comment 2014-06-24 18:46:41 +01:00
John McLear
db045c6ffd CSS fix for pasting plain-text in chrome, needs thorough testing 2014-06-24 18:45:54 +01:00
luto
f70309645c pluginfw: accept 'null' as a hook-result, as this is needed by handleMessage 2014-06-12 13:33:17 +02:00
Marcel Klehr
46ef83d710 Fix #online_count
Rather dirty, but works.
2014-04-30 22:32:08 +02:00
John McLear
706ee1f866 fix color 2014-04-15 18:11:41 +01:00