|
| 1 | +[33mcommit 0a13f4c44cb90ddc0971aebbab4d70c05b30f608[m[33m ([m[1;36mHEAD -> [m[1;32msharan[m[33m)[m |
| 2 | +Author: Sharandeep <singhsharandeep321@gmail.com> |
| 3 | +Date: Mon Jan 30 09:56:22 2023 +0530 |
| 4 | + |
| 5 | + sharan added a message |
| 6 | + |
| 7 | +[33mcommit 077a0043aeccc2b882683afdcaf53fde771c1bcb[m[33m ([m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m, [m[1;32mmaster[m[33m)[m |
| 8 | +Merge: 1ce4fbf a2944b8 |
| 9 | +Author: CarlyLanglois <cj.langlois.cl@gmail.com> |
| 10 | +Date: Tue Apr 20 17:57:55 2021 -0500 |
| 11 | + |
| 12 | + Merge pull request #13 from LaunchCodeEducation/java11 |
| 13 | + |
| 14 | + add screenshots |
| 15 | + |
| 16 | +[33mcommit a2944b8cfc050f0497dcd01ae613699aab037c13[m |
| 17 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 18 | +Date: Tue Apr 20 17:56:20 2021 -0500 |
| 19 | + |
| 20 | + add screenshots |
| 21 | + |
| 22 | +[33mcommit 1ce4fbfe32daf59a0188954e96becabf0ae415e2[m |
| 23 | +Merge: 13570eb 86e3a7a |
| 24 | +Author: CarlyLanglois <cj.langlois.cl@gmail.com> |
| 25 | +Date: Tue Apr 20 17:41:28 2021 -0500 |
| 26 | + |
| 27 | + Merge pull request #12 from LaunchCodeEducation/java11 |
| 28 | + |
| 29 | + Java11 |
| 30 | + |
| 31 | +[33mcommit 86e3a7a2396c0c6c9767e1854b94b68eb5c73cb2[m |
| 32 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 33 | +Date: Tue Apr 20 17:40:46 2021 -0500 |
| 34 | + |
| 35 | + add some project structure language in the readme |
| 36 | + |
| 37 | +[33mcommit 75f2177444d734e54f2acee0df8143219db9c930[m |
| 38 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 39 | +Date: Tue Apr 20 17:34:19 2021 -0500 |
| 40 | + |
| 41 | + use java11 in readme |
| 42 | + |
| 43 | +[33mcommit 13570eb38e77a152d0a97e75d6be430f6c835943[m |
| 44 | +Author: jimflores <jflores@launchcode.org> |
| 45 | +Date: Fri Nov 8 08:50:34 2019 -0600 |
| 46 | + |
| 47 | + Fixed allergen assignments in lesson 7 starter code. |
| 48 | + |
| 49 | +[33mcommit 3e37a968abf51a9f4c97c9e63cc48a8ef39cdfea[m |
| 50 | +Merge: cc736ba c923620 |
| 51 | +Author: Jim Flores <jflores@launchcode.org> |
| 52 | +Date: Thu Nov 7 21:54:11 2019 -0600 |
| 53 | + |
| 54 | + Merge pull request #6 from LaunchCodeEducation/lsn7-exercises |
| 55 | + |
| 56 | + Lsn7 exercises |
| 57 | + |
| 58 | +[33mcommit c92362024dfed43275da44d7ef91ec0b311aaf79[m |
| 59 | +Author: jimflores <jflores@launchcode.org> |
| 60 | +Date: Thu Nov 7 13:55:56 2019 -0600 |
| 61 | + |
| 62 | + Completed starter code for the lesson 7 exercises. |
| 63 | + |
| 64 | +[33mcommit 4568b9cc7ee51829ee75c787ee1ffd2af343c1cc[m |
| 65 | +Author: jimflores <jflores@launchcode.org> |
| 66 | +Date: Mon Nov 4 15:11:14 2019 -0600 |
| 67 | + |
| 68 | + Initial framework for lesson 7 exercises. |
| 69 | + |
| 70 | +[33mcommit cc736ba5ac275a2801ef1325fc32cc3920a07b69[m |
| 71 | +Merge: f401116 d22ffcc |
| 72 | +Author: CarlyLanglois <cj.langlois.cl@gmail.com> |
| 73 | +Date: Fri Nov 1 15:49:24 2019 -0500 |
| 74 | + |
| 75 | + Merge pull request #5 from LaunchCodeEducation/lsn6-demo |
| 76 | + |
| 77 | + Lsn6 demo |
| 78 | + |
| 79 | +[33mcommit d22ffcc6d61d2390aa5f14c36c079cada9436777[m |
| 80 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 81 | +Date: Fri Nov 1 14:58:07 2019 -0500 |
| 82 | + |
| 83 | + change collections to controlflowandcollections |
| 84 | + |
| 85 | +[33mcommit 2e001bec91e07ec246d8e04c72dc375b9c612d54[m |
| 86 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 87 | +Date: Fri Nov 1 13:37:02 2019 -0500 |
| 88 | + |
| 89 | + add a readme |
| 90 | + |
| 91 | +[33mcommit 1478589bc47d8d0942792da2f96afebca78e7499[m |
| 92 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 93 | +Date: Fri Nov 1 10:46:38 2019 -0500 |
| 94 | + |
| 95 | + remove vscode dir |
| 96 | + |
| 97 | +[33mcommit 13b9020d3e80c2ebbcaa1929374d0a02e4960b07[m |
| 98 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 99 | +Date: Fri Nov 1 10:43:45 2019 -0500 |
| 100 | + |
| 101 | + update gitignore to ignore .vscode/ |
| 102 | + |
| 103 | +[33mcommit 5e91bc2b3ce5e501dce174c9e18021243fad4511[m |
| 104 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 105 | +Date: Fri Nov 1 10:41:50 2019 -0500 |
| 106 | + |
| 107 | + standardize demo package names, |
| 108 | + |
| 109 | +[33mcommit 8056ed0559ce9fd200b13a0b7d22ceb023be4654[m |
| 110 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 111 | +Date: Fri Nov 1 10:29:34 2019 -0500 |
| 112 | + |
| 113 | + starter code for lsn6 in-book demos |
| 114 | + |
| 115 | +[33mcommit b4c59d866fe979d878decd3d73862f359a6b23d5[m |
| 116 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 117 | +Date: Wed Oct 30 10:13:48 2019 -0500 |
| 118 | + |
| 119 | + oops changed comment spacing |
| 120 | + |
| 121 | +[33mcommit 44ff252bf683b71557f5a8032a63c422e7e13a6f[m |
| 122 | +Merge: fe0f44d f401116 |
| 123 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 124 | +Date: Wed Oct 30 10:11:43 2019 -0500 |
| 125 | + |
| 126 | + Merge branch 'master' into lsn6-demo |
| 127 | + |
| 128 | +[33mcommit fe0f44dd31f99df0c7cadb22bf79671b795e974f[m |
| 129 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 130 | +Date: Wed Oct 30 10:06:35 2019 -0500 |
| 131 | + |
| 132 | + add cat and housecat classes, patch student class so build error doesnt distract |
| 133 | + |
| 134 | +[33mcommit f4011160d651c2bd8f18fa1ec457028d3f18a5e4[m |
| 135 | +Author: jimflores <jflores@launchcode.org> |
| 136 | +Date: Tue Oct 29 09:56:16 2019 -0500 |
| 137 | + |
| 138 | + Fixed error in lsn4School that prevented earlier exercises from compiling. |
| 139 | + |
| 140 | +[33mcommit 8a29291d20aaa894f3d7236d6be12dfc37c6e90b[m |
| 141 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 142 | +Date: Mon Oct 28 11:36:24 2019 -0500 |
| 143 | + |
| 144 | + remove car's excepton throw |
| 145 | + |
| 146 | +[33mcommit e77a7ad7152a00470b0e534d3b0558a9476cfb3d[m |
| 147 | +Merge: 27829a4 7df53ac |
| 148 | +Author: Jim Flores <jflores@launchcode.org> |
| 149 | +Date: Fri Oct 25 11:56:40 2019 -0500 |
| 150 | + |
| 151 | + Merge pull request #3 from LaunchCodeEducation/lesson4-exercises |
| 152 | + |
| 153 | + Added starter code for the lesson 4 exercises. |
| 154 | + |
| 155 | +[33mcommit 27829a490eb44e0d7f38701163772e59644d98b5[m |
| 156 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 157 | +Date: Fri Oct 25 10:53:15 2019 -0500 |
| 158 | + |
| 159 | + add a comment explaining the ternary operator in Car class |
| 160 | + |
| 161 | +[33mcommit 7df53ace4b68b343b995be334b7d993a316e9c70[m |
| 162 | +Author: jimflores <jflores@launchcode.org> |
| 163 | +Date: Fri Oct 25 09:22:32 2019 -0500 |
| 164 | + |
| 165 | + Added starter code for the lesson 4 exercises. |
| 166 | + |
| 167 | +[33mcommit 67ddaae7d5f40159f21e2724b2a4111f8304cbc1[m |
| 168 | +Merge: 3342e32 e6dbcd5 |
| 169 | +Author: Sally Steuterman <sally.steuterman@gmail.com> |
| 170 | +Date: Thu Oct 24 16:10:39 2019 -0500 |
| 171 | + |
| 172 | + Merge pull request #1 from LaunchCodeEducation/lsn3-exercises |
| 173 | + |
| 174 | + Adding starter code for Lesson 3 |
| 175 | + |
| 176 | +[33mcommit 3342e32750d65d8a927071481df2e7d66ee6cb48[m |
| 177 | +Merge: 63c1d20 bbf6535 |
| 178 | +Author: CarlyLanglois <cj.langlois.cl@gmail.com> |
| 179 | +Date: Thu Oct 24 14:55:30 2019 -0500 |
| 180 | + |
| 181 | + Merge pull request #2 from LaunchCodeEducation/starter_testing |
| 182 | + |
| 183 | + Starter testing |
| 184 | + |
| 185 | +[33mcommit bbf653505d12b1790c1f1037b32dc4fb18921501[m |
| 186 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 187 | +Date: Thu Oct 24 14:54:11 2019 -0500 |
| 188 | + |
| 189 | + fix settanklevel |
| 190 | + |
| 191 | +[33mcommit c493e4bb163c0e127e0a99d933c9a2e5fdd52913[m |
| 192 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 193 | +Date: Wed Oct 23 15:23:24 2019 -0500 |
| 194 | + |
| 195 | + remove solution code remaining |
| 196 | + |
| 197 | +[33mcommit 8363e5504182df8622fb234e9eec8732b9fc823a[m |
| 198 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 199 | +Date: Wed Oct 23 12:44:08 2019 -0500 |
| 200 | + |
| 201 | + add lib and testing demo starter code |
| 202 | + |
| 203 | +[33mcommit e6dbcd5464e58e0fc915e2b6e9803c0604efbd19[m |
| 204 | +Author: Sally Steuterman <sally.steuterman@gmail.com> |
| 205 | +Date: Fri Oct 18 11:15:54 2019 -0500 |
| 206 | + |
| 207 | + Adding comments to starter code |
| 208 | + |
| 209 | +[33mcommit b4f1b35038dcb47a998522ad474609be82fd8b3d[m |
| 210 | +Author: Sally Steuterman <sally.steuterman@gmail.com> |
| 211 | +Date: Wed Oct 16 13:34:06 2019 -0500 |
| 212 | + |
| 213 | + Adding Student class |
| 214 | + |
| 215 | +[33mcommit 63c1d2044a026b229bdfc24f759e388bf7843673[m |
| 216 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 217 | +Date: Thu Oct 10 17:03:43 2019 -0500 |
| 218 | + |
| 219 | + change scanner in to scanner input |
| 220 | + |
| 221 | +[33mcommit e545658c6710bf76a91b57199eeb3c33f23e8606[m |
| 222 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 223 | +Date: Wed Oct 9 12:01:22 2019 -0500 |
| 224 | + |
| 225 | + add datatypes package for inbokk demos |
| 226 | + |
| 227 | +[33mcommit 4015c82d8e4e1f7569c25dd90a4a3de006cdc42c[m |
| 228 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 229 | +Date: Tue Oct 8 16:37:13 2019 -0500 |
| 230 | + |
| 231 | + add hashmap gradebook example |
| 232 | + |
| 233 | +[33mcommit 3cc3c4cc67f4e66f8cb9f0b96da040ea29fd073d[m |
| 234 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 235 | +Date: Tue Oct 8 14:23:39 2019 -0500 |
| 236 | + |
| 237 | + add array version of gradebook |
| 238 | + |
| 239 | +[33mcommit e15edc68efebcae2ca36e8720678119b57491339[m |
| 240 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 241 | +Date: Fri Oct 4 14:12:59 2019 -0500 |
| 242 | + |
| 243 | + add gradebook class |
| 244 | + |
| 245 | +[33mcommit 11fc33da87eca3d5b3048488165dfbbd7a4d145c[m |
| 246 | +Author: jimflores <jflores@launchcode.org> |
| 247 | +Date: Tue Oct 1 12:07:10 2019 -0500 |
| 248 | + |
| 249 | + Added HelloMethods demo code to lesson 1. |
| 250 | + |
| 251 | +[33mcommit 8d4ca769af89d77e5667efafa428aa4a3375a766[m |
| 252 | +Author: jimflores <jflores@launchcode.org> |
| 253 | +Date: Tue Oct 1 11:56:55 2019 -0500 |
| 254 | + |
| 255 | + Added TempConverter program to lesson 1 demo code. |
| 256 | + |
| 257 | +[33mcommit ef7ee35522d0206aff031b4ee5dba9c04cf3b6bf[m |
| 258 | +Author: jimflores <jflores@launchcode.org> |
| 259 | +Date: Tue Oct 1 08:42:33 2019 -0500 |
| 260 | + |
| 261 | + Removed VSCode generated practice files. |
| 262 | + |
| 263 | +[33mcommit e575d5f6565bd6b2fe2a60a3c0aff45ee5ff8e29[m |
| 264 | +Author: Jim Flores <jimflores@Jims-MacBook-Air.local> |
| 265 | +Date: Mon Sep 30 08:38:57 2019 -0500 |
| 266 | + |
| 267 | + Added HelloMethods and Message.java examples for lesson 1. |
| 268 | + |
| 269 | +[33mcommit 767d22fbce588b60503f1c13d5628d463e61b6fe[m |
| 270 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 271 | +Date: Mon Sep 23 15:57:37 2019 -0500 |
| 272 | + |
| 273 | + small changes |
| 274 | + |
| 275 | +[33mcommit 0e1b687becb37bf3bb23ed47536f9f78fc0d89d2[m |
| 276 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 277 | +Date: Mon Sep 23 15:46:59 2019 -0500 |
| 278 | + |
| 279 | + add tempconv class |
| 280 | + |
| 281 | +[33mcommit 93c1650e5621b796209a6793a6f07a5f69fa10e9[m |
| 282 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 283 | +Date: Fri Sep 20 20:32:43 2019 -0500 |
| 284 | + |
| 285 | + remove period! |
| 286 | + |
| 287 | +[33mcommit fb18c34990a8e85c17b6b5e4c1fa5875f3bcedeb[m |
| 288 | +Author: Carly Langlois <cj.langlois.cl@gmail.com> |
| 289 | +Date: Fri Sep 20 20:23:50 2019 -0500 |
| 290 | + |
| 291 | + first commit with Hello class |
0 commit comments