Paul Carver
573b55af8b
Correct the spelling of occured to occurred
...
The correct spelling is occurred. See
http://www.gingersoftware.com/english-online/spelling-book/misspelling/occurred-occured-ocurred
or other dictionary search results.
2016-11-11 12:46:40 -05:00
Dan Bornstein
0a9d02562d
Handle relative paths properly, when @importing.
2016-09-09 12:59:02 -07:00
Dan Bornstein
d7940cf8c5
Harmonize list- and indent-related CSS in the pad editor and timeslider.
...
* Add a new file `lists_and_indents.css` to hold the common CSS.
* Remove the corresponding CSS from `iframe_editor.css`, replacing it with
an `@import` of the new file.
* Remove the list/indent code from `timeslider.css`, which was _unlike_ the
corresponding editor CSS code, again replacing it with an `@import` of the
new file.
2016-09-09 12:33:46 -07:00
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
Luiza Pagliari
ea562250d9
Perform drag and drop in one changeset, so UNDO works properly. Fix #3041
2016-08-22 18:44:17 -03:00
Luiza Pagliari
c92e3e4b5e
Fix #2918 . Re-enable editor after user is reconnected to server
2016-07-21 15:23:14 -03:00
Stefan
009b61b338
Make express-session cookie scheme dependent
2016-07-10 12:44:45 +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
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
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
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
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
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
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
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
Stefan
02551d772c
Fix a possible xss attack in iframe link
2016-03-20 16:28:06 +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
Stefan
6df7ff2d08
Merge pull request #2893 from bhldev/cssFontColors
...
Css default colors Issue #2853
2016-02-14 14:54:13 +01:00
Roland Hieber
dde4fdfdbd
Highlight and link more URI schemes: about, geo, tel
2016-01-30 19:03:42 +01:00
Brian Lim
aaa28640cf
CSS Default Font Colors for Issue 2853
2016-01-22 19:42:06 -05:00
Brian Lim
26aeb7b705
Added pad shortcut disabling feature
2016-01-21 07:38:41 -05:00
Brian Lim
49d38522b1
Timeslider Not Translated Issue 2885
2016-01-20 02:30:25 -05:00
Brian Lim
ae033a1e86
Fix for 2844 and 2812
2016-01-18 23:57:40 -05:00
John McLear
f9937343c7
fix drop event on last char
2016-01-17 15:11:54 +00: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
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
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
Mikk Andresen
aab7186486
Fix handleClientMessage_USER_* payloads not containing user info
2015-12-31 14:19:23 +02:00
John McLear
34a46d6318
should be clean enough to push
2015-12-23 14:35:52 +00:00
Chris Birk
313f390e7a
remove logging
2015-12-17 21:56:33 -06:00
Chris Birk
7f517eca0b
check for soffice before removing export paths
2015-12-17 21:54:04 -06:00
John McLear
bf6e225aa2
include event on paste and drrororororop
2015-12-05 19:06:40 +00:00
John McLear
b3d44b6956
remove con log
2015-12-05 18:51:27 +00:00
John McLear
fa492dc926
ace drop event
2015-12-05 18:50:51 +00:00
John McLear
1a303f06b6
Merge pull request #2850 from tiblu/aceEditorCSS_allow_external_css
...
aceEditorCSS hook to allow absolute paths to resources to include external CSS
2015-12-02 11:26:38 +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
joassouza
4c8c1f53b5
Update the bowser.js to the new version
...
With this new version of bowser.js is possible detect the OS as well,
no only the browser as the previous one. It brings support to
new browsers as well.
2015-12-01 11:53:49 -03:00
Mikk Andresen
ad2ea924b5
aceEditorCSS to allow absolute paths to resources to include external CSS
2015-12-01 14:16:44 +02:00
Francois Cassin
2bd698343a
Protects against a null atext in cloneAText
2015-11-10 16:21:43 +01:00
John McLear
f774c2584f
paste hook and class for editorcontainer
2015-11-06 13:21:25 +00:00
John McLear
c575c8b447
Merge pull request #2820 from storytouch/fix_2818
...
Fix logic to check if any hook handled ACE key event. Fix #2818
2015-11-02 13:08:30 +00:00
John McLear
2b980653d6
Merge pull request #2822 from storytouch/esc
...
Allow plugins handle "esc" key event
2015-11-02 13:08:01 +00:00
Luiza Pagliari
478f5788e3
Add callstack to aceSelectionChanged context
2015-10-30 12:13:43 -02:00
joassouza
959de82e2a
Allow plugins handle "esc" key event
2015-10-29 14:54:21 -03:00
Luiza Pagliari
c551fe4c1e
Fix logic to check if any hook handled ACE key event. Fix #2818
...
Instead of checking if only the first hook had returned true, we check
all hooks.
2015-10-27 07:44:51 -02:00
John McLear
c337a0585c
Merge pull request #2724 from xavidotron/develop
...
Add a aceSelectionChanged hook to allow plugins to react when the cursor moves
2015-10-22 16:19:07 +01:00
John McLear
08c6e3e29f
Merge pull request #2739 from otetard/bugfix/fix_space_removal
...
Avoid space removal when pasting text from word processor.
2015-10-22 16:18:29 +01:00
John McLear
0d769632df
Merge pull request #2748 from CodeMichael/develop
...
allow /admin to run in a subdirectory
2015-10-22 16:17:10 +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
82c7ca4ac3
add classes for bootstrap targeting, pew pew
2015-10-22 01:32:02 +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
Luiza Pagliari
77496b357c
Merge pull request #2777 from storytouch/fix2772
...
Fix 2772. Skipping line marker when applying attribs to a range
2015-09-28 15:28:26 -03:00
Stefan
442f2a08f7
Merge pull request #2774 from ether/timeslider-fix
...
Timeslider: Fix "Return to pad" button
2015-09-16 16:07:37 +02:00
Luiza Pagliari
330d2b079d
Fix 2772. Skipping line marker when applying attribs to a range
2015-09-08 11:55:36 -03:00
Stefan
92798f21e8
Merge pull request #2743 from lpagliari/develop
...
Removing style that makes editor scroll to the top on iOS without any action from the user
2015-09-05 20:53:35 +02:00
Robin Buse
04a26a3e24
Timeslider: Fix "Return to pad" button
...
Closes #2768
2015-09-03 23:04:40 +02:00
CodeMichael
68e260783c
Merge pull request #2 from CodeMichael/patch-1
...
allow admin to run on a sub-directory
2015-08-07 08:34:31 -05:00
CodeMichael
6f6de64c4a
allow /admin to run on a sub-directory
2015-08-07 08:31:08 -05:00
CodeMichael
3b08ea6158
allow admin to run on a sub-directory
2015-08-07 08:30:29 -05:00
Stefan
856fc5975b
Fix broken switchToPad method
2015-08-05 18:23:54 +02:00
Luiza Pagliari
0677501d0b
Removing style that makes editor scroll to the top on iOS without any action from the user
2015-08-04 07:46:46 -07:00
Olivier Tétard
275a7d31e0
Avoid space removal when pasting text from word processor.
...
Since bf380eea50
2015-07-27 16:38:57 +02:00
Xavid
008d4e653c
Add a aceSelectionChanged hook to allow plugins to react when the cursor
...
location changes.
2015-07-11 11:33:20 -04:00
Luiza Pagliari
67f4ad5887
Fix editbar height for read-only pads
2015-07-07 16:55:19 -03:00
Luiza Pagliari
8a0a1a65b1
Adding missing code to make toolbar be fixed on top/bottom of the screen for iOS devices.
...
This commit complements 9ccaeb5
2015-07-07 16:54:11 -03:00
Luiza Pagliari
47c4ca9c29
Fixing chat on bottom of the page for mobile devices
2015-07-03 18:38:46 -03:00
Luiza Pagliari
9ccaeb585b
Fixing toolbar on top of the page for mobile devices
2015-07-02 13:03:45 -07:00
Gerhard Großmann
7c0f3a6826
Added Helvetica Neue to the Normal font
2015-07-01 12:13:37 +02:00
Gerhard Großmann
c0f5b92e3d
Added CSS fallback fonts
...
I’m not sure if this is the correct and only place where to change this. I just gave the present fonts some fallbacks (when possible) but didn’t add, remove or merge fonts.
2015-07-01 10:42:33 +02:00
John McLear
90575064a9
aria-labels for everything
2015-06-28 17:14:37 +01:00
Luiza Pagliari
6ed85b8787
Fixing @font-face src path to be able to use font icons on plugins when minify is on.
...
This is a commit similar to 56ce8e8
2015-06-24 14:32:10 -03:00
Xavid
778e1e4641
Allow a return keypress in a list on the last line of a pad to create a new
...
line.
2015-06-19 14:03:22 -04:00
goldquest
32ba48835a
if variable not declared, test if null throws error
2015-06-17 18:54:19 +02:00
Luiza Pagliari
1353c093db
Add new icon to fontawesome subset: comment
2015-06-10 18:05:24 -03:00
John McLear
5a5d245c06
fix issues with redrawing focus back to input element would lose param selected name
2015-06-08 17:13:46 +01:00
Luiza Pagliari
92aabe12dc
Allowing 'value' to be a localizable attribute on HTML elements.
2015-05-25 07:08:24 -03:00
John McLear
0eb8b800cf
hide chat if its already open on readonly mode
2015-05-20 01:50:37 +01:00
John McLear
3944a0e79b
more read only mode fixes andadd support for handleMessageSecurity hook
2015-05-20 01:05:53 +01:00
John McLear
fe7ab21c84
dont allow chat input or name input on read only pads
2015-05-19 17:52:43 +01:00
John McLear
3b91b46baa
always hide connected one second after connected
2015-05-10 11:46:49 +01:00
John McLear
f5ccd3ce6d
Merge pull request #2656 from stefanmintert/20150507-innertext-bugfix
...
Bugfix innerText
2015-05-07 23:09:24 +01:00
John McLear
debca84ebe
Merge branch 'develop' of https://github.com/ether/etherpad-lite into fix-dead-keys
2015-05-07 15:56:01 +00:00
John McLear
975bd99064
support for french stuff
2015-05-07 15:55:52 +00:00
Stefan Mintert
250afd0451
Bugfix. Description of bug at https://github.com/tm-linkwerk/ep_linebreak/blob/WR-72-linebreak-cursorverhalten/static/hooks.js#L94
2015-05-07 16:47:14 +02:00
John McLear
ee0368fd0f
Merge pull request #2649 from xavidotron/develop
...
When using setText(), replace the entire existing text of the pad.
2015-05-06 16:37:07 +01:00
John McLear
361807e578
console msg should go to window
2015-05-06 00:36:42 +01:00
