Peter Cottle
2eb5a73860
Merge branch 'main' of github.com:pcottle/learnGitBranching
2024-02-25 11:54:58 -08:00
Peter Cottle
df4dafaec0
Merge pull request #1129 from DeadEmbed/patch-1
...
Corrected typo in multipleParents.js
2024-02-25 11:54:48 -08:00
DeadEmbed
de6f1bb9e4
Corrected typo in multipleParents.js
2024-02-25 22:30:56 +03:00
Peter Cottle
18ae49c565
rebuild for prod
2024-02-19 15:43:19 -05:00
Peter Cottle
940ae49fbd
merge main
2024-02-19 15:43:14 -05:00
Peter Cottle
847e1fe920
Resolves #1128 : edit the dialog a bit
2024-02-19 15:42:30 -05:00
Peter Cottle
95922739f6
rebuild for prod
2024-02-19 15:41:17 -05:00
Peter Cottle
9e4f072127
merge main
2024-02-19 15:41:11 -05:00
Peter Cottle
4f52fc5cb6
Resolves #1128 : make it clear that side should be the name of the branch
2024-02-19 15:40:58 -05:00
Peter Cottle
de070be14e
Merge pull request #1126 from Angra974/vite-as-index_html-loader
...
Added vitejs as a launcher for index.html. package.json
2024-02-07 09:14:27 -05:00
Thierry Parlier
ff6754e26a
Update package.json
...
Removed required engines as it seems the test are done with another lower version
2024-02-07 07:56:50 +04:00
Thierry Parlier
99d921d858
Update package.json to add node engine required version. Downgraded vite to v4
2024-02-06 20:01:16 +04:00
Thierry Parlier
80e96b54f7
Delete pnpm-lock.yaml
...
The main project use Yarn. Need to add this to my .gitignore file
2024-02-06 12:47:31 +04:00
Thierry Parlier
307841074b
Update package.json
...
No need to build with vite as it was not supposed to be used like this in this project.
2024-02-06 12:42:17 +04:00
Thierry Parlier
acc6555ded
Added vitejs as a launcher for index.html. package.json 'prepare' command is used to create the index.html file to be used with vite
2024-02-06 12:16:17 +04:00
Peter Cottle
4c2210e834
rebuild for prod
2024-01-12 10:43:41 -05:00
Peter Cottle
4ba5ad47ed
merge main
2024-01-12 10:43:34 -05:00
Peter Cottle
40ddfcab77
Merge pull request #1123 from chistrobal93/main
...
Translate command-not-supported to es_AR, es_MX and es_ES
2024-01-12 10:43:25 -05:00
Cristóbal
1c18197ac2
Translate command-not-supported to es_AR, es_MX and es_ES
...
There is no error message for git-error-command-not-supported, a common error that occurs when typing any command incorrectly.
2024-01-11 18:50:53 -03:00
Peter Cottle
e2e063b21e
rebuild for prod
2024-01-07 08:39:43 -07:00
Peter Cottle
9f60b2e8e7
merge main
2024-01-07 08:39:38 -07:00
Peter Cottle
e2ed36b179
Merge pull request #1122 from acHeMatta/traducirEsMx
...
Translate the fakeTeamwork lesson to es_MX
2024-01-07 08:39:15 -07:00
HumbertoMata
eee0720dc2
Translate the fakeTeamwork lesson to es_MX
2024-01-06 21:45:01 -06:00
Peter Cottle
814b8d1240
rebuild for prod
2023-12-16 11:05:36 -05:00
Peter Cottle
e2f16a9e57
merge main
2023-12-16 11:05:30 -05:00
Peter Cottle
9f82317780
Merge pull request #1120 from Magador/feat/remote-fakeTeamwork-merge
...
feat: command to simulate Merge/Pull Request
2023-12-16 11:05:08 -05:00
Lucie Lenglet
acffcc1616
feat: command to simulate Merge/Pull Request
...
- Adds `git merge(M|P)R <source_branch> <target_branch> [--delete-after-merge]` command
to simulate a Merge/Pull Request being merged into the target branch
- The optional flag `--delete-after-merge` will remove the merged branch on the origin tree
- The local remote branch remains as it is Git default behavior, even after `git fetch`
(it would require `git fetch --prune` support to automatically prune remote tracking branches)
- You can push a branch with a deleted remote tracking branch on origin, the ref will just update.
Resolves #1057
2023-12-15 19:32:47 +01:00
Peter Cottle
71c1ad814c
rebuild for prod
2023-11-26 21:53:58 -05:00
Peter Cottle
b3788637b0
merge main
2023-11-26 21:53:52 -05:00
Peter Cottle
99bc0ca8c5
Merge pull request #1119 from waldyrious/replay-pr-1112
...
Update pt_BR translations (replay of #1112 )
2023-11-26 21:53:23 -05:00
Max Oliver
badfd715b9
Update pt_BR translations (replay of #1112 )
2023-11-27 00:09:38 +00:00
Peter Cottle
4bba093de6
rebuild for prod
2023-11-21 21:17:53 -05:00
Peter Cottle
2800d544dc
merge main
2023-11-21 21:17:47 -05:00
Peter Cottle
7532b67b52
Merge pull request #1117 from maxoliverbr/main
...
Update strings.js
2023-11-21 21:17:35 -05:00
Peter Cottle
2653547407
rebuild for prod
2023-11-21 11:36:49 -05:00
Peter Cottle
d74bcdb708
merge main
2023-11-21 11:36:43 -05:00
Peter Cottle
3dfcc2b27d
Resolves #1115 clarify git branch f
2023-11-21 11:36:33 -05:00
Max Oliver
621d666e9b
Update strings.js
...
Some more PT-BR translations.
2023-11-20 01:20:18 -03:00
Peter Cottle
6596ee2601
Merge pull request #1116 from jianghurong/feature/new-levels
...
feat: Gulpfile update
2023-11-17 11:12:06 -05:00
jianghurong
efeee39973
feat: Gulpfile update
2023-11-17 18:26:57 +08:00
Peter Cottle
e3bc532f4d
merge main
2023-11-13 10:25:12 -05:00
Peter Cottle
4a07d70927
Merge pull request #1114 from maxoliverbr/main
...
pt_BR - Rollback couple of translations
2023-11-13 10:24:44 -05:00
Max Oliver
d40a46e4e5
Merge pull request #2 from maxoliverbr/maxoliverbr-patch-rollback
...
Update strings.js
Rollback couple of translations.
2023-11-13 11:39:32 -03:00
Max Oliver
466df1fecb
Update strings.js
...
Rollback:
'pt_BR': 'O repositório remoto divergiu do repositório local, então enviar suas mudanças não é um simples fast forward (e por isso seu push foi rejeitado). Por favor, faça pull das novas mudanças do repositório remoto, incorpore-os a este ramo, e tente novamente. Você pode fazê-lo com git pull ou git pull --rebase',
'pt_BR': 'Não se pode fazer reset no modo detached. Use checkout se quiser se mover',
2023-11-13 11:38:38 -03:00
Peter Cottle
32a91ac78e
rebuild for prod
2023-11-12 13:56:09 -05:00
Peter Cottle
b2c54704c9
merge main
2023-11-12 13:56:04 -05:00
Peter Cottle
35bcb7e8a0
Merge pull request #1113 from pcottle/revert-1112-main
...
Revert "pt_BR Translations fix and add."
2023-11-12 13:55:42 -05:00
Peter Cottle
c3d0f1ca1f
Revert "pt_BR Translations fix and add."
2023-11-12 13:55:31 -05:00
Peter Cottle
5ffb362509
rebuild for prod
2023-11-12 12:29:12 -05:00
Peter Cottle
41a56e41cd
merge main
2023-11-12 12:29:06 -05:00
