Skip to content

Commit 304a79f

Browse files
samirsayyadsamirsayyad
committed
1.8.12 merge
2 parents 97ad879 + 35d457b commit 304a79f

File tree

379 files changed

+12788
-30451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

379 files changed

+12788
-30451
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

‎.github/workflows/democracy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
node-version: ${{ matrix.node-version }}
2727
- run: npm run build --if-present
2828
- run: chmod 755 ./node_modules/ep_etherpad-lite/node/server.js
29-
- run: DB_NAME=democracyhandbook pm2 start ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
30-
- run: DB_NAME=democracyhandbook pm2 reload pm2.start.config.js --only ws_${GITHUB_REF#refs/heads/}
29+
- run: DB_NAME=democracyhandbook pm2 start temp/ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
30+
- run: DB_NAME=democracyhandbook pm2 reload temp/pm2.start.config.js --only ws_${GITHUB_REF#refs/heads/}
3131
env:
3232
DB_USER : ${{secrets.PG_USER}}
3333
DB_PASS : ${{secrets.PG_PASS}}

‎.github/workflows/dev-hossein.js.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
node-version: ${{ matrix.node-version }}
2525
- run: npm run build --if-present
2626
- run: npm run deploy --if-present
27-
- run: DB_NAME=${GITHUB_REF#refs/heads/} pm2 start ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
27+
- run: DB_NAME=${GITHUB_REF#refs/heads/} pm2 start temp/ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
2828
env:
2929
DB_USER : ${{secrets.MONGO_USERNAME}}
3030
DB_PASS : ${{secrets.MONGO_PASSWORD}}
@@ -34,4 +34,4 @@ jobs:
3434
ACCESS_KEY_SECRET : ${{secrets.ACCESS_KEY_SECRET}}
3535
ACCESS_KEY_ID : ${{secrets.ACCESS_KEY_ID}}
3636
DB_TYPE : mongodb
37-
DB_PORT : 27017
37+
DB_PORT : 27017

‎.github/workflows/dev-samir.js.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
node-version: ${{ matrix.node-version }}
2525
- run: npm run build --if-present
2626
- run: npm run deploy --if-present
27-
- run: DB_NAME=${GITHUB_REF#refs/heads/} pm2 start ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
27+
- run: DB_NAME=${GITHUB_REF#refs/heads/} pm2 start temp/ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
2828
env:
2929
DB_USER : ${{secrets.PG_USER}}
3030
DB_PASS : ${{secrets.PG_PASS}}
@@ -35,4 +35,4 @@ jobs:
3535
ACCESS_KEY_ID : ${{secrets.ACCESS_KEY_ID}}
3636
DB_TYPE : postgres
3737
DB_PORT : ${{secrets.PG_PORT}}
38-
PORT : 9004,
38+
PORT : 9004,

‎.github/workflows/dev.js.yml‎

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,45 @@ jobs:
1515
runs-on: stage.docs.plus
1616
strategy:
1717
matrix:
18-
node-version: [14.x]
18+
node-version: [12.x]
1919
steps:
2020
- uses: actions/checkout@v2
2121
- name: Use Node.js ${{ matrix.node-version }}
2222
uses: actions/setup-node@v1
2323
with:
2424
node-version: ${{ matrix.node-version }}
25-
- run: npm run build --if-present
26-
- run: chmod 755 ./node_modules/ep_etherpad-lite/node/server.js
27-
- run: DB_NAME=${GITHUB_REF#refs/heads/} pm2 start ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
28-
- run: DB_NAME=${GITHUB_REF#refs/heads/} pm2 reload pm2.start.config.js --only ws_${GITHUB_REF#refs/heads/}
25+
26+
- name: Install Etherpad plugins
27+
run: >
28+
npm install --no-save --legacy-peer-deps
29+
ep_adminpads2
30+
https://github.com/samirsayyad/ep_bottom_chat_bar
31+
https://github.com/ether/ep_comments_page
32+
https://github.com/ether/ep_cursortrace
33+
https://github.com/samirsayyad/ep_custom_header_message
34+
https://github.com/samirsayyad/ep_docs_plus_customize#c68bc28
35+
https://github.com/samirsayyad/ep_full_hyperlinks#27910fb
36+
https://github.com/samirsayyad/ep_headings2#f88ac17
37+
ep_hide_line_numbers
38+
https://github.com/samirsayyad/ep_insert_media#35b26c5
39+
https://github.com/samirsayyad/ep_loading_pad#84a888f
40+
ep_monetization
41+
https://github.com/samirsayyad/ep_profile_modal#513e955
42+
ep_remove_embed
43+
https://github.com/samirsayyad/ep_set_title_on_pad#b1688b0
44+
https://github.com/samirsayyad/ep_table_of_contents#326ccfc
45+
https://github.com/HMarzban/ep_wrtc_heading#1fd4e08
46+
# https://github.com/ether/ep_sticky_attributes.git
47+
48+
- name: Install all dependencies and symlink for ep_etherpad-lite
49+
run: src/bin/installDeps.sh
50+
51+
- name: Run pm2 docsplus instance
52+
run: DB_NAME=${GITHUB_REF#refs/heads/} pm2 start temp/ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
53+
54+
- name: Run pm2 ws.router instance
55+
run: DB_NAME=${GITHUB_REF#refs/heads/} pm2 reload temp/pm2.start.config.js --only ws_${GITHUB_REF#refs/heads/}
56+
2957
env:
3058
DB_USER : ${{secrets.PG_USER}}
3159
DB_PASS : ${{secrets.PG_PASS}}

‎.github/workflows/master.yml‎

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,64 @@
33

44
name: Master.js CI
55

6-
on:
6+
on:
77
push:
88
branches: [ master ]
99
pull_request:
1010
branches: [ master ]
1111

12+
1213
jobs:
1314
build:
14-
1515
runs-on: docs.plus
16-
1716
strategy:
1817
matrix:
19-
node-version: [14.x]
20-
18+
node-version: [12.x]
2119
steps:
2220
- uses: actions/checkout@v2
2321
- name: Use Node.js ${{ matrix.node-version }}
2422
uses: actions/setup-node@v1
2523
with:
2624
node-version: ${{ matrix.node-version }}
27-
- run: npm run build --if-present
28-
- run: chmod 755 ./node_modules/ep_etherpad-lite/node/server.js
29-
- run: DB_NAME=handbook pm2 start ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
30-
- run: DB_NAME=handbook pm2 reload pm2.start.config.js --only ws_${GITHUB_REF#refs/heads/}
25+
26+
- name: Install Etherpad plugins
27+
run: >
28+
npm install --no-save --legacy-peer-deps
29+
ep_adminpads2
30+
https://github.com/samirsayyad/ep_bottom_chat_bar
31+
https://github.com/ether/ep_comments_page
32+
https://github.com/ether/ep_cursortrace
33+
https://github.com/samirsayyad/ep_custom_header_message
34+
https://github.com/samirsayyad/ep_docs_plus_customize#c68bc28
35+
https://github.com/samirsayyad/ep_full_hyperlinks#27910fb
36+
https://github.com/samirsayyad/ep_headings2#f88ac17
37+
ep_hide_line_numbers
38+
https://github.com/samirsayyad/ep_insert_media#35b26c5
39+
https://github.com/samirsayyad/ep_loading_pad#84a888f
40+
ep_monetization
41+
https://github.com/samirsayyad/ep_profile_modal#513e955
42+
ep_remove_embed
43+
https://github.com/samirsayyad/ep_set_title_on_pad#b1688b0
44+
https://github.com/samirsayyad/ep_table_of_contents#326ccfc
45+
https://github.com/HMarzban/ep_wrtc_heading#1fd4e08
46+
# https://github.com/ether/ep_sticky_attributes.git
47+
48+
- name: Install all dependencies and symlink for ep_etherpad-lite
49+
run: src/bin/installDeps.sh
50+
51+
- name: Run pm2 docsplus instance
52+
run: DB_NAME=handbook pm2 start temp/ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
53+
54+
- name: Run pm2 ws.router instance
55+
run: DB_NAME=handbook pm2 reload temp/pm2.start.config.js --only ws_${GITHUB_REF#refs/heads/}
56+
3157
env:
3258
DB_USER : ${{secrets.PG_USER}}
3359
DB_PASS : ${{secrets.PG_PASS}}
3460
DB_HOST : ${{secrets.PG_HOST}}
61+
DB_TYPE : postgres
62+
DB_PORT : ${{secrets.PG_PORT}}
3563
MEDIA_BUCKET_NAME : ${{secrets.MEDIA_BUCKET_NAME}}
3664
BUCKET_S3_SERVER : ${{secrets.BUCKET_S3_SERVER}}
3765
ACCESS_KEY_SECRET : ${{secrets.ACCESS_KEY_SECRET}}
3866
ACCESS_KEY_ID : ${{secrets.ACCESS_KEY_ID}}
39-
DB_TYPE : postgres
40-
DB_PORT : ${{secrets.PG_PORT}}
41-
PORT : 9001,

‎.github/workflows/test.js.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
node-version: ${{ matrix.node-version }}
2727
- run: npm run build --if-present
2828
- run: chmod 755 ./node_modules/ep_etherpad-lite/node/server.js
29-
- run: DB_NAME=handbook pm2 start ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
29+
- run: DB_NAME=handbook pm2 start temp/ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
3030
env:
3131
DB_USER : ${{secrets.PG_USER}}
3232
DB_PASS : ${{secrets.PG_PASS}}

‎.github/workflows/update.yml‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,45 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [10.x]
19+
node-version: [12.x]
2020

2121
steps:
2222
- uses: actions/checkout@v2
2323
- name: Use Node.js ${{ matrix.node-version }}
2424
uses: actions/setup-node@v1
2525
with:
2626
node-version: ${{ matrix.node-version }}
27-
- run: npm run build --if-present
28-
- run: DB_NAME=${GITHUB_REF#refs/heads/} pm2 start ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
27+
28+
- name: Install Etherpad plugins
29+
run: >
30+
npm install --no-save --legacy-peer-deps
31+
https://github.com/samirsayyad/ep_bottom_chat_bar
32+
https://github.com/ether/ep_comments_page
33+
https://github.com/ether/ep_cursortrace
34+
https://github.com/samirsayyad/ep_custom_header_message
35+
https://github.com/samirsayyad/ep_full_hyperlinks#ce4133c
36+
https://github.com/samirsayyad/ep_headings2#f88ac17
37+
ep_hide_line_numbers
38+
https://github.com/samirsayyad/ep_insert_media#35b26c5
39+
ep_monetization
40+
https://github.com/samirsayyad/ep_profile_modal#513e955
41+
ep_remove_embed
42+
https://github.com/samirsayyad/ep_set_title_on_pad#b1688b0
43+
https://github.com/samirsayyad/ep_table_of_contents#326ccfc
44+
https://github.com/samirsayyad/ep_docs_plus_customize#fd5eab7
45+
https://github.com/samirsayyad/ep_loading_pad#84a888f
46+
https://github.com/HMarzban/ep_wrtc_heading#882bf8b
47+
# https://github.com/ether/ep_sticky_attributes
48+
49+
- name: Install all dependencies and symlink for ep_etherpad-lite
50+
run: src/bin/installDeps.sh
51+
52+
- name: Run pm2 docsplus instance
53+
run: DB_NAME=${GITHUB_REF#refs/heads/} pm2 start temp/ecosystem.config.js --only ${GITHUB_REF#refs/heads/}
54+
55+
- name: Run pm2 ws.router instance
56+
run: DB_NAME=${GITHUB_REF#refs/heads/} pm2 reload temp/pm2.start.config.js --only ws_${GITHUB_REF#refs/heads/}
57+
2958
env:
3059
DB_USER : ${{secrets.PG_USER}}
3160
DB_PASS : ${{secrets.PG_PASS}}

‎.gitignore‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,22 @@ node_modules
33
!settings.json.template
44
APIKEY.txt
55
SESSIONKEY.txt
6-
bin/abiword.exe
7-
bin/node.exe
86
etherpad-lite-win.zip
97
var/dirty.db
10-
bin/convertSettings.json
118
*~
129
*.patch
1310
npm-debug.log
1411
*.DS_Store
1512
.ep_initialized
1613
*.crt
1714
*.key
18-
bin/etherpad-1.deb
1915
credentials.json
2016
out/
2117
.nyc_output
22-
./package-lock.json
2318
.idea
24-
.history
19+
/package-lock.json
20+
/src/bin/abiword.exe
21+
/src/bin/convertSettings.json
22+
/src/bin/etherpad-1.deb
23+
/src/bin/node.exe
2524
ws.router

‎.lgtm.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
extraction:
2+
javascript:
3+
index:
4+
exclude:
5+
- src/static/js/vendors
6+
python:
7+
index:
8+
exclude:
9+
- /

0 commit comments

Comments
 (0)