Code

My feature#12

Code

Open

bilalbarki wants to merge 117 commits intoalx-tools:masteralx-tools/discover-git:masterfrom bilalbarki:my_featureCopy head branch name to clipboard

+149-23

Commits

Commits on Jan 23, 2016

• Changes :D

  

  Joshua Parkin

  authored and

  Joshua Parkin

  committed
  fb8e221

  Copy full SHA for fb8e221

• grilled cheese

  

  Ian Wagener

  committed
  6815d8d

  Copy full SHA for 6815d8d

• Adding some stuff...

  havk64

  committed
  637acb7

  Copy full SHA for 637acb7

• Actions require parentheses

  chandler767

  committed
  072e194

  Copy full SHA for 072e194

• Addds Curtain Down

  krisbredemeier

  committed
  1672f98

  Copy full SHA for 1672f98

• added list of holberton students for this batch

  

  Daniel Alzugaray

  committed
  debffae

  Copy full SHA for debffae

• Merge pull request #1 from havk64/alexandro

  Show description for 7ccd317
  krisbredemeier

  committed
  7ccd317

  Copy full SHA for 7ccd317

• added dramatic pause

  chandler767

  committed
  28689bb

  Copy full SHA for 28689bb

• added credits with list of students

  

  Daniel Alzugaray

  committed
  50b9091

  Copy full SHA for 50b9091

• Added my name :)

  

  Joshua Parkin

  authored and

  Joshua Parkin

  committed
  faddced

  Copy full SHA for faddced

• Merge pull request #4 from dalzuga/credits

  Show description for af4ecf2
  dalzuga

  committed
  af4ecf2

  Copy full SHA for af4ecf2

• Do you speak latin?

  johnSerrano

  committed
  42e9e02

  Copy full SHA for 42e9e02

• Merge pull request #8 from johnSerrano/master

  Show description for 5894a28
  chandler767

  committed
  5894a28

  Copy full SHA for 5894a28

• Merge pull request #6 from chandler767/chandler

  Show description for 7920a31
  johnSerrano

  committed
  7920a31

  Copy full SHA for 7920a31

• added more actions

  chandler767

  committed
  6cc3f93

  Copy full SHA for 6cc3f93

• grilled cheese

  

  Ian Wagener

  committed
  953fe13

  Copy full SHA for 953fe13

• History channel

  johnSerrano

  committed
  1b2e052

  Copy full SHA for 1b2e052

• adds smily face

  krisbredemeier

  committed
  7e2a547

  Copy full SHA for 7e2a547

• Merge pull request #1 from chandler767/chandler

  Show description for a5d6ba9
  chandler767

  committed
  a5d6ba9

  Copy full SHA for a5d6ba9

• Update screenplay.txt

  Show description for 138ea41
  nbveroczi

  committed
  138ea41

  Copy full SHA for 138ea41

• Merge pull request #2 from krisbredemeier/master

  Show description for c9a7437
  IanWagener

  committed
  c9a7437

  Copy full SHA for c9a7437

• Add shouting message

  

  Praylin Diana Dinamoni

  committed
  7ad3a93

  Copy full SHA for 7ad3a93

• adds change made by Bennett

  bennettbuchanan

  committed
  a2256a2

  Copy full SHA for a2256a2

• build an aquarium

  johnSerrano

  committed
  2a0bf11

  Copy full SHA for 2a0bf11

• Cleaned up a little

  

  Joshua Parkin

  authored and

  Joshua Parkin

  committed
  fd8ac13

  Copy full SHA for fd8ac13

• Merge branch 'jdeepee-test_branch'

  

  Joshua Parkin

  authored and

  Joshua Parkin

  committed
  ab824fb

  Copy full SHA for ab824fb

• Add random message

  

  Praylin Diana Dinamoni

  committed
  e61da0d

  Copy full SHA for e61da0d

• Merge pull request #10 from johnSerrano/master

  Show description for e199acb
  chandler767

  committed
  e199acb

  Copy full SHA for e199acb

• Merge https://github.com/holbertonschoolstudents/discover-git

  

  Joshua Parkin

  authored and

  Joshua Parkin

  committed
  28d7506

  Copy full SHA for 28d7506

• Update screenplay.txt

  johnjohn987

  committed
  7230398

  Copy full SHA for 7230398

• Changed enthusiastically to Exclaming

  chandler767

  committed
  94859ab

  Copy full SHA for 94859ab

• Simple changes

  

  Joshua Parkin

  authored and

  Joshua Parkin

  committed
  f2b81a9

  Copy full SHA for f2b81a9

• Merge pull request #16 from jdeepee/master

  Show description for 62e2572
  jdeepee

  committed
  62e2572

  Copy full SHA for 62e2572

• adds last name

  bennettbuchanan

  committed
  4a13a64

  Copy full SHA for 4a13a64

• commit

  chandler767

  committed
  316ea07

  Copy full SHA for 316ea07

• Merge pull request #11 from chandler767/master

  Show description for 0c64df0
  johnSerrano

  committed
  0c64df0

  Copy full SHA for 0c64df0

• Add test at end

  

  Mason Fish

  committed
  a490a2d

  Copy full SHA for a490a2d

• created separate credits.txt file

  

  Daniel Alzugaray

  committed
  775a169

  Copy full SHA for 775a169

• Added second name

  

  Joshua Parkin

  authored and

  Joshua Parkin

  committed
  51f4e43

  Copy full SHA for 51f4e43

• grilled cheese

  

  Ian Wagener

  committed
  fc98e4c

  Copy full SHA for fc98e4c

• grilled cheese

  

  Ian Wagener

  committed
  6a8b66d

  Copy full SHA for 6a8b66d

• Merge pull request #5 from IanWagener/master

  Show description for b351875
  krisbredemeier

  committed
  b351875

  Copy full SHA for b351875

• Merge pull request #19 from dalzuga/master

  Show description for 3a22847
  bennettbuchanan

  committed
  3a22847

  Copy full SHA for 3a22847

• Added your second name

  

  Joshua Parkin

  authored and

  Joshua Parkin

  committed
  1864ec2

  Copy full SHA for 1864ec2

• Merge pull request #21 from jdeepee/master

  Show description for 8f6b4f8
  chandler767

  committed
  8f6b4f8

  Copy full SHA for 8f6b4f8

• Add a test at end

  

  Mason Fish

  committed
  e4472b7

  Copy full SHA for e4472b7

• Merge pull request #17 from johnjohn987/John-Copy

  Show description for 873535c
  johnjohn987

  committed
  873535c

  Copy full SHA for 873535c

• Merge pull request #15 from holbertonschoolstudents/bennett_branch

  Show description for 2446e46
  dalzuga

  committed
  2446e46

  Copy full SHA for 2446e46

• Merge pull request #23 from Praylin/my_branch

  Show description for 9d091e6
  johnjohn987

  committed
  9d091e6

  Copy full SHA for 9d091e6

• Just added the zx6r text file

  butcallmeJo

  committed
  5cb7889

  Copy full SHA for 5cb7889

• First commit

  nbveroczi

  committed
  fc8c3f7

  Copy full SHA for fc8c3f7

• added github accounts of people in the batch's github account

  

  Daniel Alzugaray

  committed
  8cbef17

  Copy full SHA for 8cbef17

• Added line January 2016 batch

  bilalbarki

  committed
  9aad2fa

  Copy full SHA for 9aad2fa

• Merge pull request #29 from nbveroczi/master

  Show description for cdf2829
  afrancisboeuf

  committed
  cdf2829

  Copy full SHA for cdf2829

• Merge pull request #27 from dalzuga/master

  Show description for a8dcaad
  Praylin

  committed
  a8dcaad

  Copy full SHA for a8dcaad

• Merge pull request #28 from bilalbarki/my_feature

  Show description for ce2096f
  havk64

  committed
  ce2096f

  Copy full SHA for ce2096f

• added some basic info about the zx6r motorcycle

  butcallmeJo

  committed
  ce6a469

  Copy full SHA for ce6a469

• Second commit

  nbveroczi

  committed
  3cede48

  Copy full SHA for 3cede48

• Made grammatical and style corrections

  electrachong

  committed
  b908e8b

  Copy full SHA for b908e8b

• Merge branch 'master' into mason

  krisbredemeier

  committed
  b9583e7

  Copy full SHA for b9583e7

• Merge branch 'mason'

  krisbredemeier

  committed
  f74163b

  Copy full SHA for f74163b

• Merge branch 'master' of github.com:holbertonschoolstudents/discover-git

  krisbredemeier

  committed
  31e400c

  Copy full SHA for 31e400c

• Third commit

  nbveroczi

  committed
  42c5eff

  Copy full SHA for 42c5eff

• fixed a typo

  

  Daniel Alzugaray

  committed
  cec8e49

  Copy full SHA for cec8e49

• Merge pull request #37 from electrachong/Electra-1

  Show description for e2a6ee0
  Praylin

  committed
  e2a6ee0

  Copy full SHA for e2a6ee0

• fixed typo

  

  Rick Houser

  committed
  f1be4d4

  Copy full SHA for f1be4d4

• removed a repetition

  

  Daniel Alzugaray

  committed
  05a40f6

  Copy full SHA for 05a40f6

• Merge pull request #40 from frakentoaster/master

  Show description for 23025b5
  

  Rick

  committed
  23025b5

  Copy full SHA for 23025b5

• Revert "fixed typo"

  

  Rick

  committed
  9c655cb

  Copy full SHA for 9c655cb

• removed a repetition

  

  Daniel Alzugaray

  committed
  7aeba48

  Copy full SHA for 7aeba48

• An experimental git file

  

  Praylin Diana Dinamoni

  committed
  0c18978

  Copy full SHA for 0c18978

• Merge branch 'jo-discover-git'

  butcallmeJo

  committed
  213f244

  Copy full SHA for 213f244

• renamed file to descriptive name

  

  Daniel Alzugaray

  committed
  1a83a8c

  Copy full SHA for 1a83a8c

• Merge pull request #43 from dalzuga/renameFiles

  Show description for a1421cf
  dalzuga

  committed
  a1421cf

  Copy full SHA for a1421cf

• Merge pull request #41 from holbertonschoolstudents/revert-40-master

  Show description for 8ae85ae
  Praylin

  committed
  8ae85ae

  Copy full SHA for 8ae85ae

• added a colon

  

  Nathan McCann

  committed
  d95b258

  Copy full SHA for d95b258

• altered the scriprt format

  SravanthiSinha

  committed
  de22e49

  Copy full SHA for de22e49

• Merge pull request #44 from nbveroczi/nomibranch

  Show description for 0c1caf1
  afrancisboeuf

  committed
  0c1caf1

  Copy full SHA for 0c1caf1

• pizza

  

  steven Garcia

  committed
  555855c

  Copy full SHA for 555855c

• Merge pull request #1 from dalzuga/renameFiles

  Show description for 79a60d9
  dalzuga

  committed
  79a60d9

  Copy full SHA for 79a60d9

• Merge pull request #46 from dalzuga/master

  Show description for d0d7adb
  afrancisboeuf

  committed
  d0d7adb

  Copy full SHA for d0d7adb

• Amy knows latin

  mason-fish

  committed
  478c63f

  Copy full SHA for 478c63f

• added 'bright'

  

  Nathan McCann

  committed
  3f8e7c9

  Copy full SHA for 3f8e7c9

• info

  

  steven Garcia

  committed
  427feb2

  Copy full SHA for 427feb2

• Merge pull request #48 from WilliamMcCann/william_take_two

  Show description for ca932ec
  Praylin

  committed
  ca932ec

  Copy full SHA for ca932ec

• Merge pull request #47 from mason-fish/mason_branch

  Show description for 9fb8451
  mason-fish

  committed
  9fb8451

  Copy full SHA for 9fb8451

• Merge pull request #45 from SravanthiSinha/master

  Show description for 0947bf5
  SravanthiSinha

  committed
  0947bf5

  Copy full SHA for 0947bf5

• Merge pull request #49 from butcallmeJo/master

  Show description for 86b3f9e
  butcallmeJo

  committed
  86b3f9e

  Copy full SHA for 86b3f9e

• wrapped the students list

  

  augustin francis-boeuf

  committed
  ae24d8d

  Copy full SHA for ae24d8d

• asked a question

  madejean

  committed
  58a8c6e

  Copy full SHA for 58a8c6e

• My addition to the file

  

  Richard Harris

  committed
  2c7ba7d

  Copy full SHA for 2c7ba7d

• Merge pull request #1 from afrancisboeuf/wraptext

  Show description for 3d69de4
  afrancisboeuf

  committed
  3d69de4

  Copy full SHA for 3d69de4

• fetching

  

  steven Garcia

  committed
  1a913c8

  Copy full SHA for 1a913c8

• Merge remote-tracking branch 'refs/remotes/origin/master'

  

  steven Garcia

  committed
  b8762b2

  Copy full SHA for b8762b2

• Merge pull request #50 from afrancisboeuf/master

  Show description for 305b29b
  nbveroczi

  committed
  305b29b

  Copy full SHA for 305b29b

• add more change text to end

  mason-fish

  committed
  321afe5

  Copy full SHA for 321afe5

• Merge pull request #51 from madejean/marine

  Show description for 76b64ff
  madejean

  committed
  76b64ff

  Copy full SHA for 76b64ff

• add random text

  mason-fish

  committed
  634ddb9

  Copy full SHA for 634ddb9

• Adding my stuff...

  havk64

  committed
  22fda32

  Copy full SHA for 22fda32

• Merge pull request #54 from mason-fish/mason_branch_2

  Show description for 3693211
  butcallmeJo

  committed
  3693211

  Copy full SHA for 3693211

• edit

  madejean

  committed
  e6fd257

  Copy full SHA for e6fd257

• Accepting suggestions from reviewer...

  havk64

  committed
  ea1c859

  Copy full SHA for ea1c859

• steven was here

  

  steven Garcia

  committed
  aa9e1eb

  Copy full SHA for aa9e1eb

• Merge pull request #56 from havk64/alex

  Show description for 8ec8873
  mason-fish

  committed
  8ec8873

  Copy full SHA for 8ec8873

• Merge pull request #60 from stvngrcia/master

  Show description for 8f80e8c
  dalzuga

  committed
  8f80e8c

  Copy full SHA for 8f80e8c

• Merge pull request #59 from madejean/marine

  Show description for 96722b2
  bilalbarki

  committed
  96722b2

  Copy full SHA for 96722b2

• Edited the file

  

  Praylin Diana Dinamoni

  committed
  0d9edc4

  Copy full SHA for 0d9edc4

• Removed random text

  butcallmeJo

  committed
  4068b5f

  Copy full SHA for 4068b5f

• Merge remote-tracking branch 'upstream/master' into rickharris-dev-rick_harris

  rickharris-dev

  committed
  be62362

  Copy full SHA for be62362

• Merge branch 'rickharris-dev-rick_harris' into rick_harris

  rickharris-dev

  committed
  0d338b2

  Copy full SHA for 0d338b2

• added a line

  bilalbarki

  committed
  408cf07

  Copy full SHA for 408cf07

• Merge pull request #63 from Praylin/expbranch

  Show description for 2207952
  afrancisboeuf

  committed
  2207952

  Copy full SHA for 2207952

• Merge pull request #52 from rickharris-dev/rick_harris

  Show description for 94386a5
  nbveroczi

  committed
  94386a5

  Copy full SHA for 94386a5

• Merge pull request #65 from bilalbarki/my_feature

  Show description for 7f6d059
  madejean

  committed
  7f6d059

  Copy full SHA for 7f6d059

• Revert "added a line"

  madejean

  committed
  0f20664

  Copy full SHA for 0f20664

• Merge pull request #68 from holbertonschoolstudents/revert-65-my_feature

  Show description for 7b42247
  madejean

  committed
  7b42247

  Copy full SHA for 7b42247

• added a line

  bilalbarki

  committed
  7110ea2

  Copy full SHA for 7110ea2