Commit graph

2505 commits

Author SHA1 Message Date
Peter Cottle
2e3874fb45 rebuild for prod 2021-01-31 09:11:41 -07:00
Peter Cottle
7bdd2b5c7a merge master 2021-01-31 09:11:24 -07:00
Peter Cottle
6cca141d45
Merge pull request #787 from vinothmdev/master
Tamil Translation for strings
2021-01-31 09:11:00 -07:00
vinothmdev
2b58aede54 Spelling correction and complete translation for merging 2021-01-31 06:47:32 +00:00
vinothmdev
9ce0269718 Merge branch 'master' of https://github.com/pcottle/learnGitBranching 2021-01-31 04:22:16 +00:00
vinothmdev
de69ab897c Finished strings translation 2021-01-31 04:21:18 +00:00
vinothmdev
9f4468772e Adding more string translation 2021-01-30 05:21:17 +00:00
vinothmdev
cd744d7c47 Adding translations for strings 2021-01-25 04:21:58 +00:00
vinothmdev
626a88b753 adding more merging translation 2021-01-24 03:25:09 +00:00
Peter Cottle
49040b0c25 rebuild for prod 2021-01-23 11:02:44 -07:00
Peter Cottle
73b40a52b0 merge master 2021-01-23 11:02:30 -07:00
Peter Cottle
4809aa31c4
Merge pull request #786 from danielleberre/master
Fix for #785
2021-01-23 11:02:09 -07:00
Daniel Le Berre
f48e904086
Fix for #785 2021-01-23 13:51:31 +01:00
Daniel Le Berre
e8c94d90b0
Merge pull request #1 from pcottle/master
Upstream update
2021-01-23 13:48:37 +01:00
Peter Cottle
4226d05f7e rebuild for prod 2021-01-17 10:01:02 -07:00
Peter Cottle
fdc71bc222 merge master 2021-01-17 10:00:46 -07:00
Peter Cottle
aeb3c0ed2f
Merge pull request #783 from vinothmdev/master
Commit and Merge level Tamil translations.
2021-01-17 10:00:35 -07:00
vinothmdev
91e3bbb103 adding merge translations 1 2021-01-17 04:25:58 +00:00
vinothmdev
f392844dc0 Translating commit level 2021-01-17 04:13:03 +00:00
vinothmdev
0e1e60aeab Translating commit steps 2021-01-17 02:03:54 +00:00
Peter Cottle
88becc7d94 rebuild for prod 2021-01-15 09:09:13 -07:00
Peter Cottle
1791c2a71e merge master 2021-01-15 09:08:59 -07:00
Peter Cottle
a1af8f1094
Merge pull request #782 from vinothmdev/master
Tamil Translations
2021-01-15 09:07:53 -07:00
vinothmdev
18950af634 review updates 2021-01-15 02:45:27 +00:00
vinothmdev
9e95d4e6f5 adding index translations 2021-01-15 02:41:43 +00:00
vinothmdev
9c273641ff adding multiparent merge commit translations 2021-01-15 02:18:39 +00:00
Peter Cottle
eb703a6b90
Merge pull request #781 from vinothmdev/master
Adding Tamil Translation
2021-01-13 14:30:45 -07:00
vinothmdev
569c6acf1c
Update README.md 2021-01-13 15:59:35 -05:00
vinothmdev
e9a804c25d Added translation for levels 2021-01-13 20:54:55 +00:00
vinothmdev
d02565969e Adding traslation to show solution confirmation and added locate to store 2021-01-13 20:23:17 +00:00
vinothmdev
e7f767cc02
Merge pull request #4 from pcottle/master
fetch upstream
2021-01-13 15:14:24 -05:00
Peter Cottle
fa7a67bd3d
Merge pull request #779 from HosokawaR/addJaTranslate
add a japanese translate on lockedMaster
2021-01-13 08:41:14 -07:00
Peter Cottle
b3c46032c3
Merge pull request #780 from HansiWursti/patch-1
Update rebasing.js
2021-01-13 08:40:37 -07:00
HansiWursti
59d02f3f9e
Update rebasing.js
Fixed german typo
2021-01-13 10:54:16 +01:00
HosokawaRyunosuke
f60081da79 fix linefeed code
In the last commit, I hadn't noticed my editor had changed the line breck code.
So, I change CRLF to LF.
2021-01-13 13:22:18 +09:00
vinothmdev
79127d4ed8
Merge pull request #3 from vinothmdev/tamil_translation
Tamil translation
2021-01-12 23:11:49 -05:00
vinothmdev
71a1166e83 Adding tamil locale and into page 2021-01-13 04:04:41 +00:00
HosokawaRyunosuke
03411b2aab add japanese content on lockedMaster 2021-01-13 12:43:40 +09:00
vinothmdev
c46738d4f5
Update README.md 2021-01-12 22:00:45 -05:00
vinothmdev
635dc8594c
Merge pull request #2 from pcottle/master
fetch upstream
2021-01-12 21:44:52 -05:00
Peter Cottle
5b0bb70551 rebuild for prod 2021-01-11 12:50:45 -07:00
Peter Cottle
32c3e1b7e7 merge master 2021-01-11 12:50:33 -07:00
Peter Cottle
6df4d93880 Resolves #764 -- disableLevelInstructions for global mode change 2021-01-11 12:49:28 -07:00
Peter Cottle
b8cdab4acd rebuild for prod 2021-01-11 12:30:53 -07:00
Peter Cottle
d859d9579b merge master 2021-01-11 12:30:42 -07:00
Peter Cottle
ddb3dc93ca Resolves #778 2021-01-11 12:30:35 -07:00
Peter Cottle
c00e0aba05 merge master 2021-01-11 12:10:07 -07:00
Peter Cottle
8b69d00880 force push i guess 2021-01-11 12:09:57 -07:00
Peter Cottle
6fb1641e8a rebuild for prod 2021-01-11 12:08:58 -07:00
Peter Cottle
a83bb079a7 merge master 2021-01-11 12:08:46 -07:00