| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2017-07-12 | Merge pull request #3214 from patrickeasters/add_credentials_arg | Luiza Pagliari | |
| Add credentials arg to CLI module | |||
| 2017-07-10 | fix typo | Mikołaj Biel | |
| 2017-07-05 | Fetch credentials arg from CLI | Patrick Easters | |
| 2017-05-18 | [feat] New server-side hook: padCopy | Luiza Pagliari | |
| Let plugins know when a pad is copied. | |||
| 2017-05-11 | [fix] Have one setting for each shortcut to create ordered list | Luiza Pagliari | |
| This is an adjustment to #2891. | |||
| 2017-05-11 | [fix] Fix shortcut enabling flag for 'ESC' | Luiza Pagliari | |
| This is an adjustment to #2891. | |||
| 2017-05-11 | Do not use cookie for pad shortcuts | Luiza Pagliari | |
| Users still cannot choose which shortcuts they want to enable/disable, so it does not make sense (yet) to have a cookie with that preference. This can be reverted once we create an UI to change shortcuts, but PLEASE PLEASE PLEASE do not read the cookie every time handleKeyEvent is called!!! This is an adjustment to #2891. | |||
| 2017-05-11 | Merge pull request #2891 from bhldev/padShortcutDisable | Luiza Pagliari | |
| Added pad shortcut disabling feature to settings.json | |||
| 2017-04-04 | [feature] Create option to automatically reconnect after a few seconds | Luiza Pagliari | |
| On some erros that display a modal with "Force reconnect" button, allow Etherpad to automatically reload pad after a few seconds. Amount of seconds is defined on settings.json. Still need to create tests for this feature, and implement i18n. | |||
| 2017-02-08 | Merge pull request #3136 from joassouza/fix_minify | Luiza Pagliari | |
| Fix minification of JS files | |||
| 2017-02-07 | Refactor code | joassouza | |
| 2017-02-07 | Fix minification of code | joassouza | |
| 2017-01-26 | Remove deprecated comment | Sjoerd Langkemper | |
| The session key is currently stored in SESSIONKEY.txt, so it is no longer reset every time the server starts. | |||
| 2016-12-22 | Fixed crash on invalid export url | Stefan | |
| 2016-12-20 | Merge pull request #2993 from ether/fixes-2945 | Stefan | |
| fixes #2945 | |||
| 2016-12-20 | Merge pull request #3053 from danfuzz/fix-timeslider-lists | Stefan | |
| Fix timeslider lists / indents, but also make CSS `@import` work | |||
| 2016-12-20 | Merge branch 'develop' into improve_cookies | Stefan | |
| 2016-09-20 | Added LibreJS support | Nobody Really | |
| 2016-09-09 | Handle relative paths properly, when `@import`ing. | Dan Bornstein | |
| 2016-09-09 | Handle `@import` during CSS minification. | Dan Bornstein | |
| This meant plumbing a callback through to `compressCSS()`, which meant that I had to alter the innards of `getFileCompressed()`. I tried to leave that function looking more understandable than when I found it; for example, I flattened out the nested `if`. I went ahead and upgraded the version of `clean-css` while I was in the territory. | |||
| 2016-09-08 | Remove unused parameter `noDocType`. | Dan Bornstein | |
| My editor also auto-stripped some EOL whitespace. | |||
| 2016-09-08 | Remove the `noDocType` argument, which was only ever passed as `false`. | Dan Bornstein | |
| 2016-08-24 | Use an EEJS template for HTML export instead of inlining it in the JS code. | Dan Bornstein | |
| The semantics of all the substitutions are identical to what they were before. I _did_ take the liberty of formatting the CSS to be a bit more readable (at the cost of adding a little bit of whitespace). | |||
| 2016-07-10 | Make express-session cookie scheme dependent | Stefan | |
| 2016-06-20 | Fixed path check | Stefan | |
| 2016-06-13 | Merge pull request #2991 from LokeshN/deactivate-settings | John McLear | |
| Issue #2960 - deactivate settings.json | |||
| 2016-06-08 | Add secure flag to express-session cookies | Stefan | |
| 2016-06-07 | Merge pull request #2957 from ether/dependency_updates | Stefan | |
| Dependency updates | |||
| 2016-05-28 | fixes #2945 | John McLear | |
| 2016-05-22 | Issue #2960 - deactivate settings.json | LokeshN | |
| Deactivate settings.json in Admin dashboard | |||
| 2016-05-16 | Use fs.statSync instead of fs.existsSync (deprecated) | Stefan | |
| 2016-04-26 | Update socket.io to version 1.4.5 | Stefan | |
| 2016-04-09 | include the padId | John McLear | |
| 2016-01-21 | Added pad shortcut disabling feature | Brian Lim | |
| 2016-01-17 | Set language cookie on initial load | Brian Lim | |
| 2016-01-10 | Merge branch 'develop' of github.com:ether/etherpad-lite into ↵ | John McLear | |
| drag-and-drop-between-frames-sandbox | |||
| 2016-01-08 | hrm, removal | John McLear | |
| 2016-01-08 | seems to work | John McLear | |
| 2016-01-06 | Update DB.js | John McLear | |
| 2015-12-21 | include req and res in export convert hook | John McLear | |
| 2015-12-18 | Use new exportAvailable() check to include check for SOffice along with ↵ | Chris Birk | |
| Abiword in importexport hook | |||
| 2015-12-17 | check for soffice before removing export paths | Chris Birk | |
| 2015-12-02 | whoops | John McLear | |
| 2015-12-02 | working logic | John McLear | |
| 2015-12-01 | Merge pull request #2831 from fcassin/develop | John McLear | |
| Protect against a null atext value in cloneAText | |||
| 2015-12-01 | remove unused variable | John McLear | |
| 2015-12-01 | Hook for export ocnvert control | John McLear | |
| 2015-11-26 | regex incoming colors | John McLear | |
| 2015-11-24 | clean up | John McLear | |
| 2015-11-24 | allow settings to be applied from the filesystem | John McLear | |
 |
index : etherpad-lite | |
| Really real-time collaborative document editing. http://etherpad.org | cos |
| summaryrefslogtreecommitdiff |