Commit graph

2668 commits

Author SHA1 Message Date
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
6df4d93880 Resolves #764 -- disableLevelInstructions for global mode change 2021-01-11 12:49:28 -07:00
Peter Cottle
ddb3dc93ca Resolves #778 2021-01-11 12:30:35 -07:00
Peter Cottle
8b69d00880 force push i guess 2021-01-11 12:09:57 -07:00
Peter Cottle
62c76eaab1
Merge pull request #777 from faloi/patch-1
Fix spanish typo
2021-01-09 08:17:48 -07:00
Federico Aloi
79a35f172a
Fix spanish typo
Hi there! This fixes a really minor typo in all Spanish variants.
2021-01-09 09:54:45 -03:00
Peter Cottle
ea22bf8053
Merge pull request #776 from waldyrious/patch-1
Clarify "pick" vs. "drop" in interactive rebase
2021-01-05 05:39:08 -07:00
Waldir Pimenta
3128cddef8
Clarify "pick" vs. "drop" in interactive rebase 2021-01-05 12:26:15 +00:00
Peter Cottle
b906bb5fcd
Merge pull request #775 from reveliant/master
Resolves #758 - Set github-corner height in CSS style instead of HTML attribute
2021-01-05 04:45:24 -07:00
Rémi Dubois
26a68e5b30 Set github-corner height in CSS style instead of HTML attribute 2021-01-05 09:10:09 +00:00
Peter Cottle
961ed9aa79
Merge pull request #774 from YourSenseiCreeper/master
Polish translation of Cherry-pick and Rebase chapters
2021-01-04 11:40:45 -07:00
YourSenseiCreeper
8624979a8d Polish translation of Cherry-pick and Rebase chapters 2021-01-04 19:31:20 +01:00
Peter Cottle
79339bde49
Merge pull request #773 from thiagobitencourt/master
Update the label from totallyNotMaster to totallyNotMain
2021-01-04 11:13:57 -07:00
Thiago Bitencourt
b11603cd69 Update the label from totallyNotMaster to totallyNotMain 2021-01-04 14:59:00 -03:00
Peter Cottle
1017efe3cf Resolves #749 -- warning on reset solved command 2021-01-04 08:39:32 -07:00
Peter Cottle
2ac8fc23d3 Resolves #526 -- better language around the pick button 2021-01-04 08:30:00 -07:00
Peter Cottle
fd07bd2437
Merge pull request #772 from waldyrious/patch-1
Improve styles for interactive pop-up windows
2021-01-04 07:45:32 -07:00
Waldir Pimenta
4848434914
Improve styles for interactive pop-up windows
The title bar of floating windows that can be dragged
now shows a "grab" cursor when hovered,
and a "grabbing" cursor when being dragged.

The buttons in those windows, which are clickable,
now show the `pointer` (hand) cursor,
instead of the `default` (regular arrow) cursor.
2021-01-04 14:17:00 +00:00
vinothmdev
c428d4a2af
Merge pull request #1 from pcottle/master
Getting latest changes
2021-01-02 12:48:47 -05:00
Peter Cottle
a08fa94e92 Resolves #769 -- updates solution commands and fixes a TON more bugs with the master to main renaming 2021-01-01 14:20:05 -07:00
Peter Cottle
592860ea10
Merge pull request #770 from hibuz/master
Correct word "master" to "main" in KO
2021-01-01 09:55:36 -07:00
hibuz
24b0dc09ee Correct word "master" to "main" in KO 2021-01-01 23:11:53 +09:00
Peter Cottle
8a159ea498 Resolves #768 -- fix pull arguments (same issue) 2020-12-30 09:20:03 -07:00
Peter Cottle
a530dcbb16 Resolves #766 -- resolve ID on push function as well 2020-12-30 08:32:58 -07:00
Peter Cottle
76ea2e8694
Merge pull request #767 from YourSenseiCreeper/master
Another chunk of polish translation
2020-12-29 17:23:58 -07:00
YourSenseiCreeper
c36e9354b2 Another chunk of polish translation
Moreover I added a translation for buttons
after passing a level
2020-12-29 23:39:01 +01:00
Peter Cottle
2793a1d6a1 rm debugger 2020-12-29 08:54:29 -07:00
Peter Cottle
7be578699d Resolves #766 -- use same method post command validation so o/main works 2020-12-29 08:52:42 -07:00
Peter Cottle
2802ce3b59
Merge pull request #765 from pcottle/mainIsMaster
make all main references master under the hood
2020-12-27 11:23:53 -07:00
Peter Cottle
3d959ddc50 Swap other references to master except level-y stuff 2020-12-27 11:21:43 -07:00
Peter Cottle
673de4da1c multiple per line 2020-12-27 10:36:50 -07:00
Peter Cottle
40313ac3b1 Change references to master branch (with code escaping) 2020-12-27 10:30:53 -07:00
Peter Cottle
3f3e8cbc6a Add disclaimer about name alias 2020-12-27 10:21:20 -07:00