John McLear
865829e159
Merge pull request #1682 from luto/fix-listSessionsOfGroup
...
Don't error in listSessionsOfGroup when there are non-existing sessions
2014-11-15 16:25:23 +00:00
John McLear
3bf108f3b4
Merge pull request #2203 from ether/setting-to-not-import-unknown-file-types
...
Allow for a setting so you can stop unknown file types from being imported
2014-11-15 15:41:08 +00:00
John McLear
cce2d7279a
resolve merge issues
2014-11-15 15:34:18 +00:00
Cristo
0253156dbb
Update APIHandler.js
2014-11-12 19:55:37 +01:00
Cristo
f7dd756642
Update API.js
2014-11-12 19:53:56 +01:00
Cristo
f59238fe58
Update API.js
2014-11-12 19:50:43 +01:00
Cristo
24ac082cae
Update API.js
2014-11-12 19:49:08 +01:00
Cristo
9d39c9591a
update pad clients
2014-11-12 19:46:50 +01:00
Cristo
46bc328896
new api ver
2014-11-08 01:41:23 +01:00
Cristo
c33c6e085e
comment addded
2014-11-08 01:39:27 +01:00
Cristo
d246a191c6
Added option to restore revisions #1791
2014-11-08 01:12:40 +01:00
John McLear
053ff3097d
whoops I missed this one
2014-11-04 23:29:45 +00:00
John McLear
9fa77cdea2
working handling of setting client ip and anonymizing etc
2014-11-04 23:25:18 +00:00
John McLear
f418dfa205
fix author notification handler
2014-11-04 22:37:10 +00:00
John McLear
af3e8e5e15
fix room client leave
2014-11-04 22:34:43 +00:00
John McLear
8391f902fb
re-apply roomsize
2014-11-04 22:31:09 +00:00
John McLear
a6cbb4af40
working messages
2014-11-04 19:58:38 +00:00
John McLear
68eaa09708
Begin to repair damage done to rooms logic
2014-11-04 19:55:05 +00:00
John McLear
95e7b0f156
transports
2014-11-04 19:11:06 +00:00
John McLear
cb28d10963
move logging into debug environment variable .. sighs
2014-11-04 18:32:26 +00:00
John McLear
5d0ccb5f8f
auth fix
2014-11-04 18:17:39 +00:00
John McLear
adef0af227
more stuff required to stop it crashing, now we have identified what needs fixing we can fix it
2014-11-04 18:01:41 +00:00
John McLear
1e53c4f5f0
identify which parts are causing issues and comment them out, obviously this needs fixing
2014-11-04 17:57:18 +00:00
John McLear
2c801cc558
no errors but no connections
2014-11-01 22:36:19 +00:00
John McLear
a67e805da0
basics, still not working
2014-11-01 21:25:49 +00:00
John McLear
124ae31137
blah push back for imports
2014-11-01 21:15:31 +00:00
John McLear
ff549db261
use latest jsdom
2014-11-01 20:58:56 +00:00
Prateek Saxena
437b2bfc64
Move title attribute of buttons from <span> to <a>
...
The `.toolbar ul li a` that holds the `span.button` has a
padding of `4px 5px`. This means if the mouse is on the edge
of the button the `:hover` state is active but the relevant
tooltip does not show up. Moving the `title` attribute to
the `<a>` itself solves this problem.
Also removed some extra whitespace.
2014-10-11 20:22:31 +05:30
Olivier Tétard
bfde869948
If exportFileName hook isn’t defined don’t return empty filename.
...
This commit should fix #2251 .
If ``exportFileName`` hook is not defined, ``hookFileName`` should be an empty array. Test the length of ``hookFileName`` before overriding ``fileName``, the export filename.
2014-09-28 14:53:07 +02:00
John McLear
4b7562de58
Merge pull request #2184 from qknight/patch-1
...
added /abs/path/settings.json handling
2014-08-23 21:24:46 +01:00
Simon Gaeremynck
2f8b860e69
Added a userLeave hook that gets called when a user leaves a pad
2014-08-08 15:49:15 +01:00
Joachim Schiele
63b89b693d
Update Settings.js
...
added brackets to match etherpad lite devs' coding style
2014-07-24 12:06:52 +02:00
John McLear
17f26b8c2c
Support to allow for a setting so you can stop unknown file types from being imported
2014-07-22 15:46:31 +01:00
Marcel Klehr
9d1eca42b3
Merge pull request #2174 from ether/fix/copy-pad-update-lists
...
Fix #2136 : update cache and group list when copying pads
2014-07-08 19:07:35 +00:00
Marcel Klehr
3cafd689af
Fix Pad#copy routine for updating group list
2014-07-07 21:14:00 +02:00
Joachim Schiele
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
Marcel Klehr
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
John McLear
c627608ea5
Merge pull request #1619 from ether/stricter-transport
...
Enable HSTS on TLS connections
2014-06-17 12:58:47 +01:00
Marcel Klehr
897f5189b0
Enable HSTS for TLS connections
...
Don't use X-Frame-Options: deny for now
2014-06-17 13:21:38 +02:00
John McLear
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
Marcel Klehr
c4f9828825
Fix #2136 : update cache and group list when copying pads
2014-06-11 22:23:43 +02:00
Marcel Klehr
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
Stephan Jauernick
fc3ce3429e
Corrected the API Version number.
2014-06-01 21:21:08 +02:00
Stephan Jauernick
412bdd1857
Renamed the variable to prevent possible problems.
2014-06-01 21:19:15 +02:00
Stephan Jauernick
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
Stephan Jauernick
fffdde0c59
Implemented the the new API method getPadID for reversing the Readonly ID. Based on: ff88c19fc1
2014-05-31 00:43:31 +02:00
Stephan Jauernick
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
Marcel Klehr
19be8763c9
Fix race condition
2014-05-15 12:47:28 +00:00
John McLear
c63cb812e8
Update ExportHandler.js
2014-05-15 10:53:37 +01:00
John McLear
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
