mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-08-29 06:18:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2185 commits 7 branches 0 tags 106 MiB
Commit graph

2185 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
5a8762f2ac merge master 2020-04-29 17:59:57 -07:00
Peter Cottle
8a51749e71 Resolves #701 -- enforce branch cleanup on one level 2020-04-29 17:59:41 -07:00
Peter Cottle
6e8135a062 #701 -- allow ability to check for leftover branches in goal compare 2020-04-28 13:16:33 -07:00
Peter Cottle
6e9ede0023
Merge pull request #700 from pcottle/removeOneDep 
Remove jquery sortable ui npm dep
 2020-04-27 19:50:13 -07:00
Peter Cottle
cd1ff64f14 Remove jquery sortable ui 2020-04-27 19:48:35 -07:00
Peter Cottle
63798af5c3 rebuild for prod 2020-04-27 19:45:31 -07:00
Peter Cottle
cce334abb6 merge master 2020-04-27 19:45:19 -07:00
Peter Cottle
76a61ec0ae Closes #696 -- remove FB pixels 2020-04-27 19:45:10 -07:00
Peter Cottle
543706cdb8 rebuild for prod 2020-04-27 19:41:42 -07:00
Peter Cottle
d36d9216d6 merge master 2020-04-27 19:41:30 -07:00
Peter Cottle
232dbb46a6
Merge pull request #699 from pcottle/changeCompareLogic 
Iterate on #698 to solve #697
 2020-04-27 19:41:14 -07:00
Peter Cottle
d5ba50c97d Iterate on #698 to solve #697 2020-04-27 19:32:03 -07:00
Peter Cottle
91cfc6f43a rebuild for prod 2020-04-25 12:01:13 -07:00
Peter Cottle
be9c97b859 merge master 2020-04-25 12:01:01 -07:00
Peter Cottle
270167189f
Merge pull request #692 from 0xflotus/patch-1 
(ger): updated grammar in some translations
 2020-04-25 11:58:34 -07:00
Peter Cottle
c579bbbb23
Merge pull request #693 from matictrebusak/translation-slovenian 
Slovenian translations
 2020-04-25 11:58:11 -07:00
Peter Cottle
9706b36d4e rebuild for prod 2020-04-25 11:53:50 -07:00
Peter Cottle
515e72d2d7 merge master 2020-04-25 11:53:38 -07:00
Peter Cottle
1be837d10c
Merge pull request #690 from hong4rc/patch-2 
Add `draggable` of `jquery-ui`
 2020-04-25 11:51:45 -07:00
matictrebusak
58714a3d29
Merge branch 'master' into translation-slovenian 2020-04-24 18:07:35 +02:00
MrMcKracken
7e9520664b Fixed typo in german translation 
(_ohne_ ihne vorher ...)  --> (_ohne_ ihn vorher ...)
 2020-04-24 17:18:30 +02:00
CuFa
a3ab4065b3 es_AR translation & es_ES corrections 2020-04-24 17:18:30 +02:00
0xflotus
a177ce7188
Merge pull request #1 from 0xflotus/patch-2 
fixed grammar
 2020-04-24 17:02:31 +02:00
0xflotus
aa33fa35e2
fixed grammar 2020-04-24 17:01:50 +02:00
0xflotus
8aeaf9a1a4
(ger): updatet grammar in some translations 2020-04-24 16:54:43 +02:00
Matic Trebusak
ea30fadf31 Polished Slovenian translations 2020-04-24 16:34:52 +02:00
Matic Trebusak
1ac4ca93a7 Added Slovenian translations 2020-04-24 11:44:27 +02:00
Anh Hong
7bc5bb0f6f
Add require module for draggable 2020-04-24 10:54:32 +07:00
Anh Hong
8a74cbbeee
Add draggable of jquery-ui 
Fixed #687, #688
 2020-04-24 08:37:09 +07:00
Peter Cottle
0a7667421a rebuild for prod 2020-04-23 09:29:42 -07:00
Peter Cottle
675e3b42cf merge master 2020-04-23 09:29:31 -07:00
Peter Cottle
3f3f32b5ea
Merge pull request #686 from pcottle/fixJqueryUI 
Woohoo, fix jquery UI
 2020-04-23 09:29:04 -07:00
Peter Cottle
ef2e81563d
Merge branch 'master' into fixJqueryUI 2020-04-23 09:28:54 -07:00
Peter Cottle
7521528382 rebuild for prod 2020-04-23 09:26:56 -07:00
Peter Cottle
723715fe5a merge master 2020-04-23 09:26:45 -07:00
Peter Cottle
a41c3b9792
Merge pull request #684 from pcottle/dependabot/npm_and_yarn/jquery-3.4.0 
Bump jquery from 1.12.4 to 3.4.0
 2020-04-23 09:25:42 -07:00
Peter Cottle
d3bc42c936 Woohoo, fix jquery UI 2020-04-23 09:06:03 -07:00
Peter Cottle
b3438cc095 Revert "emergency inline" 
This reverts commit f9cea87519.
 2020-04-22 12:30:20 -07:00
Peter Cottle
f9cea87519 emergency inline 2020-04-22 12:09:10 -07:00
Peter Cottle
5aa156464d and add build files too 2020-04-22 12:04:53 -07:00
Peter Cottle
0eebf7e71c rebuild with index 2020-04-22 12:01:55 -07:00
Peter Cottle
82e0391c1b drop gitignore 2020-04-22 12:01:30 -07:00
dependabot[bot]
0e7b9594ab
Bump jquery from 1.12.4 to 3.4.0 
Bumps [jquery](https://github.com/jquery/jquery) from 1.12.4 to 3.4.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/1.12.4...3.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-04-22 18:31:57 +00:00
Peter Cottle
392805802b
Merge pull request #683 from pcottle/revertJquery 
Revert jquery back to 1.8 or above
 2020-04-22 11:31:17 -07:00
Peter Cottle
61e0275ae1 Revert jquery back to 1.8 or above 2020-04-22 10:06:17 -07:00
Peter Cottle
3c8836099f
Merge pull request #681 from pcottle/dependabot/npm_and_yarn/jquery-3.4.0 
Bump jquery from 1.12.4 to 3.4.0
 2020-04-21 10:36:26 -07:00
dependabot[bot]
258e3b5aad
Bump jquery from 1.12.4 to 3.4.0 
Bumps [jquery](https://github.com/jquery/jquery) from 1.12.4 to 3.4.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/1.12.4...3.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-04-21 17:33:23 +00:00
Peter Cottle
e844de48a0
Merge pull request #680 from hong4rc/optimize 
Optimize load js and minify css+html
 2020-04-21 10:32:52 -07:00
hongarc
eaa2412084 minify css+html, move font to assets 2020-04-21 21:45:35 +07:00
hongarc
b02a4b1bf7 merge jquery-ui to bundle 2020-04-21 21:44:42 +07:00