1d1354e212
extend it further so it's exposed to DAM
2016-03-26 10:38:39 +08:00
0e0d040108
removing this
2016-03-26 09:23:12 +08:00
62be430203
extending get attribute on selection
2016-03-26 09:19:53 +08:00
47f43e7094
bump ueber for a version that supports remove in couch
2016-03-25 07:41:52 +00:00
935b921c2b
more tidy
2016-01-10 14:40:57 +00:00
50c6b5ed61
tidy up
2016-01-10 14:39:41 +00:00
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
f80407c6ff
removal
2016-01-08 13:41:52 +00:00
cb874b695b
herp
2016-01-08 13:40:25 +00:00
ae6110919f
removal
2016-01-08 13:39:59 +00:00
793b34d17b
hrm, removal
2016-01-08 13:39:32 +00:00
f16616d23b
seems to work
2016-01-08 13:26:46 +00:00
638757fdb5
Update DB.js
2016-01-06 00:01:48 +00:00
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
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
239f517afd
Update package.json
2016-01-03 01:03:05 +00:00
aab7186486
Fix handleClientMessage_USER_* payloads not containing user info
2015-12-31 14:19:23 +02:00
2e81b39028
Localisation updates from https://translatewiki.net .
2015-12-29 10:44:17 +01:00
34a46d6318
should be clean enough to push
2015-12-23 14:35:52 +00:00
b519f9f156
include req and res in export convert hook
2015-12-21 17:32:05 +00:00
577102b025
license
2015-12-21 16:29:09 +00:00
d6033de0da
Use new exportAvailable() check to include check for SOffice along with Abiword in importexport hook
2015-12-18 00:14:13 -06:00
313f390e7a
remove logging
2015-12-17 21:56:33 -06:00
7f517eca0b
check for soffice before removing export paths
2015-12-17 21:54:04 -06:00
e98821cef7
bump socketio
2015-12-07 13:48:05 +00:00
bf6e225aa2
include event on paste and drrororororop
2015-12-05 19:06:40 +00:00
b3d44b6956
remove con log
2015-12-05 18:51:27 +00:00
fa492dc926
ace drop event
2015-12-05 18:50:51 +00:00
e2a0e3cd7f
whoops
2015-12-02 12:10:25 +00:00
98016665e4
working logic
2015-12-02 11:54:37 +00:00
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
f44c444720
Merge pull request #2831 from fcassin/develop
...
Protect against a null atext value in cloneAText
2015-12-01 17:50:29 +00:00
16bb28a0ff
Merge pull request #2848 from storytouch/develop
...
Update the bowser.js to the new version
2015-12-01 17:47:00 +00:00
1a8462fb4f
remove unused variable
2015-12-01 17:40:16 +00:00
4ae88b2ee7
Hook for export ocnvert control
2015-12-01 17:38:52 +00:00
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
ad2ea924b5
aceEditorCSS to allow absolute paths to resources to include external CSS
2015-12-01 14:16:44 +02:00
8a79ae6e02
regex incoming colors
2015-11-26 15:55:26 +00:00
a8c2833759
clean up
2015-11-24 14:03:38 +00:00
039a761eaf
allow settings to be applied from the filesystem
2015-11-24 14:02:37 +00:00
2bd698343a
Protects against a null atext in cloneAText
2015-11-10 16:21:43 +01:00
f774c2584f
paste hook and class for editorcontainer
2015-11-06 13:21:25 +00:00
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
d05fa6d97e
Merge pull request #2819 from bradarv90/develop
...
Fix for #2809
2015-11-02 13:09:42 +00:00
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
2b980653d6
Merge pull request #2822 from storytouch/esc
...
Allow plugins handle "esc" key event
2015-11-02 13:08:01 +00:00
478f5788e3
Add callstack to aceSelectionChanged context
2015-10-30 12:13:43 -02:00
959de82e2a
Allow plugins handle "esc" key event
2015-10-29 14:54:21 -03:00
a9d7ab9e18
Fix for #2809
2015-10-28 13:28:54 -04:00
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