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-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity
4757 commits 207 branches 105 tags 124 MiB
Commit graph

2395 commits

Author SHA1 Message Date
Dan Bornstein
a3765d9785 Account for any top margin on the first line. 
Without this change, a top margin on any element on the first line of pad
content would throw off the alignment of line numbers. The default stylesheet
doesn't define any elements with top margins, but plugins might. (This is also
explained in a code comment.)

In order to see the problem, add the following clause to `iframe_editor.css`
(before incorporating this commit):

    #innerdocbody > :first-child {
      margin-top: 100px;
    }
 2016-08-30 11:19:28 -07:00
Niklas Laxström
8ad9d4f6dd Localisation updates from https://translatewiki.net. 2016-08-25 07:33:25 +02: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
rugk
b5632b3ac5 Index: No-referrer 2016-08-23 22:12:40 +02:00
rugk
bf99cf92ab Pad: Add no-referrer 2016-08-23 22:12:12 +02:00
rugk
8f133abacc Timeslider: Add no-referrer 2016-08-23 22:11:11 +02:00
Luiza Pagliari
ea562250d9 Perform drag and drop in one changeset, so UNDO works properly. Fix #3041 2016-08-22 18:44:17 -03:00
Niklas Laxström
bd20d44e89 Localisation updates from https://translatewiki.net. 2016-08-18 07:52:23 +02:00
Niklas Laxström
f147146519 Localisation updates from https://translatewiki.net. 2016-08-15 08:08:30 +02:00
Niklas Laxström
2996f0fad7 Localisation updates from https://translatewiki.net. 2016-08-04 07:57:38 +02:00
Niklas Laxström
08b90437c1 Localisation updates from https://translatewiki.net. 2016-08-01 08:08:45 +02:00
Niklas Laxström
cf3aaa334f Localisation updates from https://translatewiki.net. 2016-07-28 07:59:29 +02:00
Niklas Laxström
17726856c6 Localisation updates from https://translatewiki.net. 2016-07-25 07:56:41 +02:00
Luiza Pagliari
c92e3e4b5e Fix #2918. Re-enable editor after user is reconnected to server 2016-07-21 15:23:14 -03:00
Niklas Laxström
3fcc7aa190 Localisation updates from https://translatewiki.net. 2016-07-18 08:48:25 +02:00
Stefan
009b61b338 Make express-session cookie scheme dependent 2016-07-10 12:44:45 +02:00
Niklas Laxström
728ab9307e Localisation updates from https://translatewiki.net. 2016-07-07 07:52:57 +02:00
John McLear
ab4f23aae5 Merge pull request #2970 from xavidotron/url 
Remove [ and ] from the regexp used by the URL filter.
 2016-06-28 07:28:18 +01:00
John McLear
65dcb783d1 Merge pull request #3008 from Gared/directory_check 
Fixed path check
 2016-06-22 21:50:34 +01:00
Siebrand Mazeland
a18d40df6b Localisation updates from https://translatewiki.net. 2016-06-22 16:38:16 +02:00
John McLear
f09e10b122 Merge pull request #2944 from storytouch/aceRegisterNonScrollableEditEvents 
Create hook to register events that won't scroll editor after aceEditEvt
 2016-06-20 10:36:53 +01:00
Niklas Laxström
3f4c8d35d6 Localisation updates from https://translatewiki.net. 2016-06-20 07:52:44 +02:00
Stefan
6b9711cb70 Fixed path check 2016-06-20 00:22:29 +02:00
Niklas Laxström
85cdb1cf4e Localisation updates from https://translatewiki.net. 2016-06-16 08:11:53 +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
Niklas Laxström
25fd246091 Localisation updates from https://translatewiki.net. 2016-06-13 07:44:13 +02:00
Stefan
4ea9c4f98d Add secure flag to express-session cookies 2016-06-08 21:15:26 +02:00
Stefan
06ff023047 Add secure flag to cookies on client side if pad accessed through https 2016-06-08 21:14:10 +02:00
Stefan
93dae51cda Remove test cookie 2016-06-08 21:12:27 +02:00
Stefan
44370f11be Merge pull request #2957 from ether/dependency_updates 
Dependency updates
 2016-06-07 21:32:20 +02:00
Stefan
5a868254e3 Merge pull request #2986 from Gared/fix_existssync_deprecated 
Use fs.statSync instead of fs.existsSync (deprecated)
 2016-06-07 21:30:22 +02:00
Niklas Laxström
3ea27d2613 Localisation updates from https://translatewiki.net. 2016-06-06 08:09:26 +02:00
John McLear
d545630912 fixes #2945 2016-05-28 22:25:44 +01:00
Niklas Laxström
a7405825a8 Localisation updates from https://translatewiki.net. 2016-05-26 07:57:20 +02:00
LokeshN
a8d5dc0693 Issue #2960 - deactivate settings.json 
Deactivate settings.json in Admin dashboard
 2016-05-22 21:12:21 +05:30
John McLear
73414df3c7 heh whoops :) 2016-05-20 14:43:01 +01:00
John McLear
a8487dd5dc client Var value for disabling scripts 2016-05-20 14:42:05 +01:00
Niklas Laxström
94920e5552 Localisation updates from https://translatewiki.net. 2016-05-19 09:25:51 +02:00
Stefan
835bca7967 Use fs.statSync instead of fs.existsSync (deprecated) 2016-05-16 16:51:12 +02:00
Niklas Laxström
b24e62f90a Localisation updates from https://translatewiki.net. 2016-05-12 08:59:06 +02:00
Xavid
9022877cc6 Remove [ and ] from the regexp used by the URL filter. 
These characters are rarely used in URLs, and including them leads to
mislinkifying when editing various formats, such as wiki markup formats that
use [] around links.
 2016-05-06 22:04:37 -04:00
Xavid
56b851a46f Pass through the "item" parameter to registerAceCommand callbacks. 2016-05-06 21:58:24 -04:00
Stefan
2c177f553a Updated several dependencies to latest version 2016-05-02 19:46:36 +02:00
Niklas Laxström
c5638dd7e5 Localisation updates from https://translatewiki.net. 2016-05-02 07:25:28 +02:00
Stefan
14e1f3bf22 Update socket.io to version 1.4.5 2016-04-26 18:55:58 +02:00
Stefan
ebe44b0eab Release version 1.6.0 2016-04-24 21:03:42 +02:00
Niklas Laxström
15c9041f12 Localisation updates from https://translatewiki.net. 2016-04-18 07:04:42 +02:00
Niklas Laxström
6e78895cdd Localisation updates from https://translatewiki.net. 2016-04-11 07:07:32 +02:00
John McLear
6b6a028355 include the padId 2016-04-09 20:01:49 +01:00
Niklas Laxström
21372c93a3 Localisation updates from https://translatewiki.net. 2016-04-07 08:00:19 +02:00
John McLear
282b1cdcfe Merge pull request #2940 from ether/extend-getAttributesOnSelection 
extend attributesonselection method
 2016-04-05 22:30:15 +01:00
Luiza Pagliari
3fb695a7a0 Create hook to register events that won't scroll editor after aceEditEvt 2016-03-30 11:51:18 -03:00
Stefan
103e07e828 Fix document.domain error in frontend tests 2016-03-29 16:16:22 +02:00
Niklas Laxström
8f2f01dff8 Localisation updates from https://translatewiki.net. 2016-03-28 10:09:39 +02:00
John McLear
6f2e155668 Merge pull request #2898 from rohieb/feature/more-uri-schemes 
Highlight and link more URI schemes: about, geo, tel
 2016-03-26 22:14:38 +08:00
John McLear
8df8228a36 Merge pull request #2926 from storytouch/addAuthorOnRemoveAttributeOnLine 
Update author when removing line attribute from line
 2016-03-26 22:11:22 +08:00
John McLear
97b971747f forgot this one 2016-03-26 22:01:26 +08:00
John McLear
4846798528 extend attributesonselection method 2016-03-26 22:00:34 +08:00
Niklas Laxström
7dd26bd250 Localisation updates from https://translatewiki.net. 2016-03-24 07:15:23 +01:00
Niklas Laxström
04e8b0c184 Localisation updates from https://translatewiki.net. 2016-03-21 07:09:41 +01:00
Stefan
02551d772c Fix a possible xss attack in iframe link 2016-03-20 16:28:06 +01:00
Niklas Laxström
175c29ff66 Localisation updates from https://translatewiki.net. 2016-03-17 08:47:38 +01:00
Luiza Pagliari
9bcf8690c0 Update author when removing line attribute from line 
This avoids raising error 'Trying to submit changes as another author in
changeset' when 2 authors change line attributes of the same line. This
fixes issue #2925.
 2016-03-15 15:44:00 -03:00
Niklas Laxström
a3188cf357 Localisation updates from https://translatewiki.net. 2016-03-14 08:09:25 +01:00
Siebrand Mazeland
b6ab6f2b13 Localisation updates from https://translatewiki.net. 2016-03-09 13:38:20 +01:00
Siebrand Mazeland
d88052726d Localisation updates from https://translatewiki.net. 2016-02-19 15:05:09 +01:00
Stefan
6df7ff2d08 Merge pull request #2893 from bhldev/cssFontColors 
Css default colors Issue #2853
 2016-02-14 14:54:13 +01:00
Niklas Laxström
8b8811c7ad Localisation updates from https://translatewiki.net. 2016-02-08 11:36:53 +01:00
Stefan
32d90418ca Merge pull request #2890 from bhldev/languageTimesliderUrlParameter 
Timeslider Not Translated Issue 2885
 2016-02-06 22:38:02 +01:00
Niklas Laxström
319ebb29fd Localisation updates from https://translatewiki.net. 2016-02-01 09:23:34 +01:00
Roland Hieber
dde4fdfdbd Highlight and link more URI schemes: about, geo, tel 2016-01-30 19:03:42 +01:00
Niklas Laxström
b46e5db777 Localisation updates from https://translatewiki.net. 2016-01-25 07:38:47 +01:00
Stefan
fbe3710dda Merge pull request #2863 from gutobenn/padname-size 
Limit padname input field to 50 characters
 2016-01-23 13:51:57 +01:00
Brian Lim
aaa28640cf CSS Default Font Colors for Issue 2853 2016-01-22 19:42:06 -05:00
Brian Lim
49d38522b1 Timeslider Not Translated Issue 2885 2016-01-20 02:30:25 -05:00
John McLear
d994baeefa Merge pull request #2886 from bhldev/padOptionsLang 
Set language cookie on initial load Issue #2882
 2016-01-19 23:48:30 +00:00
John McLear
13d9bdf03a Merge pull request #2887 from bhldev/editorListIndentOutdent 
Editor List Fix for 2844 and 2812
 2016-01-19 23:48:20 +00:00
Brian Lim
ae033a1e86 Fix for 2844 and 2812 2016-01-18 23:57:40 -05:00
Niklas Laxström
0b521f6528 Localisation updates from https://translatewiki.net. 2016-01-18 08:01:50 +01:00
Brian Lim
295672f598 Set language cookie on initial load 2016-01-17 21:44:03 -05:00
John McLear
f9937343c7 fix drop event on last char 2016-01-17 15:11:54 +00:00
Niklas Laxström
855bd270bd Localisation updates from https://translatewiki.net. 2016-01-11 08:28:02 +01:00
John McLear
935b921c2b more tidy 2016-01-10 14:40:57 +00:00
John McLear
50c6b5ed61 tidy up 2016-01-10 14:39:41 +00: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
f80407c6ff removal 2016-01-08 13:41:52 +00:00
John McLear
cb874b695b herp 2016-01-08 13:40:25 +00:00
John McLear
ae6110919f removal 2016-01-08 13:39:59 +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
dbc777dd13 Merge pull request #2871 from tiblu/pad_userlist_add_usersOnline_fix_bug_in_users 
pad_userlist.js: BUGFIX: users() returning duplicates on several calls. FEATURE: usersOnline() returns only online users
 2016-01-05 21:15:52 +00:00
Mikk Andresen
ccbcf0ddce Add usersOnline function to pad_userlist, fix a bug where several occurances of current user were pushed to users list. 2016-01-05 18:22:32 +02:00
John McLear
239f517afd Update package.json 2016-01-03 01:03:05 +00:00
Mikk Andresen
aab7186486 Fix handleClientMessage_USER_* payloads not containing user info 2015-12-31 14:19:23 +02:00
Niklas Laxström
2e81b39028 Localisation updates from https://translatewiki.net. 2015-12-29 10:44:17 +01:00
John McLear
34a46d6318 should be clean enough to push 2015-12-23 14:35:52 +00:00
Augusto Bennemann
a34c8e4721 Limit padname size to 50 characters 2015-12-22 13:25:56 -02:00
John McLear
b519f9f156 include req and res in export convert hook 2015-12-21 17:32:05 +00:00
John McLear
577102b025 license 2015-12-21 16:29:09 +00:00