Marcel Klehr
ff2824ae7a
Add "Marcel Klehr" to contributers list
2012-10-25 13:45:40 +02:00
Marcel Klehr
1bc9d61027
Update npm ( fix #1012 )
2012-10-25 13:38:28 +02:00
0ip
cb760aae52
Fix broken layout (Chrome Mobile)
2012-10-25 14:37:41 +03:00
Matthias Bartelmeß
7f158f697b
Merge pull request #1081 from clkao/develop
...
Do not assume window object exists
2012-10-25 01:24:18 -07:00
neurolit
526610e2e7
Templates: relative links instead of absolute ones for /static directory
...
…irector
Two links were absolute ("/static/...") instead of relative
("../static"). The image was not loaded with sites behind reverse
proxies and subdirectory.
2012-10-24 19:48:13 +02:00
Chia-liang Kao
8199bf8377
Do not assume window object exists
2012-10-23 15:21:05 +08:00
johnyma22
a770910a3a
Add LibreJS Licensing information to headers of HTML templates
2012-10-17 17:53:28 +01:00
John McLear
429651874f
Merge pull request #1072 from marcelklehr/fix/timeslider-links-regexp
...
Fix #1067 Corrected exports links regexp
2012-10-16 13:36:20 -07:00
Marcel Klehr
6c89187f95
Fix #1067 Corrected exports links regexp
2012-10-16 20:46:27 +02:00
John McLear
b7d0751b18
couch, level, mongo, postgres, redis DB support
...
Support for additional underlying databases
2012-10-15 13:09:55 +02:00
John McLear
c45739becb
Update src/package.json
...
Bump version #
2012-10-11 23:38:56 +02:00
John McLear
da9439d36e
Merge pull request #1059 from lepidum/develop
...
Fix for #1032 caused by pull-request 999
2012-10-11 10:12:54 -07:00
lepidum
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
NAGOYA, Yoshihiko
957a0aa873
fix Pita/etherpad-lite #1032
...
refact inInternationalComposition
2012-10-12 01:12:15 +09:00
John McLear
e19c05d1c4
Merge pull request #1058 from Pita/release/releases-1.1.4
...
Release 1.1.4
2012-10-11 08:40:25 -07:00
Richard Braakman
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
John McLear
d7ec050f34
Merge pull request #1035 from amtep/develop
...
Guard against malicious clients in USERINFO_UPDATE handling
2012-10-11 08:27:27 -07:00
Dmitry
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
Marcel Klehr
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
Dmitry
e0d4a16208
fixed variable name in handleMessageHook
...
the code would never work as expected with this type
2012-10-11 16:54:36 +02:00
Marcel Klehr
3dede0528c
Fix issue caused by broken async update
...
Conflicts:
src/package.json
2012-10-11 16:54:27 +02:00
Marcel Klehr
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
Dmitry
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
Marcel Klehr
1461c4e19a
Merge pull request #1056 from dmitryuv/sync-processing
...
Fix variable name in handleMessageHook
2012-10-11 07:05:51 -07:00
Dmitry
0fa954c1a0
fixed variable name in handleMessageHook
...
the code would never work as expected with this type
2012-10-11 17:51:57 +04:00
johnyma22
c975d81b41
clear authorship colors test
2012-10-09 16:33:47 +01:00
johnyma22
f79bc7f1d8
simple check to ensure changing username change works
2012-10-09 16:04:11 +01:00
johnyma22
d7c80ed41e
keystroke enter spec
2012-10-09 15:51:55 +01:00
John McLear
442c5714f9
Merge pull request #1049 from cweider/fix-express
...
Drop method deprecated in Express 3.x.
2012-10-09 05:19:17 -07:00
Chad Weider
9d1274abaf
Drop method deprecated in Express 3.x.
2012-10-09 01:32:21 -07:00
johnyma22
aee6cb673a
a non working chat always ons creen test
2012-10-09 02:59:45 +01:00
johnyma22
38321a0e77
strikethrough test
2012-10-09 02:30:49 +01:00
johnyma22
def587f44f
button ordered list test
2012-10-09 02:27:22 +01:00
johnyma22
fbf509ce87
redo button
2012-10-09 01:30:46 +01:00
johnyma22
2db2683c98
an undo button test
2012-10-09 00:52:46 +01:00
johnyma22
c9dd620e2a
the first stages of a clear authorship color test
2012-10-09 00:24:19 +01:00
johnyma22
251ab842dd
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
2012-10-09 00:13:51 +01:00
johnyma22
87adcd7c14
clean up
2012-10-09 00:13:45 +01:00
Peter 'Pita' Martischka
0927b13f78
started button_indention test
2012-10-08 21:04:09 +01:00
Peter 'Pita' Martischka
6fefadee88
move sendkeys to lib folder
2012-10-08 18:54:03 +01:00
Peter 'Pita' Martischka
a12c26c56e
delete old backup file
2012-10-08 18:50:02 +01:00
Peter 'Pita' Martischka
82b4a953ee
new index.html
2012-10-08 18:49:40 +01:00
Peter 'Pita' Martischka
397036db46
finished urls test
2012-10-08 18:42:52 +01:00
Peter 'Pita' Martischka
7adef188ff
rewrote the embed values test
2012-10-08 18:38:53 +01:00
Peter 'Pita' Martischka
bd47b6c40b
the monospace test works now
2012-10-08 14:13:35 +02:00
Peter 'Pita' Martischka
a4d68b2b25
runIn was a bad idea
2012-10-08 14:07:56 +02:00
Peter 'Pita' Martischka
27f9906b1e
ensure we don't inject a second jquery
2012-10-08 14:07:08 +02:00
Peter 'Pita' Martischka
d4c851875a
added a runIn method to the helper
2012-10-08 13:37:24 +02:00
Peter 'Pita' Martischka
ca6ebd6151
major restructering of the front end test framework
2012-10-08 00:34:29 +02:00
Peter 'Pita' Martischka
6587852138
fixed keystroke delete test
2012-10-06 23:38:49 +02:00
