ilmar
7cc7bb1abc
upgrade to 1.6.5
2018-04-24 12:25:56 +03:00
ilmar
d6fa065ef2
export html to original structure
2018-04-24 12:13:31 +03:00
ilmar
517b249394
D
2018-04-10 00:08:42 +03:00
ilmar
8502c04bee
html lists export fix
2018-04-09 15:37:28 +03:00
Peter 'Pita' Martischka
6d5dc93dbf
merged
2018-04-07 10:23:49 +01:00
ilmar
b4ad7cf452
Export lists fix + code linting and readability update
2018-04-05 23:27:02 +03:00
John McLear
6388055f51
Merge pull request #12 from nashe/no_findkeys_export
...
No findkeys during export
2018-04-04 19:36:59 +01:00
Peter 'Pita' Martischka
806c9207e3
remove findkeys from pad export
2018-04-04 18:02:54 +01:00
John McLear
d393bf4dd8
Merge pull request #3232 from michael-dev/develop
...
Make APIKEY and SESSIONKEY file customizable
2018-04-03 13:34:49 +01:00
Mikk Andresen
6f2466bebc
Merge with upstream develop.
2018-04-02 13:47:16 +03:00
Luc Didry
82816acf4a
Fix .doc export with LibreOffice (soffice) ( #3338 )
...
When using LibreOffice to convert pads to doc, we got `Error: no export filter for /tmp/xxxx.doc` (tested with LO 5 and 6). Maybe it's a regression from LO. Anyway, converting HTML to odt, then to doc works.
Thx to lpagliari for her review!
2018-03-08 10:44:11 -03:00
Joas Souza
f1fcd16894
Add settings to scroll on edition out of viewport ( #3282 )
...
* Add scroll when it edits a line out of viewport
By default, when there is an edition of a line, which is out of the
viewport, Etherpad scrolls the minimum necessary to make this line
visible. This makes that the line stays either on the top or the bottom
of the viewport. With this commit, we add a setting to make possible to
scroll to a position x% pixels from the viewport. Besides of that, we
add a setting to make an animation of this scroll.
If nothing is changed on settings.json the Etherpad default behavior is
kept
2018-01-03 19:57:28 -02:00
ilmar
76f211b0bf
ExportHtml.js update
2017-11-01 09:48:23 +02:00
ilmar
5469ce85cd
exportHTML update
2017-10-31 22:46:24 +02:00
Michael Braun
4cce3bcbed
Make APIKEY und SESSIONKEY file customizable
...
Running multiple instances sometimes requires different api- and session-keys for security reasons.
2017-07-31 15:31:45 +02:00
Patrick Easters
d72d79ea82
Fetch credentials arg from CLI
2017-07-05 15:20:02 -04:00
Luiza Pagliari
0cb8d31e95
[fix] Have one setting for each shortcut to create ordered list
...
This is an adjustment to #2891 .
2017-05-11 14:56:09 -03:00
Luiza Pagliari
97038c2183
[fix] Fix shortcut enabling flag for 'ESC'
...
This is an adjustment to #2891 .
2017-05-11 12:36:20 -03:00
Luiza Pagliari
1ebcf0dc47
Merge pull request #2891 from bhldev/padShortcutDisable
...
Added pad shortcut disabling feature to settings.json
2017-05-11 11:29:25 -03:00
Luiza Pagliari
009cd31243
[feature] Create option to automatically reconnect after a few seconds
...
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-04-04 11:09:24 -03:00
joassouza
0025613ba6
Refactor code
2017-02-07 15:06:49 -02:00
joassouza
d1e6c8492d
Fix minification of code
2017-02-07 13:04:22 -02:00
Dan Bornstein
0a9d02562d
Handle relative paths properly, when @importing.
2016-09-09 12:59:02 -07:00
Dan Bornstein
a5a7ebea3d
Handle @import during CSS minification.
...
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-09 12:32:24 -07:00
Dan Bornstein
a0403ffc22
Remove unused parameter noDocType.
...
My editor also auto-stripped some EOL whitespace.
2016-09-08 09:46:13 -07:00
Dan Bornstein
879ae7c67d
Remove the noDocType argument, which was only ever passed as false.
2016-09-08 09:41:23 -07:00
Dan Bornstein
6d7f128b87
Use an EEJS template for HTML export instead of inlining it in the JS code.
...
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-08-24 16:25:31 -07:00
Stefan
6b9711cb70
Fixed path check
2016-06-20 00:22:29 +02:00
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
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
9fa77cdea2
working handling of setting client ip and anonymizing etc
2014-11-04 23:25:18 +00:00
John McLear
cb28d10963
move logging into debug environment variable .. sighs
2014-11-04 18:32:26 +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
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
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
Marcel Klehr
6054cda473
Create a customizable timeslider toolbar
2014-03-30 13:02:41 +02:00
Marcel Klehr
da5970dda3
Refactor toolbar.js to use consistent naming
2014-03-16 15:14:21 +01:00
Marcel Klehr
a369347d86
Merge branch 'pr/1579' into toolbar-test
...
Conflicts:
settings.json.template
src/static/js/pad_editbar.js
2014-03-16 13:30:22 +01:00
webzwo0i
a43123880a
fix randomstring
2014-01-24 01:19:14 +01:00
Robert Helmer
348d9a838f
convert over to server-side crypto
2014-01-15 11:44:57 -08:00
Robert Helmer
ae99c5ea6f
new randomString function should take len arg
2014-01-15 11:44:41 -08:00
Robert Helmer
9ef709e7f7
mozilla bug 844796 - use node crypto module for randomString
2014-01-15 10:58:50 -08:00
John McLear
7d47d91a08
Merge pull request #1514 from ether/dont-die-on-bad-html
...
dont die on bad html but only warn to api logger but dont tell client th...
2013-12-16 03:08:42 -08:00
John McLear
58cd71dcce
Merge branch 'fix-exporthtml-styling-tags' of https://github.com/webzwo0i/etherpad-lite into develop
2013-12-10 19:25:36 +00:00
John McLear
58bbfd8a65
resolve merge conflict
2013-12-09 21:55:04 +00:00
webzwo0i
9400425b1e
[virtual_lines] remove traces of virtual_lines/makeVirtualLineView. this code was used for FF2 key handling code and is long unused
2013-12-08 17:33:58 +01:00
webzwo0i
ca6f877db2
[padDiff] remove unused functions a?lines_length
2013-12-08 17:28:43 +01:00
webzwo0i
e1fbb1d1aa
fix loop
2013-12-08 13:53:26 +01:00
webzwo0i
9557dc9dba
remove unused require
2013-12-08 13:48:21 +01:00
webzwo0i
c3081c046b
function scope: variables only need to be declared once
2013-12-08 13:47:05 +01:00
webzwo0i
0fa0d6dc2c
remove now unused code
2013-12-08 13:45:45 +01:00
webzwo0i
27e0c37779
refactor export of style attributes
...
1. mark all attributes that are used
2. find the outermost attribute that is no longer used
3. close all tags upto this attribute
4. open all tags that are used and not open
(5. close all open tags)
2013-12-08 13:39:50 +01:00
webzwo0i
f968b5a057
useless var statement (function scope)
2013-12-08 11:37:47 +01:00
webzwo0i
51769585a9
workaround so that at least one tag stays open if its the outermost tag. saves some space in the output
2013-12-08 11:37:07 +01:00
webzwo0i
656a558af9
be more clear about the value in propVals
2013-12-08 11:35:28 +01:00
webzwo0i
a534b1ec22
some more docs for attribute export and cleanup empty lines
2013-12-08 11:34:11 +01:00
webzwo0i
70c51d731b
add some documentation for styling attributes export
2013-12-08 11:33:20 +01:00
webzwo0i
86791707cd
fix export so no tags are omitted
2013-12-08 11:31:23 +01:00
Luc Didry
3d8452b143
Replace tabs indentation with spaces indentation
...
Some files are obviously external libraries, I didn't touch them
2013-12-05 08:41:29 +01:00
s1341
9b7203d4d2
have the server parse the settings file using minify and strip commas
2013-11-26 10:20:59 +02:00
Grant Woodford
fbe4e43c3d
Privacy: Add an option to disable IP logging
2013-10-19 21:37:11 +02:00
Marcel Klehr
7b17bd58ae
Merge branch 'pr/1756' into develop
...
Conflicts:
src/node/handler/SocketIORouter.js
2013-09-29 16:45:12 +02:00
Eric Schrijver
b34224559d
‘Etherpad Lite’ -> ‘Etherpad’
2013-09-29 13:57:37 +02:00
John McLear
4bea3a348e
strip title out of html during import, pesky abiword behavior
2013-09-21 23:29:32 +01:00
John McLear
204118eea5
dont crash on malformed HTML import
2013-09-21 16:11:56 +01:00
goldquest
7528ddf610
typo
2013-05-29 16:54:39 +02:00
goldquest
121c02c74f
Grant access, when valid session is available and sessionNoPassword is set
2013-05-29 16:53:14 +02:00
Spruce (Felix Fichte)
fb0bc31056
updated to use settings
...
updated handler/SocketIORouter.js to use new setting
updated hooks/express.js to use new setting
updated utils/Settings.js to accept new setting
updated settings.json.template so new setting is present
2013-04-24 12:19:41 +02:00
cohitre
602380abb7
passing the ToolbarItem to the callback
2013-04-15 16:06:32 -07:00
John McLear
f987299a5d
catch error on export
2013-04-15 23:01:08 +01:00
cohitre
0c52fb5e30
Normalizing how select and button commands are triggered.
2013-04-15 11:32:59 -07:00
cohitre
90837437c5
Moving the toolbar plugin calls.
2013-04-13 12:06:51 -07:00
Marcel Klehr
04a53c4402
Merge branch 'feature/support-node-0.10' into develop
...
Conflicts:
src/package.json
2013-04-01 13:29:07 +02:00
Manuel Knitza
358b07390e
fix "util.pump() is deprecated. Use readableStream.pipe()"
...
fix error introduced by b3988e3
2013-03-30 15:42:10 +01:00
disy-mk
c78aad16ea
adds missing semicolons in src/node/utils folder
2013-03-24 01:18:44 +01:00
John McLear
b3988e30d5
pump isdeprecated
2013-03-23 17:55:34 +00:00
Marcel Klehr
cd9c78998e
Fix path.join in Settings.js
2013-03-16 09:47:10 +01:00
cohitre
988653b8ce
Toolbar hooks
2013-03-12 19:36:04 -07:00
cohitre
52aa7d3997
Registering commands on the ace toolbar
2013-03-10 15:42:12 -07:00
cohitre
292a3bd7b7
Setting up the right toolbar.
2013-03-09 14:57:42 -08:00
cohitre
c57bc444cd
basic toolbar setup
2013-03-03 16:06:14 -08:00
Marcel Klehr
c4966543ed
Fix settings object having constructors of another vm.context
...
This made it impossible to rely on `instanceof` to work as expected on (even parts of) the settings object
Fixes #1570
2013-02-28 16:16:26 +01:00
John McLear
18b6cf1534
Merge pull request #1523 from ether/store-sessions-in-db
...
Store sessions in db
2013-02-26 18:03:54 -08:00
John McLear
7f09ec25a2
no need for prefix and tidy double semi
2013-02-13 21:53:15 +00:00
John McLear
efce99c3a1
session key in settings file OR generate temp key for instance
2013-02-13 21:51:09 +00:00
John McLear
aefd8d8d0d
nice chars n no cruft
2013-02-13 18:45:45 +00:00
John McLear
dea892213e
Revert "allow non ascii chars in txt export"
...
This reverts commit be56272e66
2013-02-13 18:41:04 +00:00
John McLear
be56272e66
allow non ascii chars in txt export
2013-02-13 18:30:55 +00:00
John McLear
d3f730e2ba
fix various issues dont stop random *'s appearing
2013-02-13 18:01:15 +00:00
John McLear
198110eb4b
drunk comments
2013-02-12 23:49:43 +00:00
John McLear
e152c477c7
include the callback call, for sanity and stop the pad from being nuked so early in the function
2013-02-12 23:38:02 +00:00
John McLear
086132de66
dont die on bad html but only warn to api logger but dont tell client that it failed cause html was bad
2013-02-12 23:23:44 +00:00
John McLear
da246d183d
Correct license header
2013-02-12 19:47:53 +00:00
John McLear
0b5c948549
Move code from Html export to a Helper file
2013-02-12 19:45:46 +00:00
John McLear
60ef5f210a
remove duplicate code to the best of my ability right now
2013-02-10 23:41:14 +00:00
John McLear
bcf9c23b4e
dont use HTML filter hooks on txt export
2013-02-10 19:38:16 +00:00
John McLear
626ee97669
kinda brutal way of stopping plugins being able to pass *s instead of attributes
2013-02-10 19:36:46 +00:00
