fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,657 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

4657 Commits

Author SHA1 Message Date
Niklas Laxström 855bd270bd Localisation updates from https://translatewiki.net. 2016-01-11 08:28:02 +01:00
John McLear eeab7e8958 Merge pull request #2876 from ether/drag-and-drop-between-frames-sandbox 
Drag and drop between frames
 2016-01-10 14:48:21 +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 cb874b695b herp 2016-01-08 13:40:25 +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 638757fdb5 Update DB.js 2016-01-06 00:01:48 +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
John McLear 239f517afd Update package.json 2016-01-03 01:03:05 +00:00
Mikk Andresen aab7186486 Fix handleClientMessage_USER_* payloads not containing user info 2015-12-31 14:19:23 +02:00
Niklas Laxström 2e81b39028 Localisation updates from https://translatewiki.net. 2015-12-29 10:44:17 +01:00
John McLear 34a46d6318 should be clean enough to push 2015-12-23 14:35:52 +00:00
Augusto Bennemann a34c8e4721 Limit padname size to 50 characters 2015-12-22 13:25:56 -02:00
Stefan 8bf53c63cc set charset for mysql connection in settings.json 2015-12-21 21:02:54 +01:00
John McLear b519f9f156 include req and res in export convert hook 2015-12-21 17:32:05 +00:00
John McLear 577102b025 license 2015-12-21 16:29:09 +00:00
John McLear 41ced5e239 Merge pull request #2859 from cmbirk/develop 
Check for SOffice before removing export links
 2015-12-21 16:12:25 +00:00
John McLear 34d757ff7f Merge pull request #2860 from tiblu/documentation_add_postToolbarInit_and_usage_examples 
Add postToolbarInit documentation and usage examples
 2015-12-21 09:50:24 +00:00
Mikk Andresen 4ad759dd25 Add postToolbarInit documentation and usage examples 2015-12-18 13:33:49 +02:00
Chris Birk d6033de0da Use new exportAvailable() check to include check for SOffice along with Abiword in importexport hook 2015-12-18 00:14:13 -06: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 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