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

4825 Commits

Author SHA1 Message Date
rugk 8f133abacc Timeslider: Add no-referrer 2016-08-23 22:11:11 +02:00
Luiza Pagliari 45266f90a3 Merge pull request #3042 from storytouch/fix_dnd 
Perform DnD in one changeset, so UNDO works properly. Fix #3041
 2016-08-22 18:52:01 -03: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
Niklas Laxström bd20d44e89 Localisation updates from https://translatewiki.net. 2016-08-18 07:52:23 +02:00
Niklas Laxström f147146519 Localisation updates from https://translatewiki.net. 2016-08-15 08:08:30 +02:00
Luiza Pagliari 9fc72194d9 Merge pull request #3035 from danfuzz/fix-docs 
Fix value to be valid JSON.
 2016-08-12 17:45:58 -03:00
Dan Bornstein 219a1dc3e3 Fix value to be valid JSON. 
Also fixed some errant EOL whitespace.
 2016-08-12 11:05:40 -07:00
Niklas Laxström 2996f0fad7 Localisation updates from https://translatewiki.net. 2016-08-04 07:57:38 +02:00
Niklas Laxström 08b90437c1 Localisation updates from https://translatewiki.net. 2016-08-01 08:08:45 +02:00
Niklas Laxström cf3aaa334f Localisation updates from https://translatewiki.net. 2016-07-28 07:59:29 +02:00
Niklas Laxström 17726856c6 Localisation updates from https://translatewiki.net. 2016-07-25 07:56:41 +02:00
rugk f4bbe00322 Download JQuery over HTTPS 
Otherwise anyone can MITM the connection and add rogue code there.
 2016-07-23 16:59:47 +02:00
Luiza Pagliari 81b11be54a Merge pull request #3026 from storytouch/develop 
Fix #2918. Re-enable editor after user is reconnected to server
 2016-07-21 15:42:38 -03:00
Luiza Pagliari c92e3e4b5e Fix #2918. Re-enable editor after user is reconnected to server 2016-07-21 15:23:14 -03:00
Niklas Laxström 3fcc7aa190 Localisation updates from https://translatewiki.net. 2016-07-18 08:48:25 +02:00
Luiza Pagliari a2ee1d0b3f Merge pull request #3009 from storytouch/selectMultipleLinesOnFESpecs 
Enable multi-line selection on frontend tests
 2016-07-15 15:05:54 -03:00
Stefan 009b61b338 Make express-session cookie scheme dependent 2016-07-10 12:44:45 +02:00
Niklas Laxström 728ab9307e Localisation updates from https://translatewiki.net. 2016-07-07 07:52:57 +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
Xavid 28aa3b28d6 Add a frontend test for URLs followed by a ]. 2016-06-27 16:20:12 -04:00
John McLear 65dcb783d1 Merge pull request #3008 from Gared/directory_check 
Fixed path check
 2016-06-22 21:50:34 +01:00
Siebrand Mazeland a18d40df6b Localisation updates from https://translatewiki.net. 2016-06-22 16:38:16 +02:00
Luiza Pagliari 3f15ff91eb Select beginning of end line when offset is 0 on frontend tests 2016-06-21 11:07:57 -03:00
Luiza Pagliari 95dc9d0315 Enable multi-line selection on frontend tests 2016-06-21 06:48:10 -03: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
Luiza Pagliari 69ac8e1722 Include usage example for aceRegisterNonScrollableEditEvents 2016-06-20 06:31:11 -03:00
Niklas Laxström 3f4c8d35d6 Localisation updates from https://translatewiki.net. 2016-06-20 07:52:44 +02:00
Stefan 6b9711cb70 Fixed path check 2016-06-20 00:22:29 +02:00
Niklas Laxström 85cdb1cf4e Localisation updates from https://translatewiki.net. 2016-06-16 08:11:53 +02: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
Niklas Laxström 25fd246091 Localisation updates from https://translatewiki.net. 2016-06-13 07:44:13 +02:00
Stefan 7b2812050d Merge pull request #2999 from Gared/readme_change_supported_versions 
Change description in README for supported node versions
 2016-06-12 17:05:41 +02:00
Stefan 6ee10f4ebe Merge pull request #2998 from Gared/fix_db_migrate_script 
Fix module paths for db migration script
 2016-06-12 17:05:03 +02:00
Stefan 4ea9c4f98d Add secure flag to express-session cookies 2016-06-08 21:15:26 +02: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
Stefan 3ad13eb0df Change description in README for supported node versions 2016-06-08 19:55:22 +02:00
Stefan e11decc6f8 Fix module paths for db migration script 2016-06-08 19:43:53 +02:00
Stefan 44370f11be Merge pull request #2957 from ether/dependency_updates 
Dependency updates
 2016-06-07 21:32:20 +02:00
Stefan 5a868254e3 Merge pull request #2986 from Gared/fix_existssync_deprecated 
Use fs.statSync instead of fs.existsSync (deprecated)
 2016-06-07 21:30:22 +02:00
Niklas Laxström 3ea27d2613 Localisation updates from https://translatewiki.net. 2016-06-06 08:09:26 +02:00
John McLear d545630912 fixes #2945 2016-05-28 22:25:44 +01:00
Niklas Laxström a7405825a8 Localisation updates from https://translatewiki.net. 2016-05-26 07:57:20 +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
Niklas Laxström 94920e5552 Localisation updates from https://translatewiki.net. 2016-05-19 09:25:51 +02:00
Stefan cd459bfde3 Merge pull request #2987 from Gared/fix_space_in_path 
Fix error if whitespace in etherpad path
 2016-05-16 17:16:16 +02:00
Stefan 1349cfd486 Fix error if whitespace in etherpad path 2016-05-16 16:58:58 +02:00
Stefan 835bca7967 Use fs.statSync instead of fs.existsSync (deprecated) 2016-05-16 16:51:12 +02:00