Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable21] Make sure translations are parsed correctly #1990

Closed
wants to merge 142 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
b095cab
[tx-robot] updated from transifex
nextcloud-bot Feb 3, 2021
caacc39
Update stable21 target versions
nickvergessen Feb 3, 2021
783bc56
Merge pull request #1413 from nextcloud/update-stable21-target-versions
juliusknorr Feb 3, 2021
d415550
[tx-robot] updated from transifex
nextcloud-bot Feb 4, 2021
5e76057
[tx-robot] updated from transifex
nextcloud-bot Feb 5, 2021
013db8f
[tx-robot] updated from transifex
nextcloud-bot Feb 6, 2021
63fe12a
[tx-robot] updated from transifex
nextcloud-bot Feb 8, 2021
fac096a
[tx-robot] updated from transifex
nextcloud-bot Feb 9, 2021
1117c1e
Make sure the session list is always at the end
juliusknorr Feb 2, 2021
b0e3b40
Merge pull request #1412 from nextcloud/backport/1409/stable21
juliusknorr Feb 11, 2021
263a1af
[tx-robot] updated from transifex
nextcloud-bot Feb 12, 2021
6d607ec
[tx-robot] updated from transifex
nextcloud-bot Feb 18, 2021
e032cea
[tx-robot] updated from transifex
nextcloud-bot Feb 19, 2021
4f7668f
[tx-robot] updated from transifex
nextcloud-bot Feb 23, 2021
4b7eaad
[tx-robot] updated from transifex
nextcloud-bot Mar 4, 2021
3d9f287
[tx-robot] updated from transifex
nextcloud-bot Mar 5, 2021
fbc9f49
Disable cypress recording for now
juliusknorr Mar 8, 2021
4505581
Merge pull request #1504 from nextcloud/backport/1502/stable21
juliusknorr Mar 8, 2021
7f6c760
[tx-robot] updated from transifex
nextcloud-bot Mar 9, 2021
724a146
[tx-robot] updated from transifex
nextcloud-bot Mar 11, 2021
626b9e7
Use write permission when possible
juliusknorr Mar 2, 2021
8024d79
Merge pull request #1512 from nextcloud/backport/1488/stable21
juliusknorr Mar 11, 2021
1d7f5ca
Fix clicking links with color annotations
juliusknorr Feb 4, 2021
524ebe8
Merge pull request #1516 from nextcloud/backport/1419/stable21
juliusknorr Mar 11, 2021
9430c75
[tx-robot] updated from transifex
nextcloud-bot Mar 15, 2021
b6e2e48
[tx-robot] updated from transifex
nextcloud-bot Mar 16, 2021
1a6341c
[tx-robot] updated from transifex
nextcloud-bot Mar 19, 2021
d1f1a29
[tx-robot] updated from transifex
nextcloud-bot Mar 22, 2021
95ef5e8
[tx-robot] updated from transifex
nextcloud-bot Mar 27, 2021
e551e06
[tx-robot] updated from transifex
nextcloud-bot Mar 30, 2021
3e74921
[tx-robot] updated from transifex
nextcloud-bot Apr 2, 2021
02554bc
[tx-robot] updated from transifex
nextcloud-bot Apr 4, 2021
08d6b92
[tx-robot] updated from transifex
nextcloud-bot Apr 5, 2021
145b9c2
[tx-robot] updated from transifex
nextcloud-bot Apr 6, 2021
10abbf6
[tx-robot] updated from transifex
nextcloud-bot Apr 8, 2021
2a0e721
[tx-robot] updated from transifex
nextcloud-bot Apr 12, 2021
97261c0
[tx-robot] updated from transifex
nextcloud-bot Apr 13, 2021
fbb069d
[tx-robot] updated from transifex
nextcloud-bot Apr 15, 2021
b485790
[tx-robot] updated from transifex
nextcloud-bot Apr 16, 2021
6288bd3
[tx-robot] updated from transifex
nextcloud-bot Apr 17, 2021
b4854d3
[tx-robot] updated from transifex
nextcloud-bot Apr 19, 2021
81dbb78
[tx-robot] updated from transifex
nextcloud-bot Apr 20, 2021
2df273d
[tx-robot] updated from transifex
nextcloud-bot Apr 28, 2021
0d03c0c
[tx-robot] updated from transifex
nextcloud-bot Apr 30, 2021
ed8b4d8
[tx-robot] updated from transifex
nextcloud-bot May 1, 2021
83c17eb
[tx-robot] updated from transifex
nextcloud-bot May 3, 2021
b4f15e3
Only return workspace property for top node in a propfind request
juliusknorr May 14, 2021
fb5aeb4
Merge pull request #1610 from nextcloud/backport/1590/stable21
juliusknorr May 20, 2021
367be47
[tx-robot] updated from transifex
nextcloud-bot May 26, 2021
42d6774
[tx-robot] updated from transifex
nextcloud-bot Jun 2, 2021
8123e83
[tx-robot] updated from transifex
nextcloud-bot Jun 4, 2021
95834e8
[tx-robot] updated from transifex
nextcloud-bot Jun 5, 2021
de556c0
[tx-robot] updated from transifex
nextcloud-bot Jun 19, 2021
160e602
[tx-robot] updated from transifex
nextcloud-bot Jun 24, 2021
1bbe01b
[tx-robot] updated from transifex
nextcloud-bot Jun 25, 2021
72a6ffa
[tx-robot] updated from transifex
nextcloud-bot Jun 28, 2021
e7dcbee
Use text/plain as content type for fetching the document
juliusknorr Jun 28, 2021
639e2a7
Merge pull request #1691 from nextcloud/backport/1689/stable21
juliusknorr Jun 29, 2021
6ea959f
Log exceptions that happen on unknown exception and return generic er…
juliusknorr Jun 29, 2021
d2eadc4
Try enabling apcu on cli for cypress
juliusknorr Jun 29, 2021
086281f
Merge pull request #1697 from nextcloud/backport/1695/stable21
juliusknorr Jun 29, 2021
ce2015d
Merge pull request #1700 from nextcloud/backport/1658/stable21
juliusknorr Jun 29, 2021
a041dc8
[tx-robot] updated from transifex
nextcloud-bot Jul 10, 2021
5ba92a8
Unify error responses and add logging where appropriate
juliusknorr Jul 13, 2021
f7dbdc2
Merge pull request #1718 from nextcloud/backport/1716/stable21
juliusknorr Jul 14, 2021
c2eb2ed
Bump cypress-image-snapshot from 4.0.0 to 4.0.1
dependabot[bot] Jul 14, 2021
a4fa651
Bump vue-loader from 15.9.6 to 15.9.7
dependabot[bot] Jul 14, 2021
ebadad9
Bump @babel/plugin-proposal-class-properties from 7.12.1 to 7.12.13
dependabot[bot] Jul 14, 2021
edcb70a
Bump @babel/plugin-transform-runtime from 7.12.10 to 7.12.17
dependabot[bot] Jul 14, 2021
5f1fdc5
Bump @babel/plugin-transform-modules-commonjs from 7.12.1 to 7.12.13
dependabot[bot] Jul 14, 2021
ef58ee5
Merge pull request #1749 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Jul 15, 2021
ab48c2d
Merge pull request #1753 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Jul 15, 2021
aa5000d
Bump @vue/test-utils from 1.1.2 to 1.1.4
dependabot[bot] Jul 15, 2021
eb597f7
Merge pull request #1744 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Jul 15, 2021
a01304e
Merge pull request #1756 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Jul 15, 2021
2588f6c
Merge pull request #1736 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Jul 15, 2021
bc0c90e
Merge pull request #1743 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Jul 15, 2021
6f0f1eb
[tx-robot] updated from transifex
nextcloud-bot Jul 15, 2021
71588c4
Bump @babel/core from 7.12.10 to 7.12.17
dependabot[bot] Jul 14, 2021
11f046c
Merge pull request #1751 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Jul 15, 2021
4f8f415
ViewerComponent: pass on autofocus to EditorWrapper
azul Jun 9, 2021
d931ad3
Merge pull request #1646 from nextcloud/backport/1645/stable21
juliusknorr Jul 15, 2021
6e34ef0
[tx-robot] updated from transifex
nextcloud-bot Jul 17, 2021
9b7f45a
[tx-robot] updated from transifex
nextcloud-bot Jul 18, 2021
7c2e4f8
[tx-robot] updated from transifex
nextcloud-bot Jul 19, 2021
fd26c1d
[tx-robot] updated from transifex
nextcloud-bot Jul 22, 2021
c2fb29c
Some Design fixes
szaimen Jul 8, 2021
15e21a0
Merge pull request #1782 from nextcloud/backport/1711/stable21
juliusknorr Jul 26, 2021
489eacd
[tx-robot] updated from transifex
nextcloud-bot Jul 28, 2021
fd4abc0
[tx-robot] updated from transifex
nextcloud-bot Jul 31, 2021
7ae489f
[tx-robot] updated from transifex
nextcloud-bot Aug 1, 2021
1ce22e7
fix: cypress icon close selector
azul Aug 2, 2021
16dff06
Merge pull request #1809 from nextcloud/backport/1804/stable21
juliusknorr Aug 2, 2021
f8f2749
Custom input rule to add first character after bullet
mejo- Jul 27, 2021
b571e65
Merge pull request #1807 from nextcloud/backport/stable21/1798
juliusknorr Aug 3, 2021
6b31b10
[tx-robot] updated from transifex
nextcloud-bot Aug 6, 2021
d1e5047
Bump vue-loader from 15.9.7 to 15.9.8
dependabot[bot] Aug 7, 2021
f3b4136
[tx-robot] updated from transifex
nextcloud-bot Aug 10, 2021
5d21626
Merge pull request #1816 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Aug 16, 2021
80dc784
Bump vue from 2.6.12 to 2.6.14
dependabot[bot] Aug 16, 2021
2ceb6ca
Combined patch update for dependencies
juliusknorr Aug 23, 2021
5f31887
Merge pull request #1752 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Aug 23, 2021
855d3a0
Bump core-js from 3.16.2 to 3.16.3
dependabot[bot] Aug 28, 2021
199fdfc
Merge pull request #1840 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Aug 30, 2021
35f2f98
[tx-robot] updated from transifex
nextcloud-bot Sep 4, 2021
9dc045a
[tx-robot] updated from transifex
nextcloud-bot Sep 7, 2021
b39c776
Bump @babel/preset-env from 7.15.0 to 7.15.6
dependabot[bot] Sep 11, 2021
98e75c0
Bump @babel/core from 7.15.0 to 7.15.5
dependabot[bot] Sep 11, 2021
5926a53
Merge pull request #1858 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Sep 13, 2021
f0968c3
Merge pull request #1859 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Sep 13, 2021
99580f5
Bump prosemirror-markdown from 1.5.1 to 1.5.2
dependabot[bot] Sep 4, 2021
97638f5
Merge pull request #1850 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Sep 13, 2021
abf0a45
Bump core-js from 3.16.3 to 3.16.4
dependabot[bot] Sep 14, 2021
f0bd1e7
Merge pull request #1846 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Sep 14, 2021
4d9d1d8
[tx-robot] updated from transifex
nextcloud-bot Sep 20, 2021
7d05d38
[tx-robot] updated from transifex
nextcloud-bot Sep 22, 2021
62b49d3
Bump prosemirror-schema-list from 1.1.5 to 1.1.6
dependabot[bot] Sep 25, 2021
e06a991
Merge pull request #1870 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Oct 4, 2021
a699b09
Bump prosemirror-transform from 1.3.2 to 1.3.3
dependabot[bot] Oct 4, 2021
7bc87f7
Merge pull request #1880 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Oct 4, 2021
71fd43d
fix: rich workspaces overlap with new file dropdown
szaimen Jul 15, 2021
25971f1
Merge pull request #1770 from nextcloud/backport/1574/stable21
juliusknorr Oct 6, 2021
4c74626
Additional checks for workspace controller
juliusknorr Oct 6, 2021
bbd78ae
Merge pull request #1886 from nextcloud/backport/1884/stable21
juliusknorr Oct 6, 2021
e5336f1
[tx-robot] updated from transifex
nextcloud-bot Oct 7, 2021
dc24137
Bump @babel/core from 7.15.5 to 7.15.8
dependabot[bot] Oct 9, 2021
0f9cd15
[tx-robot] updated from transifex
nextcloud-bot Oct 15, 2021
9152e8e
[tx-robot] updated from transifex
nextcloud-bot Oct 21, 2021
ca26c53
[tx-robot] updated from transifex
nextcloud-bot Oct 26, 2021
5c5c5c4
Merge pull request #1895 from nextcloud/dependabot/npm_and_yarn/stabl…
juliusknorr Nov 5, 2021
25933c9
[tx-robot] updated from transifex
nextcloud-bot Nov 11, 2021
8ff33eb
[tx-robot] updated from transifex
nextcloud-bot Nov 14, 2021
1bdc919
[tx-robot] updated from transifex
nextcloud-bot Nov 23, 2021
a291b6c
[tx-robot] updated from transifex
nextcloud-bot Nov 26, 2021
445167b
[tx-robot] updated from transifex
nextcloud-bot Nov 27, 2021
64454d1
[tx-robot] updated from transifex
nextcloud-bot Dec 1, 2021
6662ec3
[tx-robot] updated from transifex
nextcloud-bot Dec 2, 2021
1bfe5a4
[tx-robot] updated from transifex
nextcloud-bot Dec 3, 2021
80d0ecb
[tx-robot] updated from transifex
nextcloud-bot Dec 4, 2021
2e963c9
[tx-robot] updated from transifex
nextcloud-bot Dec 5, 2021
409fb29
[tx-robot] updated from transifex
nextcloud-bot Dec 6, 2021
8ad1fa0
make sure translations are parsed correctly
Dec 6, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ steps:
image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: text
CORE_BRANCH: master
CORE_BRANCH: stable21
DB: sqlite
commands:
- composer install
Expand All @@ -28,7 +28,7 @@ steps:
image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: text
CORE_BRANCH: master
CORE_BRANCH: stable21
DB: sqlite
commands:
- bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
Expand Down Expand Up @@ -61,7 +61,7 @@ steps:
image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: text
CORE_BRANCH: master
CORE_BRANCH: stable21
DB: mysql
commands:
- bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
Expand Down Expand Up @@ -92,7 +92,7 @@ steps:
image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: text
CORE_BRANCH: master
CORE_BRANCH: stable21
DB: postgres
commands:
- bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
node-version: [12.x]
containers: [1, 2, 3]
# containers: [1, 2, 3]
php-versions: [ '7.4' ]
databases: [ 'sqlite' ]
server-versions: [ 'master' ]
Expand Down Expand Up @@ -46,12 +46,13 @@ jobs:
with:
path: apps/${{ env.APP_NAME }}


- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd, apcu
ini-values:
apc.enable_cli=on
coverage: none

- name: Set up Nextcloud
Expand All @@ -71,12 +72,14 @@ jobs:
php occ app:enable viewer
php occ app:enable text
php occ app:list
curl -v http://localhost:8081/index.php/login
cat data/nextcloud.log

- name: Cypress run
uses: cypress-io/github-action@v2
with:
record: true
parallel: true
record: false # disabled for now as we have no way to savely use the token in our org
parallel: false
wait-on: '${{ env.CYPRESS_baseUrl }}'
working-directory: 'apps/${{ env.APP_NAME }}'
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
matrix:
php-versions: ['7.4']
databases: ['oci']
server-versions: ['master']
server-versions: ['stable21']

name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}

Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
plugins: [
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-transform-classes',
['@babel/plugin-proposal-class-properties', { loose: true }],
'@babel/plugin-proposal-class-properties',
'@babel/plugin-transform-modules-commonjs'
],
presets: [
Expand Down
4 changes: 2 additions & 2 deletions cypress/integration/viewer.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('Open test.md in viewer', function() {
cy.get('#viewer').should('be.visible')
cy.get('#viewer .modal-title').should('contain', 'test.md')
cy.get('#viewer .modal-header button.action-item__menutoggle').should('be.visible')
cy.get('#viewer .modal-header button.icon-close').should('be.visible')
cy.get('#viewer .modal-header button.header-close').should('be.visible')

cy.wait(2000)
cy.get('#viewer', { timeout: 4000 })
Expand All @@ -75,7 +75,7 @@ describe('Open test.md in viewer', function() {
})

it('Closes the editor', function() {
cy.get('.modal-header button.icon-close').click()
cy.get('.modal-header button.header-close').click()
cy.get('#viewer').should('not.exist')
})

Expand Down
6 changes: 3 additions & 3 deletions js/editor-collab.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor-collab.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/editor-guest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading