1347a814f0
basic pad tests without test logic yet
2014-11-26 17:53:31 +00:00
16f3ebb3ba
handle auth fails
2014-11-26 17:34:44 +00:00
88b3d99fbd
Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests
2014-11-26 15:33:13 +00:00
b4ddeffd04
Merge pull request #2341 from ether/jsdom-go-away
...
Use cheerio instead of jsdom
2014-11-26 15:19:42 +00:00
0a84379364
make additional line break at end of imported doc
2014-11-26 15:19:22 +00:00
7a4a3b5ef3
make internal note of which endpoints need testing
2014-11-26 01:11:42 +00:00
a4be5b4fd7
mocha version
2014-11-26 01:03:57 +00:00
8851b8ab6b
Merge branch 'develop' of github.com:ether/etherpad-lite into jsdom-go-away
2014-11-25 22:48:09 +00:00
3ac833d455
basic test runner
2014-11-25 22:47:22 +00:00
881763f663
remove jsdom dep
2014-11-25 22:15:29 +00:00
77de2d918b
multiline
2014-11-25 22:14:48 +00:00
ad7de8277d
mocha
2014-11-25 22:12:25 +00:00
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
2a062f8dc3
mheh no browser requirement at all
2014-11-25 18:18:42 +00:00
c2c0cb6907
so yeah, prolly can do this anyway?
2014-11-25 18:07:34 +00:00
60d44cd3df
use cheerio instead of jsdom
2014-11-25 17:26:09 +00: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
25ccb6cfc3
Simplify the rebuild process
...
The majority of the information needed to build the new pad can be
communicated by simply cloning the rev using a db.set().
2014-11-20 22:09:21 -06:00
488d6890f9
minor styling
2014-11-21 00:15:55 +00:00
703440acd7
missing socketio fix
2014-11-21 00:11:50 +00:00
d3ad62bf2d
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-20 02:23:34 +00:00
01f6d85371
Restore pad to new location at a given revision
...
This script gives an admin with shell access the ability to restore a
pad at a given revision by essentially rebuilding it at a new location
with data associated with the original pad. The upsides to creating a
new pad vs. changing the original are: 1) avoiding service disruptions
(no deletes, no moving targets - builds from previous revision); and 2)
preservation of data (no deletes, no overwriting of the source pad).
The most obvious downside is the pad has a new ID which could require
folks to update their links, bookmarks, etc. to point at the new
location.
2014-11-19 13:09:37 -06: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
John McLear