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

5363 Commits (47ad347faccf36807003713c39296623b201dba8)

Author SHA1 Message Date
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
John McLear 022783a774
Merge pull request #3239 from jainendra/jainendra-feature-support-for-rtf 
Feature: Support for uploading .rtf files rich text format
 2018-04-03 13:07:00 +01:00
John McLear 0c8b9e13fa
Merge pull request #3242 from BenaeSan/master 
FIX the installOnWindows Error
 2018-04-03 13:06:30 +01:00
John McLear ad89cb7d78
Merge pull request #3331 from sevu/pythonv2 
specify python version in shebang
 2018-04-03 13:00:45 +01:00
John McLear e6e46404d1
Merge pull request #3342 from caugner/patch-1 
Add checkPad variant to check all pads/revisions
 2018-04-03 12:58:23 +01:00
John McLear eb9875ee32
Merge pull request #3352 from ldidry/fix-line-numbers 
Fix line number display when plugin add padding-top (like ep_page_view)
 2018-04-03 12:57:55 +01:00
John McLear 074c9c6ddd
Merge pull request #3356 from meetbryce/patch-1 
Fix bug with cleanRun.sh
 2018-04-03 12:57:43 +01:00
John McLear 09c2c034c4
Continue to make README suck even less.. REALLY! 2018-04-03 12:57:14 +01:00
John McLear 6047c0de09
Make README not suck. 2018-04-03 12:52:34 +01:00
John McLear bb40aa00be
Update express.js 2018-04-03 10:59:10 +01:00
John McLear 50bbcb87bb
Merge pull request #4 from nashe/jsonp_fix 
Added a jsonp var checker
 2018-04-03 10:29:52 +01:00
Bryce York 4a18f0d97d
Fix bug with cleanRun.sh 
Now works if the output of `pwd` has a space in it.
 2018-03-28 22:38:30 +11:00
Luc Didry b0da9a579d Fix numbering line when plugin add padding-top (like ep_page_view) 2018-03-25 19:24:52 +02:00
John McLear 6c2135bf9a
Merge pull request #6 from nashe/bumpDeps2 
Update Deps
 2018-03-24 11:08:19 +00:00
John McLear e2370436fd
Merge pull request #10 from nashe/passwordcheck 
be more strict on password check
 2018-03-24 11:07:37 +00:00
John McLear 8767410a36
be more strict on password check 2018-03-23 19:21:52 +00:00
John McLear e285db9e80
Update Deps 
https://i.imgur.com/cxFXNeY.png
 2018-03-23 13:21:59 +00:00