mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-05 04:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1226 commits 7 branches 0 tags 104 MiB
Commit graph

1226 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
fb26b80a78 Merge pull request #218 from AbelAlejandro/patch-1 
Corregidos errores ortográficos (ES)
 2014-10-21 11:19:19 -07:00
AbelAlejandro
1b5c51ebe9 Corregidos errores ortográficos (ES) 2014-10-20 22:22:54 -03:00
Peter Cottle
6bb3fdbb2f Merge pull request #217 from qiansen1386/master 
Chinese translations
 2014-10-13 19:50:02 +09:00
东方孤思子（Paris·QianSen）
cdd53cb92e translate some leftover sentence 2014-10-11 04:21:38 +08:00
东方孤思子（Paris·QianSen）
7c69a79eab complete all zh_CN nodes 2014-10-11 04:04:35 +08:00
东方孤思子（Paris·QianSen）
99ea973497 Fix typos 2014-10-11 03:17:02 +08:00
东方孤思子（Paris·QianSen）
ab694efcbe translate leftover instructions 2014-10-10 20:57:05 +08:00
东方孤思子（Paris·QianSen）
7c7a4d2f75 translate one leftover sentence 2014-10-10 20:42:31 +08:00
Peter Cottle
d59a229844 Merge pull request #212 from mgarciaisaia/patch-1 
Spanish translation typo
 2014-09-30 10:03:09 -07:00
Matias Garcia Isaia
8546a33b3f "orden" was mispelled as "oren" 2014-09-30 00:34:59 -03:00
Peter Cottle
530e8fd289 Merge pull request #211 from poem/master 
spell check
 2014-09-25 13:20:05 -07:00
hulk
832b0c4c43 spell check 2014-09-23 16:32:40 +08:00
Peter Cottle
01b1d345b1 PR #208 replace tabs with spaces in template 2014-09-02 21:03:53 -07:00
Peter Cottle
e9d1d4f9e2 Merge pull request #208 from arlobelshee/ie-finish-fixes 
Ie finish fixes
 2014-09-02 21:02:04 -07:00
Arlo Belshee
b8992e2252 Minimal CSS change to accomplish goal. Also make all terminal windows use same div nesting. This fixes a bug where IE displays the title bar at 0 height for modal dialogs, but OK height for other terminal windows. Not sure exactly why, but just being uniform made it go away, so good enough. 2014-09-02 18:36:39 -07:00
Arlo Belshee
e6945c646b Updated the flex styles to bias to auto size, rather than 0 size. Since the bias is only used by IE (though part of the standard), this was causing a break in IE but "worked" in current versions of other browsers...for now. 2014-09-02 17:45:32 -07:00
Peter Cottle
3c9155064a Merge pull request #205 from arlobelshee/fixing_ie_support 
Fixing ie support
 2014-08-28 20:20:27 -07:00
Arlo Belshee
03816a2850 Missed one before. Now using the official setting for display. 2014-08-28 11:29:50 -07:00
Arlo Belshee
3c6b6e9764 Corrected CSS values for Flexbox model for official CSS3 & for IE. 2014-08-27 13:53:47 -07:00
Peter Cottle
f58ff74f6b Merge pull request #204 from dgodfrey95/patch-1 
I've replaced "make" with "provide".
 2014-08-24 09:51:49 -07:00
David Godfrey
8049ee4d62 I've replaced "make" with "provide". 
"make" wasn't the correct word to use (it would be "makes") but "provide" sounds a bit better.
 2014-08-23 19:57:56 -04:00
Peter Cottle
bf6a84dd1d [Fun] Issue #202 -- more fun when finishing! 2014-08-19 19:26:41 -07:00
Peter Cottle
7194d5c277 Merge pull request #203 from tym-network/patch-1 
Improve French translation
 2014-08-19 09:30:29 -07:00
tym-network
2ac445bfe2 Improved French translation 2014-08-19 13:33:32 +02:00
tym-network
f1096afe03 Improved French translation. 2014-08-19 12:00:31 +02:00
tym-network
63447ee3be Improved French translation 2014-08-19 11:50:20 +02:00
tym-network
13cd92d4dc Update rebasing.js 
Improved French translation.
 2014-08-19 11:33:15 +02:00
Peter Cottle
2997891874 PR #196 whoops one more, double reverse = bad 2014-08-13 19:26:20 -07:00
Peter Cottle
90c39417bb PR #196 code cleanup and solution description rather than reordering 2014-08-13 19:22:45 -07:00
Peter Cottle
ffc974e03f Merge pull request #196 from ptsoccer/master 
Improve show solution behavior that contain interactive rebase
 2014-08-13 19:06:22 -07:00
Peter Cottle
889b62bb0d README for PR #200 2014-08-10 10:28:12 -07:00
Peter Cottle
deb97cd4e8 Merge pull request #200 from ahonorat/FrenchTranslation 
French translation
 2014-08-10 10:25:08 -07:00
Alexandre Honorat
66a76faa71 Translation in french finished -- may need a rereading 2014-08-08 14:30:40 +01:00
Alexandre Honorat
64e2467144 1 new level translated in french, only 3 push levels remaining 2014-08-08 10:12:47 +01:00
Peter Cottle
24a5df5f30 Merge pull request #199 from ahonorat/FrenchTranslation 
French translation
 2014-08-07 11:37:41 -07:00
Alexandre Honorat
7d3b0b6adf 3 more levels translated in french -- 4 levels remaining 2014-08-07 14:23:31 +01:00
Alexandre Honorat
d1c285e802 Half of remote levels translated in french 2014-08-06 15:36:12 +01:00
Alexandre Honorat
97385176cd Translation (in french) for some remote levels ... 2014-08-05 16:57:58 +01:00
Peter Cottle
0db73feb87 Merge pull request #198 from ahonorat/FrenchTranslation 
French translation
 2014-07-29 19:29:44 -07:00
Alexandre Honorat
5b1af12857 Corrections to mixed levels french dialogs 2014-07-29 17:38:34 +01:00
Alexandre Honorat
cac80dec90 Three more levels translated/corrected in french 2014-07-29 14:58:02 +01:00
Peter Cottle
b6f8cebb4c Merge pull request #197 from ahonorat/FrenchTranslation 
French translation
 2014-07-28 09:48:57 -07:00
Alexandre Honorat
84bfcbed97 Correction d'erreurs 2014-07-28 16:47:15 +01:00
Alexandre Honorat
cd28b2d37f Traduction du second niveau 2014-07-28 16:23:46 +01:00
Alexandre Honorat
5a749780dc Premier niveau corrigé 2014-07-28 11:25:49 +01:00
Patrick
b27884af24 Changed some solutions that used interactive rebase to use the --initial-ordering flag 2014-07-26 15:22:54 -04:00
Patrick
00cc6349d0 Added extra flag to interactive rebase which accepts a list of commits (ordering counts). This list will then be shown to the user when the rebase dialog shows up when showing a solution that does an interactive rebase. This is so the user doesn't have to guess about what commits were picked and how they were ordered for the solution 2014-07-26 15:22:26 -04:00
Peter Cottle
2423646199 PR #195 bit of style cleanup and error handling and test for error handling 2014-07-26 21:40:45 +08:00
Peter Cottle
67413c42b6 Merge pull request #195 from ptsoccer/master 
Add testable interactive rebase
 2014-07-26 21:35:06 +08:00
Peter Cottle
3de4cd0f54 Merge pull request #193 from PLNech/master 
French translation continued
 2014-07-25 17:55:42 +08:00