2082 commits

Author	SHA1	Message	Date
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
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
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
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	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
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
Peter Cottle	b9f4f6e9a1	Merge pull request #192 from ptsoccer/master ... Fixed couple of issues where the target branch/ref was being ignored	2014-07-22 17:27:36 +08: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
Hermione	ce2a97c332	modify and add Chinese	2014-07-18 17:50:18 +08:00
Laurent Dufour	3e387bde52	French translation updates	2014-07-16 16:31:33 +02:00
Eroany H Leader	d082c54ae0	Update describe.js	2014-07-03 05:30:52 +00:00
Eroany H Leader	2258a40f04	convert from zh_TW	2014-07-03 05:29:01 +00:00
Eroany H Leader	319d6a4424	convert from zh_TW	2014-07-03 05:26:10 +00:00
Peter Cottle	ecd848625b	Resolves #184 interactive rebase upstream check	2014-06-30 20:50:01 -07:00
Peter Cottle	e78bf0cdfe	Revert "Issue #180 other valid solution for juggling" ... This reverts commit cb505681dd.	2014-06-29 18:00:44 -07:00
Peter Cottle	cb505681dd	Issue #180 other valid solution for juggling	2014-06-29 17:57:15 -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
Peter Cottle	a04ae67c0e	PR #178 remove MARCO comments	2014-06-04 18:48:31 -07:00
Peter Cottle	20c833763a	PR #178 Awesome french translation fixup	2014-06-04 18:37:05 -07:00