fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,578 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

3578 Commits

Author SHA1 Message Date
John McLear aa908ea8ce tidy up template a bit 2014-07-22 16:02:22 +01: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
John McLear 03ead389ba Merge pull request #2193 from kpn3m000/develop 
Fixes exception on search (plugins without description)
 2014-07-03 19:03:39 +01:00
kpn3m000 da0fe98edc Fixes search on plugins without Description 
example "tables_ssl"
 2014-07-03 14:24:41 +02:00
John McLear a3a40e1bcc Merge pull request #2186 from ether/font-on-innerdoc-body 
Font on innerdoc body
 2014-06-28 15:19:59 +01:00
John McLear 2ee4e9e7fd change to line 73 2014-06-28 15:19:28 +01:00
John McLear b657676bdd gah can only do 1/2 a fix 2014-06-24 19:02:40 +01:00
John McLear 25ace65374 don't lose comment 2014-06-24 18:46:41 +01:00
John McLear db045c6ffd CSS fix for pasting plain-text in chrome, needs thorough testing 2014-06-24 18:45:54 +01:00
Siebrand Mazeland a76dc697f0 Localisation updates from https://translatewiki.net. 2014-06-23 12:39:04 +00: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
Siebrand Mazeland 6dd66c6a16 Localisation updates from https://translatewiki.net. 2014-06-17 11:55:02 +00: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 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
luto f70309645c pluginfw: accept 'null' as a hook-result, as this is needed by handleMessage 2014-06-12 13:33:17 +02: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
Marcel Klehr 7bec297c0a Merge pull request #2161 from ether/bump-ueber 
bump ueberdb for more performance on mysql
 2014-06-11 14:40:54 +02:00
Marcel Klehr 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
Stephan Jauernick bbd50dfc62 Added documentation for the newly added API method getPadID 2014-06-02 20:25:16 +02:00
Marcel Klehr 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
John McLear 0bc98a6b60 Merge pull request #2166 from divergentdave/patch-1 
Fix typos in easysync-full-description.tex
 2014-06-02 10:22:24 +01:00
David Cook 49114d2b7a Fix typos in easysync-full-description.tex 2014-06-01 23:57:20 -05: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
John McLear 37f6dde365 bump ueberdb for more performance on mysql 2014-05-21 13:20:39 +01: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
John McLear a82823ede2 use full string not first char 2014-05-12 15:15:10 +01:00
John McLear d09e66e271 use call first and update docs 2014-05-12 15:08:32 +01:00
Siebrand Mazeland 9212ebe9f0 Localisation updates from https://translatewiki.net. 2014-05-12 13:42:45 +00:00
John McLear b74c43889e Update ImportHandler.js 2014-05-09 13:50:00 +01:00
Siebrand Mazeland 32898dec80 Localisation updates from https://translatewiki.net. 2014-05-08 08:40:43 +00:00
John McLear ec6dc4fa0e make async, please check 2014-05-07 16:27:41 +01:00
John McLear 69ba3cc104 remove eplite add etherpad 2014-05-07 15:17:14 +01:00
John McLear a8d9a3868d docs for new hook 2014-05-06 21:22:03 +01:00
John McLear 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
John McLear 6d38b05623 abiword shouldnt be used for HTML native documents 2014-05-06 17:32:45 +01:00
Marcel Klehr 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
Marcel Klehr 46ef83d710 Fix #online_count 
Rather dirty, but works.
 2014-04-30 22:32:08 +02:00
Siebrand Mazeland 20c32de5e7 Localisation updates from https://translatewiki.net. 2014-04-21 09:23:10 +00:00
John McLear 706ee1f866 fix color 2014-04-15 18:11:41 +01:00