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

4631 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Birk
7f517eca0b check for soffice before removing export paths 2015-12-17 21:54:04 -06:00
John McLear
e98821cef7 bump socketio 2015-12-07 13:48:05 +00: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
e2a0e3cd7f whoops 2015-12-02 12:10:25 +00:00
John McLear
01335bcf8d Merge pull request #2851 from ether/plugin-hook-for-settings-earlier 
Plugin hook for settings earlier
 2015-12-02 11:55:09 +00:00
John McLear
98016665e4 working logic 2015-12-02 11:54:37 +00:00
John McLear
69c1d04dd2 Merge branch 'develop' of github.com:ether/etherpad-lite into plugin-hook-for-settings-earlier 2015-12-02 11:53:54 +00:00
John McLear
0617f81689 remove applySettings hook and allow credentials.json to be part of core 2015-12-02 11:53:41 +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
Mikk Andresen
03a4828d31 Update aceEditorCSS hook documentation 2015-12-02 13:15:27 +02: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
John McLear
16bb28a0ff Merge pull request #2848 from storytouch/develop 
Update the bowser.js to the new version
 2015-12-01 17:47:00 +00:00
John McLear
11ab89d897 Merge pull request #2849 from ether/exportConvert-hook 
Hook for export convert control
 2015-12-01 17:46:52 +00:00
John McLear
1a8462fb4f remove unused variable 2015-12-01 17:40:16 +00:00
John McLear
4ae88b2ee7 Hook for export ocnvert control 2015-12-01 17:38:52 +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
John McLear
8a79ae6e02 regex incoming colors 2015-11-26 15:55:26 +00:00
John McLear
a913f57994 Merge pull request #2840 from ether/applySettings 
allow settings to be applied from the filesystem
 2015-11-24 14:03:51 +00:00
John McLear
a8c2833759 clean up 2015-11-24 14:03:38 +00:00
John McLear
039a761eaf allow settings to be applied from the filesystem 2015-11-24 14:02:37 +00:00
John McLear
a419a3a87d Merge pull request #2839 from Blake-jne/faster-migration 
Improve DB migration performance.
 2015-11-24 13:47:28 +00:00
Blake Tölva
c61aa20028 Improve DB migration performance. 
Achieve 10x speedup in migrating a 12mb dirtyDB file by disabling
ueberDB caching in this special case.  Add some progress messages
to the migration script and rename it, as nothing in it is tied
to mysql.
 2015-11-21 23:15:46 -08:00
Francois Cassin
2bd698343a Protects against a null atext in cloneAText 2015-11-10 16:21:43 +01:00
fcassin
f2836125dc Merge pull request #1 from ether/develop 
Update to most recent etherpad-lite version
 2015-11-10 15:50:40 +01:00
John McLear
f774c2584f paste hook and class for editorcontainer 2015-11-06 13:21:25 +00:00
Stefan
ed37f6efe3 Merge pull request #2828 from Komasa/develop 
Update installDeps.sh to support node v5
 2015-11-05 00:24:49 +01:00
Komasa
5f9d1397e2 Update installDeps.sh 2015-11-04 21:15:13 +01:00
Luiza Pagliari
062e6f308f Merge pull request #2827 from storytouch/exportHtmlAdditionalTagsWithData 
Create hook exportHtmlAdditionalTagsWithData
 2015-11-03 09:18:38 -02:00
Luiza Pagliari
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
John McLear
d05fa6d97e Merge pull request #2819 from bradarv90/develop 
Fix for #2809
 2015-11-02 13:09:42 +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
ba1f9c24d0 Merge pull request #2823 from storytouch/develop 
Add callstack to aceSelectionChanged context
 2015-10-30 12:18:32 -02: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
Bradley Arvin
a9d7ab9e18 Fix for #2809 2015-10-28 13:28:54 -04: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
Luiza Pagliari
6c68396ed5 Merge pull request #2817 from storytouch/fix_tests_2805 
Fix flaky tests introduced by #2805
 2015-10-26 11:08:06 -02:00
Luiza Pagliari
ed39788d71 Fix flaky tests introduced by #2805 2015-10-24 11:10:17 -02:00
John McLear
02f88aafff Update installOnWindows.bat 2015-10-22 16:22:35 +01: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
fa46f0b613 Merge pull request #2797 from ypid/rebuild-better-error 
Give better error message when rebuildPad.js hits a non-existing rev.
 2015-10-22 16:15:27 +01:00
John McLear
3aff0001a1 Merge pull request #2798 from ypid/fixed_get_git_hash 
Get git commit hash even if the repo only points to a bare repo.
 2015-10-22 16:13:58 +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
5652adb4eb Merge pull request #2813 from simong/export-libreoffice 
Allow LibreOffice to be used when exporting a pad
 2015-10-22 16:11:26 +01:00