Stefan
efb25f417a
Merge pull request #2993 from ether/fixes-2945
...
fixes #2945
2016-12-20 22:08:05 +01:00
Stefan
a1ec061017
Merge pull request #3053 from danfuzz/fix-timeslider-lists
...
Fix timeslider lists / indents, but also make CSS `@import` work
2016-12-20 22:06:31 +01:00
Stefan
aefa617797
Merge branch 'develop' into improve_cookies
2016-12-20 21:31:11 +01:00
Nobody Really
97fd1ab2fe
Added LibreJS support
2016-09-20 09:30:35 +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
009b61b338
Make express-session cookie scheme dependent
2016-07-10 12:44:45 +02: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
Stefan
4ea9c4f98d
Add secure flag to express-session cookies
2016-06-08 21:15:26 +02:00
Stefan
44370f11be
Merge pull request #2957 from ether/dependency_updates
...
Dependency updates
2016-06-07 21:32:20 +02:00
John McLear
d545630912
fixes #2945
2016-05-28 22:25:44 +01: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
Stefan
14e1f3bf22
Update socket.io to version 1.4.5
2016-04-26 18:55:58 +02:00
John McLear
6b6a028355
include the padId
2016-04-09 20:01:49 +01:00
Brian Lim
295672f598
Set language cookie on initial load
2016-01-17 21:44:03 -05:00
John McLear
ef9cf974a2
Merge branch 'develop' of github.com:ether/etherpad-lite into drag-and-drop-between-frames-sandbox
2016-01-10 14:37:44 +00:00
John McLear
793b34d17b
hrm, removal
2016-01-08 13:39:32 +00:00
John McLear
f16616d23b
seems to work
2016-01-08 13:26:46 +00:00
John McLear
638757fdb5
Update DB.js
2016-01-06 00:01:48 +00:00
John McLear
b519f9f156
include req and res in export convert hook
2015-12-21 17:32:05 +00:00
Chris Birk
d6033de0da
Use new exportAvailable() check to include check for SOffice along with Abiword in importexport hook
2015-12-18 00:14:13 -06:00
Chris Birk
7f517eca0b
check for soffice before removing export paths
2015-12-17 21:54:04 -06:00
John McLear
e2a0e3cd7f
whoops
2015-12-02 12:10:25 +00:00
John McLear
98016665e4
working logic
2015-12-02 11:54:37 +00:00
John McLear
f44c444720
Merge pull request #2831 from fcassin/develop
...
Protect against a null atext value in cloneAText
2015-12-01 17:50:29 +00:00
John McLear
1a8462fb4f
remove unused variable
2015-12-01 17:40:16 +00:00
John McLear
4ae88b2ee7
Hook for export ocnvert control
2015-12-01 17:38:52 +00:00
John McLear
8a79ae6e02
regex incoming colors
2015-11-26 15:55:26 +00:00
John McLear
a8c2833759
clean up
2015-11-24 14:03:38 +00:00
John McLear
039a761eaf
allow settings to be applied from the filesystem
2015-11-24 14:02:37 +00:00
Francois Cassin
2bd698343a
Protects against a null atext in cloneAText
2015-11-10 16:21:43 +01: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
Bradley Arvin
a9d7ab9e18
Fix for #2809
2015-10-28 13:28:54 -04: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
John McLear
5652adb4eb
Merge pull request #2813 from simong/export-libreoffice
...
Allow LibreOffice to be used when exporting a pad
2015-10-22 16:11:26 +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
Ted Mielczarek
a675659dc2
Add an appendText API
2015-10-19 15:27:09 -04:00
Stefan
504cc102a0
Merge pull request #2762 from storytouch/exportTagsAsArrays
...
Accepting Arrays on 'exportHtmlAdditionalTags'
2015-10-17 18:24:18 +02: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
Stefan
9d29b15def
Merge pull request #2730 from emilyxxie/clientready_hook
...
added clientReady hook
2015-10-10 13:30:36 +02:00
Stefan
22bf9c9297
Merge pull request #2799 from Gared/fix_url_location_error
...
Fix decode error if pad name contains special characters and is sanitized
2015-10-10 13:21:40 +02:00
webzwo0i
1ee1f818db
if granularity is negative, endNum is negative and loop
2015-10-09 14:55:59 +02:00
webzwo0i
31f7c7e0f2
check if ChangesetRequest granularity is a number ( #2796 )
2015-10-09 14:55:19 +02:00
