public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,983 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

4983 Commits (903a2c8e43641574ac46f8be56cefd9278bbeb11)

Author SHA1 Message Date
muxator 903a2c8e43 createRelease.sh: added error checking in modify_files() 
Otherwise, when inserting a multiline changelog sed would with this message:
  sed: -e expression #1, char 27: unterminated `s' command

And the script would continue with an unmodified CHANGELOG.md
For simmetry, added the same check to package.json, too
 2018-05-03 23:54:08 +02:00
translatewiki.net ba322012d7 Localisation updates from https://translatewiki.net. 2018-04-23 08:52:57 +02:00
anugu-chegg 7b6a4aba30 Remove leftover code from earlier commits 2018-04-19 23:23:16 +02:00
anugu-chegg b4068144c3 Refactor code 2018-04-19 23:23:16 +02:00
anugu-chegg 461ed413b7 Fix few mistakes 2018-04-19 23:23:16 +02:00
anugu-chegg d41e184a3c Send commits missed during the reconnect 2018-04-19 23:23:16 +02:00
anugu-chegg bf05e9ae89 Handle client reconnect properly 2018-04-19 23:23:16 +02:00
anugu-chegg 4265f4175e Handle socketio errors properly 2018-04-19 23:23:16 +02:00
anugu-chegg fb20c26c5f Don't send COMMIT-MESSAGE when socketio connection is not active 2018-04-19 23:23:16 +02:00
Benjamin Schweizer d26df86490 made url relative 2018-04-19 22:55:40 +02:00
translatewiki.net 4f2ff31a61 Localisation updates from https://translatewiki.net. 2018-04-19 09:20:05 +02:00
muxator 9daade0b95
fix: line numbers was not aligned with text 
This change partially reverts 0a9d02562d, which got released in 1.6.4
due to #3280.

Text size and line alignment are now reverted back to their 1.6.3
appearance (thus stay non customizable, for now).

Fixes #3378
 2018-04-13 18:32:39 +02:00
translatewiki.net 6dc8ead8c9 Localisation updates from https://translatewiki.net. 2018-04-12 15:16:27 +02:00
translatewiki.net 686ce054fa Localisation updates from https://translatewiki.net. 2018-04-12 09:12:18 +02:00
muxator 3eb3e301a2 manually updated CHANGELOG.md 
due to createRelease.sh not catching an error from sed and continuing:
   sed: -e expression #1, char 66: unterminated `s' command
 2018-04-10 00:50:28 +02:00
muxator 1d4e2b3b11 Release version 1.6.5 2018-04-10 00:47:40 +02:00
nashe 92eee85f36 Escape data when listing available plugins 2018-04-09 22:31:13 +02:00
Olivier Tétard 5b1e1f0c35 Fix typo in `apicalls.js` which prevents from importing `isValidJSONPName`. 2018-04-09 20:56:29 +02:00
translatewiki.net 1fdb01fd75 Localisation updates from https://translatewiki.net. 2018-04-09 08:17:36 +02:00
John McLear b16e7ad25e
unbreak Safari iOS line wrapping 
fixes f5810957b4 (diff-f639eb4efeaabf5624f3229daa1e88cd)
 2018-04-07 18:11:24 +01:00
John McLear fba2bf4df9
Update iframe_editor.css 2018-04-07 17:50:45 +01:00
John McLear 4c16ac4b47
Merge pull request #3367 from ether/master 
Merge in 1.6.4
 2018-04-07 11:05:58 +01:00
John McLear 6a38826e9d
Merge pull request #3366 from ether/release/1.6.4 
Release/1.6.4
 2018-04-07 11:05:31 +01:00
John McLear fa83de778c Password check fix 2018-04-07 10:31:47 +01:00
Peter 'Pita' Martischka 6d5dc93dbf merged 2018-04-07 10:23:49 +01:00
John McLear 0132f4d1da Include CVE # 2018-04-07 10:13:09 +01:00
John McLear c34350f307 Beginning to make release 2018-04-07 09:22:13 +01:00
John McLear 76cd39d11a
Merge pull request #17 from nashe/patch-admin-bypass 
Case-insensitive check /admin/ access restriction
 2018-04-06 21:27:16 +01:00
thomas ffe24c3dd9
Update webaccess.js 2018-04-06 22:21:33 +02:00
John McLear e9f77e06a9 Merge branch 'develop' of https://github.com/ether/etherpad-lite into develop 2018-04-06 13:52:22 +01:00
John McLear 86ec963775 Fixes #3137 
#3137
 2018-04-06 13:52:04 +01:00
John McLear 98a03b0867
Update README.md 2018-04-06 13:51:08 +01:00
John McLear 0225acfa06
Update CONTRIBUTING.md 2018-04-06 10:40:36 +01:00
John McLear 68d81e839c
Update CONTRIBUTING.md 2018-04-06 10:38:14 +01:00
thomas f00fc3a25f
Merge pull request #13 from nashe/import_export_fix 
check pad exists before importing / exporting
 2018-04-04 22:55:49 +02:00
Peter 'Pita' Martischka a08c4383b8 check pad exists before importing / exporting 2018-04-04 21:48:32 +01:00
John McLear 735052e1a2
Update package.json 2018-04-04 20:13:28 +01:00
John McLear 6388055f51
Merge pull request #12 from nashe/no_findkeys_export 
No findkeys during export
 2018-04-04 19:36:59 +01:00
Peter 'Pita' Martischka 806c9207e3 remove findkeys from pad export 2018-04-04 18:02:54 +01:00
John McLear 5a0afab02e
remove license thing from exports 2018-04-04 13:33:46 +01:00
John McLear f5aed706b7
Update README.md 2018-04-03 19:55:55 +01:00
John McLear ba732a6b9e
Update README.md 2018-04-03 18:05:26 +01:00
John McLear f15c7d7186
Merge pull request #3280 from lmagniez/ImprovedReadibility 
Improved readibility
 2018-04-03 17:22:08 +01:00
John McLear 8edd8e1291
Update package.json 2018-04-03 15:47:02 +01:00
John McLear f4f032afc0
Merge pull request #3297 from apenwarr/auth-sequence 
Call authentication hooks before default basic authentication.
 2018-04-03 13:41:51 +01:00
John McLear 2765a95774
Merge pull request #3218 from klausweiss/develop 
Feature: New server-side hook: onAccessCheck
 2018-04-03 13:38:47 +01:00
John McLear d393bf4dd8
Merge pull request #3232 from michael-dev/develop 
Make APIKEY and SESSIONKEY file customizable
 2018-04-03 13:34:49 +01:00
John McLear bb83d39ff0
Merge pull request #3197 from User1m/patch-1 
fixed plugin dependency issue
 2018-04-03 13:13:11 +01:00
John McLear 18dd90139a
Merge pull request #3115 from noerw/redirect_fix 
redirect /admin properly (fix #3114)
 2018-04-03 13:10:36 +01:00
John McLear 83ce73b77b
Merge pull request #3134 from psaavedra/develop 
WA added  in #1766 is not longer needed
 2018-04-03 13:10:19 +01:00