libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5659 commits 2 branches 0 tags 24 MiB
Commit graph

1297 commits

Author SHA1 Message Date
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, some spaces were removed when pasting text from a word processor (at least using Libre Office). To avoid double space creations and space removal, we only remove line break which are tight to a space character.
 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, which did the same for 'opendyslexic'.
 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
John McLear
c903cb3925 fix alt c and escape 2015-05-06 00:32:36 +01:00
John McLear
363d5d06b7 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-05-05 20:41:58 +01:00
John McLear
48c2b7cde1 fixes #2570 2015-05-05 20:41:40 +01:00
Xavid
5e64c292a4 When using setText(), replace the entire existing text of the pad, 
rather than replacing all except the last letter.
 2015-05-05 14:18:27 -04:00
0ip
9b85b8dc98 Fix popup border 2015-05-04 22:18:34 +02:00
John McLear
0a9c631410 better fix for #2625 2015-05-01 20:44:36 +01:00
John McLear
da06ac6fd7 dont prompt twice on import fool 2015-04-29 16:40:29 +01:00
Alexander Sulfrian
74ad7a8584 timeslider: Fix export links 
Names of the pads can contain more charaters than \w. So while
transforming the export links, we simply can allow all charaters
except the slash as pad names.
 2015-04-29 16:39:40 +02:00
John McLear
ac41d150c0 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-04-28 23:42:11 +01:00
John McLear
1f471b0f81 show versions of plugins at startup, fixes #2642 2015-04-28 23:41:55 +01:00
John McLear
799b086216 Merge pull request #2641 from lpagliari/develop 
Fix the way Content Collector gets the node class. Fixes #2640
 2015-04-28 23:05:39 +01:00
John McLear
dbb2956d2f allow chrome to use control shift 1 to send ordered list 2015-04-28 15:48:12 +01:00
Luiza Pagliari
58ab17bf9e Fix the way Content Collector gets the node class. Fixes #2640 2015-04-28 05:31:07 -07:00
John McLear
b349a4f226 probably fixes #2625 2015-04-23 17:49:08 +01:00
John McLear
b8192fd015 first attempt at fixing dead keys, it cant be this easy can it? 2015-04-17 17:01:15 +01:00
John McLear
629f909d57 add some semicoolons to prevent chrome warning 2015-04-13 10:52:15 +01:00
John McLear
6a027d88a9 fix older IEs 2015-04-12 13:00:01 +01:00
John McLear
5435063a2f re-fix rtl 2015-04-12 10:35:24 +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
27aa71f3a4 IE list fixes 2015-04-11 13:16:45 +01:00
John McLear
34c5441392 msg to self 2015-04-11 11:37:20 +01:00
John McLear
14fab9f441 FF middle click fix 2015-04-11 10:45:51 +01:00
John McLear
7b86eb09bc new fix for #1766 2015-04-08 09:24:19 +01:00
John McLear
7e99724fec Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility 2015-04-06 13:19:42 +01:00
John McLear
e027083136 timeslider settings for fonts 2015-04-05 15:18:36 +01:00
John McLear
56ce8e80ac hacky fix for opendyslexic 2015-04-05 14:50:53 +01:00
John McLear
41bb4ef094 support for open dyslexic font 2015-04-05 14:03:09 +01:00
John McLear
e49bb4017c use ctrl shift 2 instead of alt a 2015-04-05 13:42:26 +01:00
John McLear
db0bcdd696 fix issue where focus on timeslider wouldnt work 2015-04-05 13:39:20 +01:00
John McLear
f79e2c7de2 final accessibility for Timeslider hopefully 2015-04-03 12:29:47 +01:00
John McLear
139edceb66 Merge branch 'editbar-accessibility' of github.com:ether/etherpad-lite into editbar-accessibility 2015-04-02 16:50:43 +01:00
John McLear
85fc012bac change to alt shit and a to show authors 2015-04-02 15:13:16 +01:00
John McLear
644536b27b fix for #2574 2015-04-02 13:16:49 +01:00
John McLear
f6b4b5603d fix timeslider title issues 2015-04-02 00:03:34 +01:00
John McLear
0b90da19d2 Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility 2015-03-31 23:32:15 +01:00
John McLear
70fdc7dcd7 Merge pull request #2423 from ether/fix/reimplement-ace-getAttributeOnSelection 
Re-implement ace_getAttributeOnSelection
 2015-03-31 23:21:49 +01:00
John McLear
b6ff1807da Merge pull request #2482 from ether/chrome-list-handling 
chrome list handling fix for #2412
 2015-03-31 23:19:47 +01:00
John McLear
64a89a3ec0 Merge pull request #2541 from cristo-rabani/patch-3 
fixed + support for value
 2015-03-31 22:58:10 +01:00
John McLear
4397191f55 Merge pull request #2565 from tm-linkwerk/feature-2558-attributes-on-position 
feature #2558 get attributes on position
 2015-03-31 22:46:00 +01:00
John McLear
e9d8c3b53a expose method for getting a full user list on the client including historical data 2015-03-31 20:26:55 +01:00
John McLear
48862dac6f better handling for inputs and left and right arrows 2015-03-31 18:50:20 +01:00
John McLear
498e7f4961 MVP of alt A behavior to show author of line 2015-03-31 16:12:05 +01:00
John McLear
24e6e1728a I came to bring the rain.. Let me get my coat... Fix focus on timeslider import export 2015-03-31 15:00:43 +01:00
John McLear
73073dcbc1 Timeslider accessibility and Bugfixes 2015-03-31 14:47:00 +01:00
John McLear
0f0a6c73ac make user list a document so it's easy to navigate by screen readers 2015-03-31 14:11:49 +01:00
John McLear
3126d7196e fix alt and focus issues 2015-03-31 14:06:02 +01:00
John McLear
ef38bcad9f make buttons i18n friendly and a better experience 2015-03-31 13:57:18 +01:00
John McLear
35948989b3 make Alt C and Alt F9 and Escape work from anywhere 2015-03-31 13:45:11 +01:00
John McLear
a82e692bdd dont use nasty settimeouts use a callback instead for focus 2015-03-31 13:21:41 +01:00
Thomas Muehlichen
a930161cb9 feature #2558 added documentation 2015-03-31 10:58:47 +02:00
John McLear
f9071aebe6 fix issue with showControls false not working 2015-03-30 14:56:35 +01:00
Thomas Muehlichen
1c05933dc9 Feature #2567 Added workaround to enable contentcollector to write key-value attributes 2015-03-26 18:49:35 +01:00
John McLear
19e83d5405 much better chat focus toggle behavior 2015-03-26 16:58:13 +00:00
John McLear
428b547d24 alt c to focus on chat and gritter and chat both now work with aria 2015-03-26 16:44:22 +00:00
John McLear
548cef7018 more keyboard support while in editbar 2015-03-26 14:26:21 +00:00
John McLear
6b88c037b8 fix firefox button styling 2015-03-26 14:11:37 +00:00
John McLear
7b726cbc02 more working logic and also pretty nice screen reader experience 2015-03-26 13:58:57 +00:00
John McLear
959aa92656 stop listing URL each time focus is placed back on inner iframe 2015-03-26 13:32:45 +00:00
John McLear
1a5ea8707f make the pad contents act like an application and not contents, this can probably be togglable but default state should be editable 2015-03-26 13:16:54 +00:00
John McLear
69f0392e75 escape to exit editbar 2015-03-26 11:24:06 +00:00
John McLear
e67ae522e2 support drop down show events 2015-03-25 23:30:17 +00:00
John McLear
aff802a0b3 whoops 2015-03-25 21:15:44 +00:00
John McLear
e9360b6ed2 working f9 logic 2015-03-25 15:49:41 +00:00
John McLear
bc760e9494 logic to send focus back to pad on Alt F9 when focus on editbar 2015-03-25 15:38:19 +00:00
John McLear
0c902ced73 better logic for handling lr arrows 2015-03-25 15:19:52 +00:00
Thomas Muehlichen
fbcbc3c8a2 feature #2558 more precise documentation 2015-03-25 13:29:03 +01:00
John McLear
c6cac53dda remove console log 2015-03-25 12:25:49 +00:00
John McLear
be73e729d4 remove console log 2015-03-25 12:25:33 +00:00
John McLear
b72127c327 different font families for people with dyslexia 2015-03-25 12:24:20 +00:00
Thomas Muehlichen
e8d85c1173 feature #2558 added functions to get all attributes at the current or an abritrary position 2015-03-25 12:04:10 +01:00
John McLear
5761e998de first semi working alt f9 functionality 2015-03-25 11:03:45 +00:00
cristo-rabani
ed3ec96838 own list 2015-03-24 20:04:28 +01:00
John McLear
a67664055d disable cut renumbering of OLs so cut paste works 2015-03-24 09:58:02 +00:00
John McLear
83e6591f1a temp fix for cut paste but might break some OL functionality 2015-03-24 09:52:17 +00:00
cristo-rabani
382804e44c fix 2015-03-22 23:14:17 +01:00
Thomas Muehlichen
a3f07c1048 fixes #2556 (error toggling line attribute) and clarified method documentation (AttributeManager.toggleAttributeOnLine) 2015-03-20 11:58:56 +01:00
lid2000
7894545556 Return true from handleCut function 2015-03-13 16:01:18 +11:00
Cristo
da1bf00a78 fixed + support for value 2015-03-06 23:02:31 +01:00
John McLear
56dbad41ad a should always have white space pre-wrap stops caret walking in chrome on them 2015-03-04 17:46:49 +00:00
Chris Ball
063219bbce Trigger renumbering when deleting (via cut) the first item of a list 
Fixes #2514.
 2015-02-27 12:54:29 -05: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
1c044588e6 mobile stylings for chat always on screen 2015-02-22 17:56:44 +00:00
webzwo0i
c9a5167b41 throw in applyToText and not in applyToAText 2015-02-16 06:27:18 +01:00
webzwo0i
83e1bf0dc4 add semicolons 2015-02-16 03:33:57 +01:00
webzwo0i
440f74b2c1 we do not have the text/padid, but at least we can print the changeset 2015-02-15 15:47:45 +01:00
webzwo0i
b9dd983f81 print the actual text... 2015-02-15 15:27:27 +01:00
webzwo0i
c6ef7f4867 string concat, not multiple arguments... 2015-02-15 15:26:07 +01:00
webzwo0i
1f6a9afae4 better error message 2015-02-15 15:23:43 +01:00
webzwo0i
e7f01fa498 remove unnecessary code; because we have checks in every op now we don't 
need this anymore
 2015-02-15 15:12:24 +01:00
webzwo0i
ac2c7e9679 add newline counting for - and + op 2015-02-15 15:09:38 +01:00
webzwo0i
b4d4b16b1f off by 1 2015-02-15 14:56:20 +01:00
webzwo0i
4313bd27f8 add a comment to make clear that the string in stringIterator 
does not change; only curIndex is increased. Newlines are counted
between curIndex and the end of string.
 2015-02-15 13:25:57 +01:00
webzwo0i
c191a8716e totally wrong, introduced by myself in 
3354b9406b
the first part is always false so the second part which is always true
in case a cs deleted some lines was never triggered...sigh
 2015-02-14 16:41:50 +01:00
John McLear
275592e423 seems right 2015-02-11 02:07:20 +00:00
John McLear
0ad09c17db fix JS error in timeslider if offset doesn't exist 2015-02-09 23:04:30 +00:00
John McLear
26ae375727 minor css polish for user input 2015-02-09 19:53:32 +00:00
John McLear
b216f9271b should be final logic for chatandusers 2015-02-09 19:11:35 +00:00
John McLear
5245d2b797 and even mroe polish 2015-02-09 18:36:11 +00:00
John McLear
8c6507e78c more styling stuff 2015-02-09 18:01:45 +00:00
John McLear
4af46921e1 better css 2015-02-09 17:37:20 +00:00
John McLear
7adcd5cba4 cleaner fix for queue issue 2015-02-08 14:34:48 +00:00
John McLear
1652ed42c5 fix scroll issue where focus is not well managed 
remove console logs
 2015-02-07 23:26:02 +00:00
John McLear
35da64be5c hrm bit of a hack, anyone any ideas on better way? 2015-01-28 19:09:47 +00:00
John McLear
0216a10a12 better variable name 2015-01-27 20:10:38 +00:00
John McLear
bdfce1cbef change to cc.. 2015-01-27 19:41:01 +00:00
John McLear
8fbd7d83b6 content collector should also register the blocks, no idea why this wasnt in before 2015-01-27 19:16:36 +00:00
John McLear
c4f1189ebd even cleaner 2015-01-26 02:39:43 +00:00
John McLear
18121a1507 much cleaner 2015-01-26 02:32:58 +00:00
John McLear
8156930208 clean support for image hook 2015-01-26 01:44:40 +00:00
John McLear
aca745ddf6 tell installer if old etherpad needs updating during plugin install 2015-01-25 02:44:10 +00:00
John McLear
f3e5682a0f fix issue with load of showuserandchat 2015-01-24 18:31:19 +00:00
John McLear
3f08bf7405 Merge pull request #2490 from Gared/https_plugins_json 
Use https to download plugins.json
 2015-01-24 13:34:41 +00:00
Stefan
da86110f58 Use https to download plugins.json 2015-01-24 12:55:17 +01:00
Stefan
713b369fc3 Add 'last update' column to plugins table 2015-01-24 12:49:17 +01:00
John McLear
5dce72d419 chrome list handling fix for #2412 2015-01-23 01:47:12 +00:00
John McLear
036dea3d0f styling 2015-01-21 17:25:06 +00:00
John McLear
657974b518 move saved revs notification to gritter 2015-01-21 16:40:44 +00:00
John McLear
753e8fdf0b working logic 2015-01-21 16:08:54 +00:00
John McLear
17fa87552d styling 2015-01-21 15:48:21 +00:00
John McLear
941cc3c24b url param 2015-01-21 15:37:55 +00:00
John McLear
920ec9c553 Merge pull request #2467 from ether/chat-and-users 
Show users and Chat at the same time
 2015-01-21 15:22:23 +00:00
John McLear
3cd8759cec expose modernIE value 2015-01-21 15:21:31 +00:00
John McLear
3fd6e72657 try again 2015-01-21 15:06:29 +00:00
John McLear
a2cb8a2f19 rename back to browser 2015-01-21 15:01:39 +00:00
John McLear
f2891e3b8b working 2015-01-21 14:55:29 +00:00
John McLear
ce40cacafa mheh looks fixed 2015-01-21 14:49:06 +00:00
John McLear
990e14c904 working with a big hack 2015-01-21 14:25:24 +00:00
John McLear
34d6b31c98 some sanity 2015-01-21 13:24:21 +00:00
John McLear
eacf1118f8 blind attempt to try 2015-01-21 02:55:03 +00:00
John McLear
c315defc31 temp bodge fix 2015-01-19 15:15:52 +00:00
John McLear
ab71bc7c20 hrm 2015-01-19 14:45:49 +00:00
John McLear
edbeb66d5e Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-19 14:33:17 +00:00
John McLear
44d1d6cc13 fix ie editing 2015-01-19 14:32:58 +00:00
Cetra Free
f1c9c58c2d Update to timeslider to include base path for easier proxying 2015-01-19 14:28:30 +10:30
Cetra Free
3649118194 Update to timeslider to include base path for easier proxying 2015-01-19 14:25:06 +10:30
John McLear
13eff60dfe mheh I suck at css 0ip would do a way better job of this 2015-01-19 02:13:34 +00:00
John McLear
63c65f784b semi working example 2015-01-19 01:45:49 +00:00
John McLear
33c62329ba better regexp for line items 2015-01-19 00:28:32 +00:00
John McLear
0bd7914c3b dont paste on middle click of link 2015-01-18 23:58:47 +00:00
John McLear
7e69bc65ce remove infinite load was causing pain 2015-01-18 23:03:54 +00:00
John McLear
ca6b729ace fix for ep page view pageup/down 2015-01-18 19:58:38 +00:00
John McLear
83fae22279 allow list text entry up to 16 items 2015-01-18 15:32:48 +00:00
Stefan
3c6db077ed Change domain for plugins.json request 2015-01-18 14:22:27 +01:00
Stefan
4644073399 Prevent dublicates in search results 2015-01-18 13:56:30 +01:00
Stefan
6d6ddd7f9f Prevent form submit on plugin page 2015-01-18 12:15:41 +01:00
Stefan
a080b12eac Add new favicon (32x32) with associated svg file 2015-01-11 22:40:56 +01:00
Marcel Klehr
167e0aea59 Merge pull request #2442 from ether/fix/attribmanager-removeattribonline 
Finally fix AttribManager#removeAttributeOnLine
 2015-01-10 16:35:37 +01:00
webzwo0i
82efcdb430 fix for uls without class 2015-01-09 02:04:03 +01:00
Marcel Klehr
751adb24fd Finally fix AttribManager#removeAttributeOnLine 
return safely if the attribute wasn't found.
fixes #2394
 2015-01-05 18:38:34 +01:00
John McLear
c0078abc75 Merge branch 'develop' of github.com:ether/etherpad-lite into fix/reimplement-ace-getAttributeOnSelection 2015-01-05 17:15:38 +00:00
John McLear
230302b132 fix timeslider stars and frontend tests, needs css polish 2015-01-01 22:40:45 +00:00
Marcel Klehr
1451eecaf0 Re-implement ace_getAttributeOnSelection 2014-12-31 19:23:09 +01:00
John McLear
8eb723b906 patch for e1c683be3f 2014-12-31 14:16:10 +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
b5c671a9b6 Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrs 
Clean-up after removing list attribute: Remove list numbering attribute
 2014-12-31 13:19:24 +00:00
John McLear
335bf3dc4a more line polish 2014-12-31 01:46:53 +00:00
Marcel Klehr
cfe75c7f3f Clean-up after removing list attribute: Remove list numbering attribute 2014-12-30 17:45:26 +01:00
Stefan
c20a7e9bce Merge pull request #2406 from Gared/fix/author-not-set-callback 
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
 2014-12-30 14:55:49 +01:00
Stefan
5df638bfac Merge pull request #2410 from Gared/feature/notify-user-cookies-rejected 
Notify user if cookies can't be created
 2014-12-30 14:54:43 +01:00
John McLear
19c78212e8 Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finished 
Fix lineassembler not finished
 2014-12-30 12:19:04 +01:00
John McLear
a07d1722fc no errors on chrome client 2014-12-30 12:12:24 +01:00
John McLear
a2262c56b9 msg for user 2014-12-29 22:05:14 +01:00
John McLear
3773b6346b semi working requires browser refresh 2014-12-29 20:57:58 +01:00
webzwo0i
e1c683be3f differentiate between indents and bullets in unordered lists 2014-12-29 16:12:07 +01:00
John McLear
321d550d43 second fix for user list issue on #2413 2014-12-29 01:20:28 +01:00
John McLear
23570e80a7 unbind before rebind, partial fix towards #2413 issue 2014-12-29 01:17:24 +01:00
John McLear
248d7655d7 Merge pull request #2401 from ether/save-prefs 
set prefs and get prefs
 2014-12-29 01:01:09 +01:00
John McLear
6b1fee400d Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTest 2014-12-29 00:40:07 +01:00