John McLear
|
c539cc7d6b
|
styling of global view colum
|
2014-12-01 15:10:03 +00:00 |
|
John McLear
|
a642deaa72
|
gritter css fix
|
2014-11-28 02:25:21 +00:00 |
|
John McLear
|
68979e1212
|
better fix
|
2014-11-28 00:35:46 +00:00 |
|
John McLear
|
e6d85bbe69
|
fix issue with top of chatbox not being aligned properly
|
2014-11-28 00:26:34 +00:00 |
|
John McLear
|
3ca48ed975
|
fix undo in chrome etc
|
2014-11-27 16:49:08 +00:00 |
|
John McLear
|
e51ab2db24
|
fix for #2132
|
2014-11-26 23:37:44 +00:00 |
|
John McLear
|
60d44cd3df
|
use cheerio instead of jsdom
|
2014-11-25 17:26:09 +00:00 |
|
John McLear
|
555d22245d
|
Merge pull request #2335 from ether/javascript-bower
swap out jquery browser for bower but expose browser object to all pages...
|
2014-11-23 14:15:41 +00:00 |
|
John McLear
|
0eb7cc7864
|
Merge branch 'develop' of github.com:ether/etherpad-lite into fix-socket-admin-etc
|
2014-11-23 14:14:11 +00:00 |
|
John McLear
|
5f2e830b72
|
whoopsi
|
2014-11-22 19:13:23 +00:00 |
|
John McLear
|
9b66c93d6b
|
swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well
|
2014-11-22 19:11:35 +00:00 |
|
John McLear
|
488d6890f9
|
minor styling
|
2014-11-21 00:15:55 +00:00 |
|
John McLear
|
ff9a2a687f
|
whoops fix animation not to look broken
|
2014-11-19 18:27:55 +00:00 |
|
John McLear
|
28c7b666c1
|
correct file links
|
2014-11-19 00:24:14 +00:00 |
|
John McLear
|
16d8068d7d
|
Merge branch 'develop' of github.com:ether/etherpad-lite into new-icons
|
2014-11-19 00:17:01 +00:00 |
|
John McLear
|
9aea689438
|
move tiny bit of font awesome we actually use into pad.css
|
2014-11-19 00:16:08 +00:00 |
|
John McLear
|
f5dcc374ba
|
slight ui fix
|
2014-11-18 23:15:56 +00:00 |
|
John McLear
|
e821cb13fa
|
more polish
|
2014-11-18 22:47:20 +00:00 |
|
John McLear
|
95cb721914
|
clean up
|
2014-11-18 22:41:00 +00:00 |
|
John McLear
|
09b08e5a72
|
working pause
|
2014-11-18 22:29:46 +00:00 |
|
John McLear
|
e2410e41b0
|
more polish
|
2014-11-18 22:24:16 +00:00 |
|
John McLear
|
a06f01c04a
|
some timeslider styling but this wont be completed by me
|
2014-11-18 22:21:36 +00:00 |
|
Beau Gunderson
|
645ec830b0
|
Don't crash on bad plugins.json; fixes #2323
|
2014-11-18 13:59:36 -08:00 |
|
John McLear
|
4a12eec3e0
|
a font lookup file
|
2014-11-18 21:10:40 +00:00 |
|
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 |
|
John McLear
|
d10013c159
|
client side code now fixed
|
2014-11-18 14:10:38 +00:00 |
|
John McLear
|
020b636b1f
|
template of a semi-fix
|
2014-11-18 14:08:44 +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 |
|