63b89b693d
Update Settings.js
...
added brackets to match etherpad lite devs' coding style
2014-07-24 12:06:52 +02:00
e17044d60e
added /abs/path/settings.json handling
...
before this path, one could only supply a relative path like:
--settings ../relative/path/settings.js
now one can also use it with absolute paths like:
--settings /abs/path/settings.json
2014-06-22 20:56:21 +02:00
b1b972a2b4
Merge pull request #1787 from goldquest/dev_nopass_whensession
...
Grant access for valid session to password protected group pads
so, if user has valid session, they don't need the password
2014-06-17 14:01:16 +02:00
c627608ea5
Merge pull request #1619 from ether/stricter-transport
...
Enable HSTS on TLS connections
2014-06-17 12:58:47 +01:00
6dd66c6a16
Localisation updates from https://translatewiki.net .
2014-06-17 11:55:02 +00:00
897f5189b0
Enable HSTS for TLS connections
...
Don't use X-Frame-Options: deny for now
2014-06-17 13:21:38 +02:00
44cb676ba2
Merge pull request #2150 from ether/export-file-name-hook
...
Server side hook to modify the export file name
2014-06-16 16:47:15 +01:00
71c7deecd9
Merge pull request #2175 from ether/fix-handleMessage
...
Pluginfw: Interpret hook return value `null` as `[null]` instead of `undefined`
see http://etherpad.org/doc/v1.4.0/#index_return_values
fixes dropping of messages in handleMessage
2014-06-12 14:59:46 +02:00
f70309645c
pluginfw: accept 'null' as a hook-result, as this is needed by handleMessage
2014-06-12 13:33:17 +02:00
cd294c608b
Merge pull request #2149 from ether/dont-use-abiword-for-html
...
abiword shouldnt be used for HTML native documents
2014-06-11 14:47:33 +02:00
7bec297c0a
Merge pull request #2161 from ether/bump-ueber
...
bump ueberdb for more performance on mysql
2014-06-11 14:40:54 +02:00
40a97f08bb
Merge pull request #2169 from stephan48/develop
...
Added documentation for the newly added API method getPadID
2014-06-02 20:31:37 +02:00
bbd50dfc62
Added documentation for the newly added API method getPadID
2014-06-02 20:25:16 +02:00
1f40e05270
Merge pull request #2165 from stephan48/develop
...
Added an API method for retrieving the padID from the readonlyID
2014-06-02 16:53:25 +00:00
0bc98a6b60
Merge pull request #2166 from divergentdave/patch-1
...
Fix typos in easysync-full-description.tex
2014-06-02 10:22:24 +01:00
49114d2b7a
Fix typos in easysync-full-description.tex
2014-06-01 23:57:20 -05:00
fc3ce3429e
Corrected the API Version number.
2014-06-01 21:21:08 +02:00
412bdd1857
Renamed the variable to prevent possible problems.
2014-06-01 21:19:15 +02:00
d42a9eb3a6
Enhanced the Example for the API Method getPadID and make the return value consistent to other functions
2014-05-31 11:53:44 +02:00
fffdde0c59
Implemented the the new API method getPadID for reversing the Readonly ID. Based on: ff88c19fc1
2014-05-31 00:43:31 +02:00
493636ec36
Added a new API method getPadID for reversing the Readonly ID and introduced the API level 1.4.1. Based on: 97402f60b8
2014-05-31 00:39:36 +02:00
37f6dde365
bump ueberdb for more performance on mysql
2014-05-21 13:20:39 +01:00
19be8763c9
Fix race condition
2014-05-15 12:47:28 +00:00
c63cb812e8
Update ExportHandler.js
2014-05-15 10:53:37 +01:00
44b1ac2b16
Merge pull request #1984 from ldidry/fix/getRevisionChangeset-crash
...
Fix getRevisionChangeset API call making etherpad crash
2014-05-14 14:10:44 +01:00
a82823ede2
use full string not first char
2014-05-12 15:15:10 +01:00
d09e66e271
use call first and update docs
2014-05-12 15:08:32 +01:00
9212ebe9f0
Localisation updates from https://translatewiki.net .
2014-05-12 13:42:45 +00:00
b74c43889e
Update ImportHandler.js
2014-05-09 13:50:00 +01:00
32898dec80
Localisation updates from https://translatewiki.net .
2014-05-08 08:40:43 +00:00
ec6dc4fa0e
make async, please check
2014-05-07 16:27:41 +01:00
69ba3cc104
remove eplite add etherpad
2014-05-07 15:17:14 +01:00
a8d9a3868d
docs for new hook
2014-05-06 21:22:03 +01:00
1f7fcd54f1
working logic for allowing a server side hook to modify the export file name but NOT the extension
2014-05-06 21:13:22 +01:00
6d38b05623
abiword shouldnt be used for HTML native documents
2014-05-06 17:32:45 +01:00
e85d09400e
Merge pull request #2138 from ether/fix-user-icon-color-and-count
...
Fix showusers button: Show authorcolor and user_count again
2014-05-03 13:32:22 +02:00
46ef83d710
Fix #online_count
...
Rather dirty, but works.
2014-04-30 22:32:08 +02:00
20c32de5e7
Localisation updates from https://translatewiki.net .
2014-04-21 09:23:10 +00:00
706ee1f866
fix color
2014-04-15 18:11:41 +01:00
962b166c3a
Localisation updates from https://translatewiki.net .
2014-04-14 13:49:59 +00:00
6597c287e2
Localisation updates from https://translatewiki.net .
2014-04-06 17:03:18 +00:00
156200d0fd
Localisation updates from https://translatewiki.net .
2014-03-31 21:29:38 +00:00
31c45bc9b8
Merge pull request #2126 from ether/fix/toolbar-timeslider-button
...
Toolbar: Fix timeslider button
2014-03-31 19:51:03 +01:00
6b5e3ea3a5
Toolbar: Fix timeslider button
...
Wouldn't play nice with url params in document.location
fixes #2124
2014-03-31 20:50:01 +02:00
991f0f8c26
Merge pull request #2123 from ether/master
...
Update README.md
2014-03-31 20:47:11 +02:00
c3a6a2374c
Update README.md
...
Added support for node v0.11 in the installation description
2014-03-31 02:05:52 +02:00
874181ce3b
Merge branch 'master' into develop
2014-03-30 15:12:47 +02:00
c6d13a965c
Merge branch 'release/1.4.0'
2014-03-30 15:11:50 +02:00
a7671a690b
docs: update api version
2014-03-30 15:10:29 +02:00
de3a60ee2a
Merge pull request #2120 from ether/fix/timeslider-editbar
...
Add a customizable toolbar for timeslider
2014-03-30 12:25:07 +01:00
Joachim Schiele