Claudius Mbemba
8d60bd5234
fixed plugin dependency issue
...
running ./bin/run.sh after the 1st time caused the following error "TypeError: Cannot read property 'dependencies' of undefined".
fixed it.
2017-05-30 05:36:29 +02:00
Stefan
8084400e13
Try to init cookies before testing if it exists
2016-12-20 21:57:01 +01:00
Stefan
aefa617797
Merge branch 'develop' into improve_cookies
2016-12-20 21:31:11 +01:00
Stefan
368bbe4836
Merge pull request #3084 from Gared/fix_npm_node7
...
Updated npm to 4.0.2 and removed recursive searching for ep-plugins
2016-12-20 00:07:26 +01:00
Luiza Pagliari
01d23b1f6a
Merge pull request #2929 from xavidotron/develop
...
Pass through the "item" parameter to registerAceCommand callbacks.
2016-12-13 06:12:26 -02:00
Stefan
39a3bedb7b
Updated option parameters for socket.io to work with latest version
2016-11-20 12:27:27 +01:00
Stefan
00c9caf7a3
Updated npm to 4.0.2 and removed recursive searching for ep-plugins
2016-11-20 11:28:17 +01:00
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
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
Roland Hieber
dde4fdfdbd
Highlight and link more URI schemes: about, geo, tel
2016-01-30 19:03:42 +01: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
