mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 00:40:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2873 commits 7 branches 0 tags 102 MiB
Commit graph

1016 commits

Author SHA1 Message Date
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
Patrick
72cc7d6bd3 Added testable interactive rebase. It doesn't fully test everything (mainly the GUI), but is a start 2014-07-24 17:43:59 -04:00
Paul Louis NECH
8e9c890c29 French translation continued 2014-07-24 15:18:46 +02:00
Patrick Tully
55ac6da589 Changed checkout -B to set the branch to point at the specified commit rather than always using HEAD 2014-07-20 12:36:37 -04:00
Patrick Tully
dd58afde76 Changed interactive rebase to rebase the target branch if specified 2014-07-20 12:36:27 -04:00
Peter Cottle
ecd848625b Resolves #184 interactive rebase upstream check 2014-06-30 20:50:01 -07:00
Peter Cottle
47f4c21b78 Fix tree positioning 2014-06-29 16:51:14 -07:00
Peter Cottle
3794dedc5c Issue #181 fix NODEMO issue 2014-06-29 16:32:27 -07:00
Peter Cottle
2402a7a469 Issue #181 cleanup and better command handling 2014-06-29 16:30:54 -07:00
Peter Cottle
507291a0c4 Resolves #181 share levels easily with gist IDs and jsonp 2014-06-29 16:22:48 -07:00
Peter Cottle
d01f1806b4 Issue #179 consolidate rebase -i and rebase codepaths 2014-06-29 15:57:44 -07:00
Marc-Olivier Arsenault
d7841e240c French translation - some files 2014-06-04 20:36:22 -04:00
Peter Cottle
148ab9cc08 Resolves #175 again -- intelligently select chinese locales 2014-05-27 20:48:55 -07:00
Peter Cottle
fa0faecff0 Resolves #177 fixes start vis in level builder with new click ability 2014-05-27 12:49:34 -07:00
Peter Cottle
40d60c4bcc [INTL] Switch to browsers locale based on headers Resolves #175 2014-05-14 16:48:01 -07:00
mgarciaisaia
31ea0cedd0 Full Spanish translation 2014-05-08 02:38:46 -03:00
Peter Cottle
f1686932cb Change ultra-fallback to en_US For PR #169 2014-05-07 18:42:18 -07:00
Peter Cottle
5d05103afb Objective button Resolves #168 2014-05-07 18:34:15 -07:00
Peter Cottle
e0516e3f5c [INTL] Fallback locale map for PR #169 2014-05-07 17:45:17 -07:00
Mikhail Usov
ec6c1f5c27 Adding more russian strings 2014-05-05 02:06:12 -07:00
Mikhail Usov
f4ddfbc25a Adding russian language 
Began to translate to russian
 2014-05-04 13:10:28 -07:00
tumh
b1eecd7a74 fix some typo 2014-04-27 18:13:18 +08:00
mht
4de2cc2b15 update levels/remote/clone 2014-03-22 22:32:06 +08:00
mht
9e84b557a6 update strings.js 2014-03-22 21:14:10 +08:00
mht
9f9751242e add traditional chinese 2014-03-21 12:41:04 +08:00
mht
c9e180393d add zh-tw 2014-03-21 12:06:40 +08:00
Peter Cottle
db50adac05 after clicking a tab, remember which tab was clicked 2014-03-17 12:02:37 -07:00
Peter Cottle
3ad888498f PR #166 show the squeezer when maximizing and hide it when minimziing 2014-03-17 11:50:06 -07:00
Peter Cottle
f5887908cd PR #166 intl-aware labeling of level toggle button 2014-03-17 11:33:47 -07:00
Peter Cottle
232cb0385c PR #166 Fix the origin vis not resizing as well 2014-03-17 11:27:40 -07:00
Peter Cottle
6bdbb09d5a PR #166 fix animating shadow thing 2014-03-17 11:18:15 -07:00
Sergey Krilov
f29252e6ad Support dragging the goal window 2014-03-09 20:46:30 -04:00
Peter Cottle
dd1fcb92b2 Resolves #164 For levels -- just passing in object instead of string 2014-02-28 18:56:30 -08:00
Peter Cottle
43579378e8 Resolves #164 case insensitive branch comparison with test and validation 2014-02-27 12:11:48 -08:00
Peter Cottle
0be3577572 Resolves #160 handle case where the rebase is empty and theres nothing to do during git pull --rebase 2014-02-12 14:20:09 -08:00
Peter Cottle
f952bd7061 Resolves #154 input escaping issue when accessing remote branch locally to push remote, fixed others too 2014-01-06 10:04:03 -08:00
Peter Cottle
937977f232 Resolves #147 Flip trees upside down with flip 2014-01-03 10:26:39 -08:00
Peter Cottle
17fda94aff Better helper bar with float and more room for options 2013-12-30 10:23:58 -08:00
Peter Cottle
af12fe19f0 helper bar now clickable pretty sure 2013-12-27 10:14:29 -08:00
Peter Cottle
e7d9b76b98 moved another function to graph 2013-12-23 10:15:16 -08:00
Jens Bremmekamp
059cb003a2 Lots of minor translation errors fixed 2013-12-22 00:06:00 +01:00
Jens Bremmekamp
0152976952 Translated two more levels 2013-12-18 21:47:10 +01:00
Jens Bremmekamp
bdb799da32 More translations, fixed existing ones 2013-12-18 21:12:51 +01:00
Jens Bremmekamp
f7a6acd494 Added locale german, lots of translations 2013-12-18 16:33:45 +01:00
Peter Cottle
fcd0ffce85 Resolves Issue #151 silly assert issue 2013-12-15 17:23:51 -08:00
mht
7a519c822f update src/js/views/index.js 2013-12-11 15:42:27 +08:00
mht
5cd22772ac Merge branch 'bugfix-149' of github.com:bcbcarl/learnGitBranching into zh-tw-2 
solve the issue 149
 2013-12-10 23:27:42 +08:00
Carl X. Su
12be67ea69 Update intl/strings.js 2013-12-10 01:51:25 +08:00