cf6e5aa3ca
Fix click on timeslider loads two different revisions
2014-08-09 18:56:18 +02:00
bb21759d78
Fix timeslider revision not changing in most cases
2014-08-09 18:52:44 +02:00
287a7805c9
Fix position of import/export popup in timeslider
2014-08-09 14:05:04 +02:00
e34a4ea4ee
Merge pull request #2218 from simong/userLeave-hook
...
Added a `userLeave` hook that gets called when a user leaves a pad
2014-08-08 16:45:20 +01:00
2f8b860e69
Added a `userLeave` hook that gets called when a user leaves a pad
2014-08-08 15:49:15 +01:00
49bba7dfe2
Localisation updates from https://translatewiki.net .
2014-08-06 16:49:48 +02:00
14f9c91976
Merge pull request #2210 from Gared/pad-repair-script
...
Add a script to reinsert all db values of a pad
2014-07-29 18:37:01 +01:00
63b89b693d
Update Settings.js
...
added brackets to match etherpad lite devs' coding style
2014-07-24 12:06:52 +02:00
83b7ca529b
tidy up template a bit
2014-07-22 16:03:49 +01:00
95ab126fe2
tidy up template a bit
2014-07-22 16:03:26 +01:00
6dfe33258a
tidy up template a bit
2014-07-22 16:02:56 +01:00
aa908ea8ce
tidy up template a bit
2014-07-22 16:02:22 +01:00
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
25f6c9bf9a
Checking if the author for the sessions match instead of comparing the entire session.
2014-07-12 16:40:59 -04:00
7861cae763
Cleaning up switchToPad functionality so that we only need one call to the server("SWITCH_TO_PAD") instead of two (cleaning session info and client ready).
...
Also Clearing chat messages when switchToPad is called in pad.js instead of having the server tell the client to clear the chat messages.
2014-07-12 16:27:00 -04:00
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
3cafd689af
Fix Pad#copy routine for updating group list
2014-07-07 21:14:00 +02:00
070ba40f4f
Fallback for browsers that don't support window.history.pushstate
2014-07-06 18:22:24 -04:00
03ead389ba
Merge pull request #2193 from kpn3m000/develop
...
Fixes exception on search (plugins without description)
2014-07-03 19:03:39 +01:00
da0fe98edc
Fixes search on plugins without Description
...
example "tables_ssl"
2014-07-03 14:24:41 +02:00
a3a40e1bcc
Merge pull request #2186 from ether/font-on-innerdoc-body
...
Font on innerdoc body
2014-06-28 15:19:59 +01:00
2ee4e9e7fd
change to line 73
2014-06-28 15:19:28 +01:00
b657676bdd
gah can only do 1/2 a fix
2014-06-24 19:02:40 +01:00
25ace65374
don't lose comment
2014-06-24 18:46:41 +01:00
db045c6ffd
CSS fix for pasting plain-text in chrome, needs thorough testing
2014-06-24 18:45:54 +01:00
a76dc697f0
Localisation updates from https://translatewiki.net .
2014-06-23 12:39:04 +00: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
4ccd7131d3
Added function to switch to a different pad without having to reload the whole page.
2014-06-14 14:25:56 -04: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
c4f9828825
Fix #2136 : update cache and group list when copying pads
2014-06-11 22:23:43 +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
ab607d3137
Add a script to reinsert all db values of a pad
2014-05-19 18:18:01 +02:00
Stefan