b7d0751b18
couch, level, mongo, postgres, redis DB support
...
Support for additional underlying databases
2012-10-15 13:09:55 +02:00
c45739becb
Update src/package.json
...
Bump version #
2012-10-11 23:38:56 +02:00
da9439d36e
Merge pull request #1059 from lepidum/develop
...
Fix for #1032 caused by pull-request 999
2012-10-11 10:12:54 -07:00
250901bef5
Merge pull request #3 from ayokura/fix-international-composition
...
fix Pita/etherpad-lite #1032 (International composition (e.g. Japanese Input))
2012-10-11 09:20:28 -07:00
957a0aa873
fix Pita/etherpad-lite #1032
...
refact inInternationalComposition
2012-10-12 01:12:15 +09:00
e19c05d1c4
Merge pull request #1058 from Pita/release/releases-1.1.4
...
Release 1.1.4
2012-10-11 08:40:25 -07:00
e4841212a6
USERINFO_UPDATE: construct a new message for broadcast
...
The server was reusing the client's message when broadcasting userinfo
updates. This would allow a malicious client to insert arbitrary fields
into a message that the other clients would trust as coming from the
server. For example, adding "disconnect" or renaming other authors.
This commit fixes it by having the server construct a new message with
known fields before broadcasting.
2012-10-11 17:29:29 +02:00
d7ec050f34
Merge pull request #1035 from amtep/develop
...
Guard against malicious clients in USERINFO_UPDATE handling
2012-10-11 08:27:27 -07:00
8ea3ee080f
fix for error handling in callback code
...
The callback code does not follow error handling guidelines, thus always
receiving NULL instead of results array.
2012-10-11 17:12:16 +02:00
bedc51d2e3
Merge pull request #1057 from dmitryuv/sync-processing
...
fix for error handling in the callback code
2012-10-11 08:08:47 -07:00
e0d4a16208
fixed variable name in handleMessageHook
...
the code would never work as expected with this type
2012-10-11 16:54:36 +02:00
3dede0528c
Fix issue caused by broken async update
...
Conflicts:
src/package.json
2012-10-11 16:54:27 +02:00
b0099a4aba
Add plugin-specific sections in settings.json
...
Settings for specific plugins are written down as below:
{
...
"ep_pluginname": {
"foo":"bar"
}
...
}
2012-10-11 16:22:40 +02:00
dbcdc2f956
fix for error handling in callback code
...
The callback code does not follow error handling guidelines, thus always
receiving NULL instead of results array.
2012-10-11 18:07:45 +04:00
1461c4e19a
Merge pull request #1056 from dmitryuv/sync-processing
...
Fix variable name in handleMessageHook
2012-10-11 07:05:51 -07:00
0fa954c1a0
fixed variable name in handleMessageHook
...
the code would never work as expected with this type
2012-10-11 17:51:57 +04:00
c975d81b41
clear authorship colors test
2012-10-09 16:33:47 +01:00
f79bc7f1d8
simple check to ensure changing username change works
2012-10-09 16:04:11 +01:00
d7c80ed41e
keystroke enter spec
2012-10-09 15:51:55 +01:00
442c5714f9
Merge pull request #1049 from cweider/fix-express
...
Drop method deprecated in Express 3.x.
2012-10-09 05:19:17 -07:00
9d1274abaf
Drop method deprecated in Express 3.x.
2012-10-09 01:32:21 -07:00
aee6cb673a
a non working chat always ons creen test
2012-10-09 02:59:45 +01:00
38321a0e77
strikethrough test
2012-10-09 02:30:49 +01:00
def587f44f
button ordered list test
2012-10-09 02:27:22 +01:00
fbf509ce87
redo button
2012-10-09 01:30:46 +01:00
2db2683c98
an undo button test
2012-10-09 00:52:46 +01:00
c9dd620e2a
the first stages of a clear authorship color test
2012-10-09 00:24:19 +01:00
251ab842dd
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
2012-10-09 00:13:51 +01:00
87adcd7c14
clean up
2012-10-09 00:13:45 +01:00
0927b13f78
started button_indention test
2012-10-08 21:04:09 +01:00
6fefadee88
move sendkeys to lib folder
2012-10-08 18:54:03 +01:00
a12c26c56e
delete old backup file
2012-10-08 18:50:02 +01:00
82b4a953ee
new index.html
2012-10-08 18:49:40 +01:00
397036db46
finished urls test
2012-10-08 18:42:52 +01:00
7adef188ff
rewrote the embed values test
2012-10-08 18:38:53 +01:00
bd47b6c40b
the monospace test works now
2012-10-08 14:13:35 +02:00
a4d68b2b25
runIn was a bad idea
2012-10-08 14:07:56 +02:00
27f9906b1e
ensure we don't inject a second jquery
2012-10-08 14:07:08 +02:00
d4c851875a
added a runIn method to the helper
2012-10-08 13:37:24 +02:00
ca6ebd6151
major restructering of the front end test framework
2012-10-08 00:34:29 +02:00
6587852138
fixed keystroke delete test
2012-10-06 23:38:49 +02:00
4c1561fcf6
improve test descriptions
2012-10-06 23:38:17 +02:00
35cea1e542
fixed the keystroke_urls_become_clickable.js test
2012-10-06 21:45:46 +02:00
7fd23c8d71
ported italic test to the new framework
2012-10-06 21:34:20 +02:00
3d96fe3d86
rewrote the testHelper
2012-10-06 21:29:37 +02:00
90373964d3
Remove two instances of the same function name
...
Both functions did the same thing, the first function was buggy. Might be worth someone looking through the history of this file and pointing out when I made this heinous error ;)
2012-10-06 02:36:51 +02:00
db1a1a0e3e
Merge pull request #1034 from d-a-n/develop
...
Added hooks for pad events create/edit/load/remove
2012-10-05 17:28:40 -07:00
ae25c085e0
a better way of geting href but note that it only works if we use settimeotu but settimeout breaks mocha so it's not okay. Peter please find a way of making sendkeys allow for callbacks, k tnx
2012-10-05 00:38:07 +01:00
9d7d973faa
This is a superghetto hack fix for testing button_indentation, Peter please make it less horrible, tnx :)
2012-10-05 00:14:46 +01:00
84ec5abb8f
more indentation testing but have hit a brick wall unable to get the second div inside the editor. I tried nth-child, next, find and children but to no avail. Anyone any ideas?
2012-10-04 23:01:33 +01:00
John McLear