c021cf52d8
download and start the sauce connector in travis
2012-10-28 16:48:51 +00:00
7903eb93b6
first version of a travis.yml file
2012-10-28 15:40:42 +00:00
94faa6d3b2
comments
2012-10-28 13:22:30 +00:00
f85da5483d
added a plain text test reporter, will be good for the webdriver client to pick up test results
2012-10-28 13:16:41 +00:00
c4f38e28a6
CSS
2012-10-27 18:37:33 +01:00
d7a65e19f4
made it possible to run only certain tests
2012-10-27 17:50:59 +01:00
7a8401c363
Add recipe for doc assets and some basic styling for the generated docs.
2012-10-27 18:47:09 +02:00
9537892c61
wrap spec files with a describe
2012-10-27 17:29:17 +01:00
cac27c864a
load list of spec files from the server
2012-10-27 17:05:26 +01:00
cc7ddddd2f
redirect from frontend to frontend/
2012-10-27 16:41:17 +01:00
06bebf257e
run all tests
2012-10-27 16:40:54 +01:00
a2a208a95b
Merge branch 'clear-authorship-color-test-spec' of git://github.com/johnyma22/etherpad-lite into feature/frontend-tests
2012-10-27 16:33:34 +01:00
f59b643aa6
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests
2012-10-27 16:32:37 +01:00
3d1fd05085
Insert epl version into template.
2012-10-27 17:28:15 +02:00
94e399e8a9
Change filename hooks.md -> hooks_overview.md
...
so it doesn't confuse tools/doc/generator
2012-10-27 16:30:31 +02:00
d5ace6c163
Merge pull request #1091 from kingkaeru/feature/iisnode_support
...
Feature/iisnode support
2012-10-25 16:25:00 -07:00
399080ad73
Add IIS config file
2012-10-25 10:22:28 -07:00
596e20e123
Add default port of process.env.PORT if port isnt specified in settings.json
2012-10-25 10:21:34 -07:00
a80eb93f75
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into develop
2012-10-25 09:41:24 -07:00
ff2e7ead09
add a script to migrate from dirtyDB to MYSQL thanks to http://blog.codeborne.com
2012-10-25 09:40:33 -07:00
344ba31c92
fix paths in convert.js so it works
2012-10-25 09:35:33 -07:00
2ecd5719fc
Merge pull request #1073 from Pita/librejs-header
...
Add LibreJS Licensing information to headers of HTML templates
2012-10-25 06:53:38 -07:00
4c72507ff0
Merge pull request #1090 from marcelklehr/docs/add-pluginfw
...
Add docs for plugins and plugin framework
2012-10-25 06:53:14 -07:00
a01768fc46
Merge pull request #1086 from neurolit/patch_relative_static_links
...
Templates: relative links instead of absolute ones for /static directory
2012-10-25 06:52:16 -07:00
63e4aafae8
Add docs for plugins and plugin framework
...
@redhog please elaborate on / improve 'doc/api/pluginfw.md'!
2012-10-25 15:45:06 +02:00
58d559b962
fix marcels trailing ,
2012-10-25 05:24:42 -07:00
9582881278
Merge pull request #1088 from marcelklehr/fix/update-npm
...
Update npm
2012-10-25 05:21:11 -07:00
0e9695bfb0
Merge pull request #1089 from marcelklehr/legal/extend-collaboraters
...
Add myself to the list of contributers
2012-10-25 05:20:49 -07:00
ff2824ae7a
Add "Marcel Klehr" to contributers list
2012-10-25 13:45:40 +02:00
1bc9d61027
Update npm ( fix #1012 )
2012-10-25 13:38:28 +02:00
cb760aae52
Fix broken layout (Chrome Mobile)
2012-10-25 14:37:41 +03:00
7f158f697b
Merge pull request #1081 from clkao/develop
...
Do not assume window object exists
2012-10-25 01:24:18 -07:00
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
8199bf8377
Do not assume window object exists
2012-10-23 15:21:05 +08:00
a770910a3a
Add LibreJS Licensing information to headers of HTML templates
2012-10-17 17:53:28 +01:00
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
6c89187f95
Fix #1067 Corrected exports links regexp
2012-10-16 20:46:27 +02:00
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
Peter 'Pita' Martischka