libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-24 00:00:55 +01:00
Code Issues Projects Releases Wiki Activity
5088 commits 206 branches 105 tags 124 MiB
Commit graph

329 commits

Author SHA1 Message Date
John McLear
b3b17c2190 Merge pull request #2991 from LokeshN/deactivate-settings 
Issue #2960 - deactivate settings.json
 2016-06-13 14:41:30 +08:00
LokeshN
a8d5dc0693 Issue #2960 - deactivate settings.json 
Deactivate settings.json in Admin dashboard
 2016-05-22 21:12:21 +05:30
Stefan
835bca7967 Use fs.statSync instead of fs.existsSync (deprecated) 2016-05-16 16:51:12 +02:00
John McLear
6b6a028355 include the padId 2016-04-09 20:01:49 +01:00
Brian Lim
26aeb7b705 Added pad shortcut disabling feature 2016-01-21 07:38:41 -05:00
Chris Birk
7f517eca0b check for soffice before removing export paths 2015-12-17 21:54:04 -06:00
John McLear
98016665e4 working logic 2015-12-02 11:54:37 +00:00
Luiza Pagliari
92a8253449 Create hook exportHtmlAdditionalTagsWithData 
The new hook does the same as exportHtmlAdditionalTags, but is declared
in another hook to avoid confusion about how to export tags when they
are stored as ['tag', 'value'] on attribute pool.

This complements #2762, as per @Gared suggestions.
 2015-11-03 07:16:55 -02:00
John McLear
3aff0001a1 Merge pull request #2798 from ypid/fixed_get_git_hash 
Get git commit hash even if the repo only points to a bare repo.
 2015-10-22 16:13:58 +01:00
John McLear
50171a4c3c Merge pull request #2805 from storytouch/indentationSetting 
Create setting to control if a new line will be indented or not
 2015-10-22 16:12:07 +01:00
Simon Gaeremynck
7289e89070 Use Etherpad rather than Etherpad Lite when exporting HTML 2015-10-22 16:09:44 +01:00
Simon Gaeremynck
2bfc3026d2 Allow LibreOffice to be used when exporting a pad 
This commit adds support for LibreOffice when exporting a pad to doc, pdf, ..

This commit also cleans up some export logic when exporting to txt
 2015-10-20 19:46:08 +01:00
Luiza Pagliari
5deb06d589 Create setting to control if a new line will be indented or not 
Currently pressing ENTER on a line that ends with ':', '[', '(' or '{'
automaticaly indents the new line with 4 spaces. The variable added by
this commit to settings.json allow an Etherpad instance to not have this
behavior.
 2015-10-13 18:39:23 -03:00
Robin Schneider
29441a8ae1
Get git commit hash even if the repo only points to a bare repo. 
* Used by https://github.com/debops/ansible-etherpad
 2015-10-07 15:43:29 +02:00
Luiza Pagliari
1d134f0b13 Fixing ed52626. It was closing the span with </span data-TAG=VALUE>, not </span> 2015-09-17 15:30:09 -03:00
Luiza Pagliari
ed5262650a Generating pad HTML with tags like <span data-TAG="VALUE"> instead of <TAG:VALUE> 2015-09-07 03:55:56 -07:00
Luiza Pagliari
1a5985dc75 Accepting Arrays on 'exportHtmlAdditionalTags' to handle attributes stored as ['key', 'value'] (and not only ['key', 'true']) 2015-08-24 07:58:45 -07:00
Thomas Russell Murphy
b557927b72 Fix link to etherpad-lite on GitHub 2015-08-03 21:53:54 -05:00
Stéphane Alnet
0b3216ecb6 Do not extend Array.prototype 2015-05-22 12:27:08 +02:00
John McLear
757ad765d3 use removeItem instead of remove namespace 2015-05-22 11:09:21 +01:00
John McLear
41d24a8c8f Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-05-19 16:44:57 +01:00
John McLear
b662d5c618 dont show editing buttons in R/O view 2015-05-19 16:43:19 +01:00
Simon Gaeremynck
7fe99cccad Using log4js in TidyHtml 2015-05-18 17:43:46 +01:00
Simon Gaeremynck
786b43efc8 Tidy HTML before trying to convert it with abiword 2015-05-18 16:24:41 +01:00
Xavid
9e86fb279b Fix backend tests with new setText() implementation; tests depended 
on the old setText() behavior leaving the last character.
 2015-05-06 08:45:22 -04:00
Tom Hunkapiller
6ff7d4e9a6 revert to old path handling, but strip out "..". fixes #2614 2015-04-15 14:31:21 -05:00
louis
0fa7650df8 dont allow directory traversal #2 2015-04-12 17:12:35 +02:00
John McLear
e3f95d0c9c Merge pull request #2604 from ether/pad-options 
session key is now ignored and also padOptions are available in settings
 2015-04-11 22:33:46 +01:00
Peter 'Pita' Martischka
fc0cac0cad merge object settings into default settings 2015-04-11 22:01:46 +01:00
John McLear
8ed12c7776 session key is now ignored and also padOptions are available in settings 2015-04-11 21:22:00 +01:00
John McLear
4a70837de9 Merge pull request #2602 from devoidfury/fix/import-large-etherpad 
fix large etherpad import, fixes #2524
 2015-04-11 20:09:01 +01:00
Tom Hunkapiller
a896d67e8c make setPadRaw async; streamline .etherpad file import handling chain 2015-04-11 12:02:19 -05:00
Stefan
a3ed82ad06 Move sessionKey setting from settings.json to SESSIONKEY.txt 2015-04-11 18:45:14 +02:00
Stefan
db5bdc8719 Log version number and git-sha on server start 2015-04-11 00:13:04 +02:00
Stefan
8e4c961207 Add version number to plugins-info page 2015-04-10 23:52:17 +02:00
John McLear
9d4e5f6e35 dont allow directory traversal 2015-04-10 22:02:22 +01:00
John McLear
a5345524e1 Merge pull request #2566 from ether/editbar-accessibility 
Accessibility
 2015-04-07 21:25:27 +01:00
John McLear
3a969f8dd8 pass error messages to pad text if shown during startup 2015-04-06 00:13:38 +01:00
John McLear
e027083136 timeslider settings for fonts 2015-04-05 15:18:36 +01:00
John McLear
662216b6cf slightly different alt stuff 2015-03-31 16:36:44 +01:00
John McLear
ef38bcad9f make buttons i18n friendly and a better experience 2015-03-31 13:57:18 +01:00
John McLear
7b726cbc02 more working logic and also pretty nice screen reader experience 2015-03-26 13:58:57 +00:00
John McLear
ec1956b4b6 read for button activity 2015-03-26 12:42:07 +00:00
John McLear
5761e998de first semi working alt f9 functionality 2015-03-25 11:03:45 +00:00
webzwo0i
a0fb65205c oops, fix export with wildcards 2015-03-14 00:02:23 +01:00
John McLear
178309e10d Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-02-26 12:13:41 +00:00
John McLear
470b0ba2a6 Merge pull request #2520 from ether/load-testing-settings 
allow for load testing connections to hit by a setting
 2015-02-22 14:41:09 +00:00
John McLear
d5bec1701e fix export of bad pads and also limit import to files 2015-02-21 12:33:30 +00:00
John McLear
ec6a2b5ba9 allow for load testing connections to hit by a setting 2015-02-16 23:02:19 +00:00
webzwo0i
37924e441a add try-catch clause around calls to applyToAText 2015-02-16 09:01:30 +01:00
John McLear
ddc69831b2 working, need to test though 2015-02-11 17:59:05 +00:00
John McLear
b9802616b6 use latest cleanCSS 2015-02-04 17:57:34 +00:00
Stefan
4c64b7a670 Revert 'asyncLineHTMLForExport' hook 2015-01-25 22:08:40 +01:00
John McLear
c798a27ad8 boop 2015-01-24 13:39:45 +00:00
John McLear
1890ba3976 working, might need polish its pretty late 2015-01-24 05:14:38 +00:00
John McLear
9abb85799c realization how aCallAll works 2015-01-24 04:31:50 +00:00
John McLear
372063295f beginning of a hook, needs docs etc 2015-01-24 04:09:13 +00:00
John McLear
6fd0285d4d include lineContent in hok 2015-01-21 21:36:11 +00:00
John McLear
cb65224997 better logic for author handling 2015-01-21 00:28:00 +00:00
John McLear
5f9bbd0666 restrict expor4t to only expose this pad ID 2015-01-21 00:03:39 +00:00
John McLear
85fffbe14c more handling 2015-01-19 02:57:10 +00:00
John McLear
cadb83ac5a bumpage 2015-01-19 02:51:32 +00:00
John McLear
6bc74a9adb more export logic handling 2015-01-18 23:33:29 +00:00
John McLear
e50ea6ffea whoops proper regexp fix for listNumber 2015-01-18 23:24:20 +00:00
John McLear
bd9ff770fe reset all numbers on first item 2015-01-18 23:21:34 +00:00
John McLear
af70902bef support deeper nested elements on exports 2015-01-18 23:16:58 +00:00
John McLear
26c839063f check file system that abiword exists 2015-01-04 14:47:08 +00:00
John McLear
036b7d2890 Merge pull request #2418 from ether/etherpad-export-and-import 
Full Pad portability (Export/Import)
 2014-12-31 13:32:09 +00:00
John McLear
01c667aa2e export html more styles 2014-12-31 00:53:20 +00:00
John McLear
90e83ed6b5 more styling 2014-12-30 14:53:44 +01:00
John McLear
716b1c6113 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2014-12-30 14:44:55 +01:00
John McLear
16713d8b3b some demo export loic for handling OL incrementation 2014-12-30 14:43:00 +01:00
John McLear
4687d226c6 Merge pull request #2417 from webzwo0i/fix-export 
Fix ExportHtml.js list parsing code
 2014-12-30 13:47:31 +01:00
John McLear
ac4f9eb4ce licensing 2014-12-30 00:12:26 +01:00
John McLear
0676d2fe24 working author import 2014-12-30 00:01:15 +01:00
John McLear
1e0de620be more author logic 2014-12-29 23:08:17 +01:00
John McLear
ec2b844f94 authors 2014-12-29 22:51:31 +01:00
John McLear
a6400b3f61 allow only for pads less than 10 to be overwritten 2014-12-29 22:02:24 +01:00
John McLear
1081156f13 whoopsi, required files 2014-12-29 21:13:49 +01:00
webzwo0i
6e4e034e42 fix closing of lists 2014-12-29 16:27:40 +01:00
John McLear
c4959b089f resolve merge conflict 2014-12-29 01:54:44 +01:00
webzwo0i
6ca2c91fdf close and open lists according to the actual line.listLevel 2014-12-28 02:32:53 +01:00
webzwo0i
d71b11f4b2 fix export of lists with bullets; <li> are closed before the next list starts. also, when closing, ensure that list-items are not nested 2014-12-28 02:31:26 +01:00
John McLear
dd09f6144b Merge pull request #2398 from ether/indentLevels 
Indent levels
 2014-12-27 23:27:11 +01:00
John McLear
ae22332f71 removing dokuwiki 2014-12-27 14:08:45 +01:00
John McLear
6ac99ab03f support for export 2014-12-27 13:27:07 +01:00
John McLear
fdc930de3d Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles 2014-12-21 23:43:21 +00:00
John McLear
ee3f3b8060 move clean css back to fix minification on TS 2014-12-21 23:42:56 +00:00
webzwo0i
b204aa2085 remove more dead requires. 2014-12-16 19:10:01 +01:00
John McLear
197a41627d allow plugins to add multiple styles 2014-12-09 17:34:52 +00:00
John McLear
3a2669b704 additional tag support hook 2014-12-09 16:13:52 +00:00
John McLear
f2c155ee1a blah use async 2014-12-08 19:44:40 +00:00
John McLear
7cf0e4a9ae allow padId to be passed into the hook 2014-12-08 19:11:45 +00:00
John McLear
2218cbd252 docs 2014-12-08 19:08:12 +00:00
John McLear
12f25d8a45 bump cleancss 2014-11-29 01:31:04 +00:00
John McLear
c13301966f yeah need htis too 2014-11-27 02:56:42 +00:00
John McLear
0a84379364 make additional line break at end of imported doc 2014-11-26 15:19:22 +00:00
John McLear
881763f663 remove jsdom dep 2014-11-25 22:15:29 +00:00
John McLear
60d44cd3df use cheerio instead of jsdom 2014-11-25 17:26:09 +00:00
John McLear
9b66c93d6b swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well 2014-11-22 19:11:35 +00:00