3a28db7f40
Merge pull request #2342 from ether/fix-2320-crash
...
fix #2320
2014-11-25 22:09:03 +00:00
5c3874c0a1
really recreate socketio-client in expressCreateServer, fixes #2342
...
When using plugins, the express server gets restarted. When we do that,
the socketio-server should also get restarted. It doesn't. That means
that all the events in SocketIORouter.js are bound twice, which causes
chaos all over etherpad.
This changes our socketio.js so it fully recreates the io-instance when
we restart the server.
introduced in 95e7b0f156
2014-11-25 22:38:22 +01:00
97068b562d
more old load testing cruft
2014-11-25 01:22:32 +00:00
5e843a5877
remove jshint
2014-11-25 01:21:19 +00:00
945d6c83c1
Merge pull request #2336 from ether/more-socket-io-fixes
...
more fixes
2014-11-23 22:34:30 +00:00
a3f6b2edb7
more fixes
2014-11-23 22:33:56 +00:00
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
b0872cc447
Merge pull request #2319 from ether/fix-socket-admin-etc
...
Fixing admin issues due to socket upgrade
2014-11-23 14:15:28 +00:00
73bcbbcb89
final commit
2014-11-23 14:15:03 +00:00
0eb7cc7864
Merge branch 'develop' of github.com:ether/etherpad-lite into fix-socket-admin-etc
2014-11-23 14:14:11 +00:00
ae7da122d7
fix session management
2014-11-23 14:14:01 +00:00
5f2e830b72
whoopsi
2014-11-22 19:13:23 +00:00
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
764b8af5e3
Merge pull request #2334 from luto/api-mystery-crash
...
fix api mystery crash
2014-11-22 15:50:23 +00:00
4eee89ad12
fix api mystery crash
2014-11-22 16:46:37 +01:00
1ed12c6555
Merge pull request #2333 from l-y-n-x/admin_path
...
Changed relative path to Etherpad main page in admin settings.
2014-11-22 13:31:09 +00:00
4e31ec8ab9
Changed relative path to Etherpad main page in admin settings.
...
There was one '../' too much.
2014-11-22 10:24:30 +01:00
488d6890f9
minor styling
2014-11-21 00:15:55 +00:00
703440acd7
missing socketio fix
2014-11-21 00:11:50 +00:00
ff9a2a687f
whoops fix animation not to look broken
2014-11-19 18:27:55 +00:00
da824de5f1
Merge pull request #2321 from ether/new-icons
...
Remove all images, include new icons for plugins
2014-11-19 18:06:49 +00:00
28c7b666c1
correct file links
2014-11-19 00:24:14 +00:00
16d8068d7d
Merge branch 'develop' of github.com:ether/etherpad-lite into new-icons
2014-11-19 00:17:01 +00:00
9aea689438
move tiny bit of font awesome we actually use into pad.css
2014-11-19 00:16:08 +00:00
7b9fd81284
Merge pull request #2326 from ether/blocks-for-custom-script-and-styles
...
working blocks
2014-11-18 23:51:46 +00:00
0f1fd0b281
working blocks
2014-11-18 23:51:22 +00:00
f5dcc374ba
slight ui fix
2014-11-18 23:15:56 +00:00
e821cb13fa
more polish
2014-11-18 22:47:20 +00:00
95cb721914
clean up
2014-11-18 22:41:00 +00:00
09b08e5a72
working pause
2014-11-18 22:29:46 +00:00
e2410e41b0
more polish
2014-11-18 22:24:16 +00:00
a06f01c04a
some timeslider styling but this wont be completed by me
2014-11-18 22:21:36 +00:00
17f6a225c1
Merge pull request #2324 from beaugunderson/no-crash-on-parse-plugins
...
Don't crash on bad plugins.json; fixes #2323
2014-11-18 22:16:33 +00:00
645ec830b0
Don't crash on bad plugins.json; fixes #2323
2014-11-18 13:59:36 -08:00
0bea3a3af6
no image on timeslider
2014-11-18 21:13:21 +00:00
4a12eec3e0
a font lookup file
2014-11-18 21:10:40 +00:00
9712f852e9
remove connecting bar image
2014-11-18 19:16:50 +00:00
9b5ee93bce
spinning loading icons
2014-11-18 19:13:51 +00:00
3ad9a58895
fontello config file
2014-11-18 18:47:12 +00:00
21ce9b4dd3
correct font stuff
2014-11-18 18:44:45 +00:00
c14e1696b3
remove stuff, new files
2014-11-18 18:09:29 +00:00
3e8f3cd938
hrm I dont trust this security
2014-11-18 14:56:40 +00:00
ff603d7b58
stability restored now to handle the auth issues
2014-11-18 14:12:02 +00:00
d10013c159
client side code now fixed
2014-11-18 14:10:38 +00:00
020b636b1f
template of a semi-fix
2014-11-18 14:08:44 +00:00
135aa3e8fe
Merge pull request #1783 from simong/removed-console-in-html10n
...
Removed console wrapping in html10n as it's breaking in PhantomJS.
2014-11-15 18:08:53 +01:00
d7a181be67
Nooping console.foo in html10n.js when the method is not defined.
2014-11-15 16:31:19 +00:00
865829e159
Merge pull request #1682 from luto/fix-listSessionsOfGroup
...
Don't error in listSessionsOfGroup when there are non-existing sessions
2014-11-15 16:25:23 +00:00
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
77c805a2bf
Merge branch 'master' of github.com:ether/etherpad-lite into develop
2014-11-15 16:01:03 +00:00
John McLear