Skip to content

Commit

Permalink
Merge branch 'master' into add-r-steel
Browse files Browse the repository at this point in the history
  • Loading branch information
Roshanjossey authored Aug 29, 2018
2 parents 9937f9e + 99bcb10 commit 2843235
Show file tree
Hide file tree
Showing 5 changed files with 129 additions and 5 deletions.
69 changes: 67 additions & 2 deletions Contributors.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
# Contributors
# Contributors

- patrik
- [Abhipsha Das](https://github.com/chiral-carbon)
- [Mrinmay Mukherjee](https://github.com/devmrin)
- [Hiatt Zhao](https://github.com/hiattzhao)
- [Bill Clark](https://github.com/billrobclark)
- [Scott Wickersham] (https://github.com/scwicker)
- [Ilkhom Safarov](https://github.com/ilhom-s)
- [Vidya Mani] (https://github.com/vidyasrimani)
- [rockstar](https://github.com/rockstar)
- [jhonof](https://github.com/jhonof)
- [hritikgupta](https://github.com/hritikgupta)
Expand All @@ -14,6 +20,11 @@
- [Lawrence Fidelino](https://github.com/lfidelino)
- [Hasib Zunair](https://github.com/hasibzunair)
- [Thomas Bigger](https://github.com/thomasbigger584)
- [Justin Lepiten](https://github.com/jlepiten)
- [Jocelyn Englund](https://github.com/therealjawss)
- [Oxana Ermolenko](https://github.com/okyska)
- [Gio Noa] (https://github.com/gionoa)
- [Matt Magda](https://github.com/realgs)
- [Marouane Rassili](https://github.com/mrassili)
- [Gabriel Takazaki](https://github.com/GabrielTakazaki)
- [Joey Dunivan](https://github.com/JoeyDunivan)
Expand All @@ -25,7 +36,9 @@
- [Aparajit Chatterjee](https://github.com/aparajit0511)
- [Devansh Sharma](https://github.com/devansh289)
- [hemanthreddyk](https://github.com/hemanthreddyk)
- [kamajeetSingh]
- [Raihan Kabir Ratul](https://github.com/ratulKabir)
- [Jason Halbur](https://github.com/Jsnhlbr5)
- [Mayukh Maitra](https://github.com/mayukhdeep18)
- [Jose Aguilar](https://github.com/joeyDevelops)
- [KyungJae Min](https://github.com/mnkjamie)
Expand All @@ -42,26 +55,35 @@
- [Dafny Garcia](https://github./daphnemillss)
- [Milos Stanojevic](https://github.com/IndoMisa)
- [Tony Chen](https//github.com/tchen98)
- [Prince](https://github.com/PrinceSharzeel)
- [Sarthak Singhal](https://github.com/sarthak2007)
- [Not Sharing My Name](https://github.com/BP-21)
- [Niall Moran](https://github.com/niallermoran)
- [Ross Tapson](https://github.com/rosstapson)
- [Pedro Acosta](https://github.com/Pcost8300)
- Elliott Weeks
- Pietil
- Jose Antonio
- Aakash Shah
- [Cliff McCall](https://github.com/cliffmccall1)
- [evanzko](https://github.com/evanzko)
- [Borislav Krastev](https://github.com/bKrystev)
- [Attila Greguss](https://github.com/Floyd0122)
- [Guy Zilberg](https://github.com/guyzilberg)
- [Kamilla Dallmann](https://github.com/kamilladallmann)
- [Gaurav Gupta](https://github.com/gauravgupta98)
- [Vero Donoso](https://github.com/veroca88)
- [James Howerton](https://github.com/thejimster82)
- [Christian Moronta](https://github.com/Poliphria)
- [Arshad Umrethi](https://github.com/arshadumrethi)
- [Morgan McCauley](https://github.com/morgsmccauley)
- [touletan](https://github.com/touletan)
- [Jason Secrest](https://github.com/jsecrest)
- [Shashi Srinath](https://github.com/profghost)
- [Amaka Mbah](https://github.com/devsisi)
- [Kurt Neaderhiser](https://github.com/KurtN91)
- [Donald Pittard][https://github.com/donaldpittard]
- Jamie Davis
- Jithu Nair
- [Priyesh](https://github.com/Priyeshpandey)
- [Wendy Wang](https://github.com/wenddyywang)
Expand All @@ -72,10 +94,13 @@
- [Igor Antonov](https://github.com/IgorAntonov)
- [Xamenyap](https://github.com/xamenyap)
- [Jenny Justh](https://github.com/jennyjj)
- [Hi Adamsu](https://github.com/hiadamsu)
- [Nathen Rader](https://github.com/ndrader)
- [Joao Henrique Machado Silva](https://github.com/joaoh82)
- [csy0296]
- [Elizabeth Onder](https://github.com/eonder)
- [Mike Guilmette](https://github.com/mg0678)
- [Alexander Mandt](https://github.com/alexmandt)
- [Boonpraserd Treerayapiwat](https://github.com/boonpraserd)
- [Christian Salinas](https://github.com/CTSalinas)
- [Aaron Klapatch](https://github.com/aklapatch)
Expand All @@ -87,8 +112,10 @@
- [Morteza Kavakebi](https://github.com/mkavakebi)
- [Amit Pareek](https://github.com/amit0021)
- [Javier "Javi" Carrion](https://github.com/JavaVista/)
- [Mohan Das](https://github.com/mohandast52)
- [Tanveer Ahmed](https://github.com/Tan66)
- [Apurv Mishra](https://github.com/apurvmishra99)
- [Christopher Beards](https://github.com/ChristopherBeards)
- [Rajesh Mainali](https://github.com/Stereoraj)
- [Devpur Developer](https://github.com/devpur)
- [Pamela Van Wyk](https://github.com/Squeakidy)
Expand All @@ -101,6 +128,7 @@
- [Praxitelis Nikolaou](https://github.com/Praxitelis)
- alonzo church
Ahmed Abdulkadir
- Toon Brinks
- [Abhishek Mahadevan](https://github.com/ShekMaha)
- [Miguel Morell](https://github.com/lilMiggz)
- [Jarrad Cisco](https://github.com/jcc5225)
Expand All @@ -116,6 +144,7 @@
- [Tal Sheldon](https://github.com/sheldonzy)
- [Melissa Freiser](https://github.com/mofoshow)
- [Rishikesh Jadhav](https://github.com/rishikeshjadhav)
- [Nelson Almendra](https://github.com/nelsonalmendra)
- [Akash Barve](https://github.com/AkashBarve)
- [Avanti Prasanna](https://github.com/avantiprasanna)
- [Rafal Cieslinski](https://github.com/Bitz3d)
Expand All @@ -129,16 +158,19 @@
- [Justin Calma](https://github.com/JCCII) 8/11/2018
- [Ankita](https://github.com/Ankita3010)
- Padmashantha Rajapakshe
- Lauren Rodney
- [Tony Huang](https://github.com/tonyth00)
- [Marc Isaac](https://github.com/phoenx34)
- [Darren Greenfield](https://github.com/umbauk)
- [John Goure](https://github.com/johngoure)
- [Felix Lechleitner](https://github.com/brettljausn)
- [kholood Eassa](https://github.com/kholood-ea)
- [Patrick O'Neill](https://github.com/howelloneill)
- [Siva Kumar Lakkoju](https://github.com/sivakumar97)
- [Paulo Ricardo Kenshun Nakaima](https://github.com/guimpo)
- [Thibault d'Aboville](https://github.com/ThibaultDBVLL)
- Luis Fernando Robles
- [Andy Yao] (https://github.com/atyao)
- [Chris Page] (https://github.com/pageyboy)
- [Bayartsogt Erdenebat](https://github.com/BunnyMN)
- [Barkshire Purringtonn](https://github.com/barkshire)
Expand All @@ -160,6 +192,7 @@
- [Jhovahn Gibbs](https://github.com/jhovahn)
- [Jennifer Williams](https://github.com/Taljjaa)
- [James S. Lee](https://github.com/sanghawk)
- [Muhammad Fawwaz / abuuzayr](https://github.com/abuuzayr)
- [Shahe Ansar](https://github.com/ShaheAnsar)
- [Shadrach Jakes](https://github.com/ShadrachJ)
- [Andrew Hoverson](https://github.com/ahoverson)
Expand Down Expand Up @@ -222,6 +255,7 @@
- Hemant Mishra
- [Epaphradito Lugayavu](http://github.com/paphra)
- [Aunik Ahmed](https://github.com/aunik22)
- [Jethro Bakker](https://github.com/Jetisr)
- [Ahsan Zaman](https://github.com/ahsanzaman)
- Abiud Ayele
- Aaron Melendez
Expand Down Expand Up @@ -458,6 +492,7 @@
- [Zain Khan](https://github.com/gimpster05)
- [Ephraim Harris](https://github.com/eharris91)
- [Lian Thompson](https://github.com/lianthompson)
- [Boahen Gyan] (https://github.com/Ohenegyan)
- [Deny Purnama Ramadan](https://github.com/ramadandeny)
- [Mughees Hafeez](https://github.com/mugheeshafeez)
- [Ajay Neethi Kannan](https://github.com/Ajayneethikannan)
Expand Down Expand Up @@ -549,6 +584,7 @@
- [Connor McCurrie](https://github.com/adinsxx)
- [ankush-rawat](https://github.com/Rawkush)
- [Mohammed Zubair khan](https://github.com/Mohammedzubairkhan)
- [Duha Hassan](https://github.com/duha-h)
- [Prakhar Pandey](https://github.com/prakharvk)
- [Jonathan Allou](https://github.com/jonalloub/)
- [Steven Siperko](https://github.com/ssiperko)
Expand Down Expand Up @@ -661,6 +697,7 @@
- [avidevil](https://github.com/avidevil)
- [andynur](https://github.com/andynur)
- [smieras](https://github.com/smieras)
- [Jani Rantanen](https://github.com/JaniRantanen)
- [joel7871](https://github.com/joel7871)
- [Shiny](https://github.com/Shine0707)
- [Blinky Bloomberg](https://github.com/carly000)
Expand All @@ -674,6 +711,7 @@
- [armandfardeau](https://github.com/armandfardeau/first-contributions)
- [Lasgidy Gideon](https://github.com/lasgidy)
- [Lina Grybauskaite](https://github.com/linaou)
- [Faizaan Sakib](https://github.com/fznsakib)
- [Alyssa](https://github.com/rageunleashed69)
- [Jack Sodeman](https://github.com/TICG)
- [Hpearson](https://github.com/harrytpstudent)
Expand Down Expand Up @@ -709,11 +747,13 @@
- [Oliver Miller](https://github.com/Oliver-H-Miller)
- [Gabriel Cueto](https://github.com/TheMushrr00m)
- [Lewis Shaw](https://github.com/iRuisu)
- Michelle
- [Bao Tran](https://github.com/cyborg103)
- [Jithu R Jacob ??](https://github.com/jithurjacob)
- [Ashutosh Singh](https://github.com/ashubly25)
- [Julio Melchor](https://github.com/k4vglitcher)
- [gipsi](https://github.com/gipsi)
- [Abdallah Ahmad](https://github.com/AbdallahDev)
- [girlzap](https://github.com/girlzap)
- [DevMaterial](https://github.com/DevMaterial)
- [Narayana Suri](https://github.com/narayanasuri)
Expand Down Expand Up @@ -1657,6 +1697,7 @@
- [MikeWLloyd](https://github.com/MikeWLloyd)
- [Thespawnexe](https://github.com/Thespawnexe)
- [Andrew Niekamp](https://github.com/andrewniekamp)
- [David Yi](https://github.com/kvah)
- [Aayush Babbar](https://github.com/mooonshot)
- [Xinnan Li](https://github.com/xn0611)
- [javmonisu](https://github.com/javmonisu)
Expand Down Expand Up @@ -2466,6 +2507,7 @@
- [Andrew Davis](https://github.com/rreeppeeaatteerr)
- [Gabriele Sani](https://github.com/gabryatfendor)
- [Mohd Talha](https://github.com/mdtalham)
- [Maxens Achiepi](https://github.com/mxch18)
- [Vurp](https://github.com/Vurp)
- [n00bady](https://github.com/n00bady)
- [Mujadded](https://github.com/mujadded)
Expand Down Expand Up @@ -2779,6 +2821,7 @@
- [Tom Zhang](https://github.com/TomZhangg)
- Ron Lester Crisostomo
- [Melissa Lucas](https://github.com/mlucas2218)
- [Will Fitch](https://github.com/WRFitch)
- [Kyle OBrien](https://github.com/webbhostnet)
- [Firas Omrane](https://github.com/firou1925)
- [Dany Likoris](https://github.com/likorisd)
Expand Down Expand Up @@ -2895,6 +2938,7 @@
- [Michael Porter](https://github.com/mporter45042)
- [Mary Ellen Weber](https://github.com/mmweber2)
- [Craig Menne](https://github.com/Tsukiyonocm)
- [min](https://github.com/miniu1)
- [Pratham Nawal](https://github.com/PrathamNawal)
- [Krystian Antoniak](hhtps://github.com/Sinon2025)
- [Daniel Bonham](https://github.com/bonhamdaniel)
Expand Down Expand Up @@ -3161,6 +3205,7 @@
- [Carl Rizk](https://github.com/carlrizk)
- [Saiharsha B](https://github.com/thewhitewolf17)
- [Sangwon Kim](https://github.com/sangwo)
- [Louis Payne](https://github.com/louispayne10)
- [Amin Limbada](https://github.com/loxator)
- [Rajarshi Ghoshal](https://github.com/rajarshighoshal)
- [Matt Steadman](https://github.com/mattsteadman)
Expand Down Expand Up @@ -4151,6 +4196,7 @@
- [Hal DiMarchi](https://github.com/hadimarchi)
- [Duane Shaffer](https://github.com/DuaneShaffer)
- [njw dev](https://github.com/njwdev)
- [Rodrigo Ali](https://github.com/ElRodrigote/)
- [Tiago Maia](https://github.com/tiagomvf)
- [Jake Happersett](https://github.com/JakeHappersett)
- [Sherin Binu](https://github.com/SherOnDale13)
Expand Down Expand Up @@ -4976,6 +5022,7 @@
- [Kenji Japra](https://github.com/kensj)
- [Arthur Loukes](https://github.com/arthurloukes)
- [Rajeev Ranjan](https://github.com/rajeevcoding)
- [Abdulla Al Mamun](https://github.com/NAbdulla1)
- [Chris G](https://github.com/chdgriff)
- [Elizabeth Berg](https://github.com/reykjaviks)
- [dave7ter](https://github.com/dave7ter)
Expand Down Expand Up @@ -5392,6 +5439,7 @@
- [Diego Varela](https://github.com/Diego-Varela-Silva)
- [Cintia Nunes](https://github.com/Cintiaa)
- [Prakhar Dubey](https://github.com/Starlight3)
- [Michael Hon] (https://github.com/mhon2014)
- [Brenton L](https://github.com/LalondeBrenton)
- [Andrés Serna](https://github.com/andres0107)
- [impxia](https://github.com/impxia)
Expand Down Expand Up @@ -5425,6 +5473,7 @@
- [Stephen Under](https://github.com/stephenunder)
- [Paola Guarasci](https://github.com/paolaguarasci)
- Dipti Butola
- [James Jung](https://github.com/thejcode24)
- [ghostgost](https://github.com/ghostgost)
- [spooti](https://github.com/spooti)
- [David Harris](https://github.com/dahveed15)
Expand All @@ -5434,14 +5483,30 @@
- [Eran Segal](https://github.com/segaler)
- [Kalidrev](https://github.com/kalidrev)
- [Bui Le Vu Tam](https://github.com/itsmetambui)
- [Alex Cheng](https://github.com/alexcheng94)
- [Xobx CHERIF](https://github.com/xobx-cherif)
- [Hernán Gimenez](https://github.com/hgimenez/)
- [Daniel Bailey](https://github.com/DanielJBailey)
-Harini Narayanan
- [Michael Hunt-Reyes](https://github.com/mikeb530)
- Harini Narayanan
- [IIRawcodeII](https://github.com/IIRawcodeII)
- [Ahmed Belhadj](https://github.com/ahmed-belhadj)
- [Preetpal Kaur](https://github.com/Preetpalkaur3701)
- [Mike MacDougall] (https://github.com/mgmacdougall)
- [Vedanth Narayanan] (https://github.com/narayave)
- Johnstone Wahome
- [Antwane Fowler](https://github.com/fowlerkantwane23)
- [Neel Mani Rajput] (http://github.com/neelmani07)(26/8/18)
- [Ryan Steel] (http://github.com/rsteel1)
- [Shyveon] (https://github.com/Shyveon)
- [MB] (https://github.com/0rthogonal)
- [Shyveon] (https://github.com/Shyveon)
- [Ev] (https://github.com/Evvie)
- [Vinay Chawla] (https://github.com/vinaychawla11)
- [Vjroby] (https://github.com/vjroby)
- [Pranav Hundekari] (https://github.com/pranav-h)
- [Dodgers] (https://github.com/dodgers76)
- [Siddharth Maurya] (http://github.com/savvysiddharth)
- [Ed Graham] (https://github.com/ed-graham)
- [Kanishk Bansal] (https://github.com/kanishk2112)
- [Jerand Tze] (https://github.com/jerandtze)
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ But since what we want to achieve here is to amend the previous commit, we would
* ```git commit --amend```
This would then bring up the text editor and prompt you to edit the message. You can decide to leave the message as it was before or change it.
* Exit the editor
* Push your changes with ```git push origin <branch-name```
* Push your changes with `` `git push origin <branch-name>` ``

That way, both changes would be in one single commit.
51 changes: 51 additions & 0 deletions additional-material/translations/amending-a-commit.ur.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
کمانڈر ترمیم #

اگر آپ اپنے دور دراز ذخیرہ میں تبدیلی کرتے ہیں تو صرف اس کے بعد احساس کرنے کے لۓ آپ کے پاس وعدہ کردہ پیغام میں ٹائپو ہے یا آپ کو اپنے حالیہ حاکموں میں ایک لائن شامل کرنا بھول گیا ہے.
تم اس میں کیسے ترمیم کرتے ہو؟ یہ وہی ہے جو سبق کا احاطہ کرتا ہے.

## آپ Github کے لئے دھکیل دیا ہے کے بعد ایک حالیہ پیغام کا ارتکاب تبدیل کرنا.

کسی فائل کو کھولنے کے بغیر ایسا کرنے کے لئے:
* میں ٹائپ کریں `` `git commit --amend -m "اپنا نیا ارتکاب کے بعد پیغام "` `` ارتکاب
* ذخیرہ کرنے کے لئے تبدیل کرنے کے لئے چلائیں `` `git push origin <branch-name>` ``.

نوٹ: اگر آپ صرف ``` git commit --amend ``` میں ٹائپ کریں تو، آپ کے ٹیکسٹ ایڈیٹر آپ کو وعدہ پیغام میں ترمیم کرنے کے لئے فوری طور پر کھولیں گے.
`` -m`` جھگڑے کو شامل کرنے سے روکتا ہے.

## ایک واحد پر ترمیم کا ارتکاب

لہذا، اگر ہم ایک ہی لفظ کو تبدیل کرنے کی طرح ایک فائل میں ایک معمولی تبدیلی کرنے کے لئے بھول گئے ہیں اور ہم نے پہلے سے ہی ہمارے دور دراز ذخیرہ کرنے کے لئے وعدے کو دھکا دیا ہے؟

یہاں وضاحت کرنے کے لئے میری اقلیت کی لاگت ہے:

`` `
g56123f create file bot file
a2235d updated contributor.md
a5da0d modified bot file
`` `
آتے ہیں کہ میں بوٹ فائل میں ایک ہی لفظ شامل کرنے کے لئے بھول گیا

اس کے بارے میں جانے کے لۓ 2 طریقے ہیں. سب سے پہلے ایک مکمل طور پر نیا وعدہ ہے جو اس طرح کی تبدیلی پر مشتمل ہے:

`` `
g56123f create file botfile
a2235d updated contributor.md
a5da0d modified botfile
b0ca8f added single word to botfile
`` `
دوسرا طریقہ 5da0d وعدہ میں ترمیم کرنا ہے، اس نئے لفظ کو شامل کریں اور یہ ایک عہد کے طور پر جتھوٹ کو دھکا دیں.
دوسری آواز بہتر ہے کیونکہ یہ صرف ایک معمولی تبدیلی ہے.

اس کو حاصل کرنے کے لئے، ہم مندرجہ ذیل کریں گے:
* فائل میں ترمیم کریں. اس صورت میں، میں نے پہلے ہی اتار دیا گیا لفظ شامل کرنے کے لئے میں botfile میں ترمیم کریں گے.
* اگلا، فیلڈ اسٹینج علاقے میں `` `git add <filename>` ``

عام طور پر اسٹینجنگ علاقے میں فائلوں کو شامل کرنے کے بعد، ہمارا اگلا کام ہمارا وعدہ ہے - ہمارا وعدہ پیغام "صحیح ہے؟
لیکن چونکہ ہم یہاں حاصل کرنا چاہتے ہیں اس سے پچھلے وعدوں میں ترمیم کرنا ہے، ہم اس کے بجائے چلائیں گے:

* `` `git commit --amend ` ``
 اس کے بعد ٹیکسٹ ایڈیٹر کو لانے اور پیغام کو ترمیم کرنے کے لئے آپ کو فوری طور پر کریں گے. آپ پیغام کو چھوڑنے کا فیصلہ کر سکتے ہیں کیونکہ اس سے پہلے تھا یا اسے تبدیل کر دیا گیا تھا.
* ایڈیٹر سے باہر نکلیں
* اپنی تبدیلیوں کو دھکا دیں `` `git push origin <branch-name>` ``

اس طرح، دونوں تبدیلیاں ایک ہی انجام میں ہو گی.
10 changes: 9 additions & 1 deletion app/src/components/ProjectList/listOfProjects.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const projectList = [
}, {
name: 'Coala',
imageSrc: 'https://avatars2.githubusercontent.com/u/10620750?v=3&s=100',
githubLink: 'https://github.com/coala/coala/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow+label%3Adifficulty%2Fnewcomer',
githubLink: 'https://coala.io/new',
description: 'Unified command-line interface for linting and fixing all your code.',
tags: ['UX', 'Linter', 'Python'],
}, {
Expand Down Expand Up @@ -423,6 +423,14 @@ const projectList = [
description: 'conducts high-impact research and engineering to tackle key problems in artificial intelligence.',
tags: ['Artificial Intelligence','Python','NLP']
}
{
name: 'Qute Browser',
imageSrc: 'https://avatars1.githubusercontent.com/u/21955151?s=200&v=4',
githubLink:
'https://github.com/qutebrowser/qutebrowser',
description: 'A keyboard-driven, vim-like browser based on PyQt5',
tags: ['Python','Qt','pyqt5','Vim','Browser','qtWebEngine','web']
}

];
export default projectList;
2 changes: 1 addition & 1 deletion translations/README.se.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Att läsa artiklar och titta på handledningar kan så klart hjälpa men det är

#### *Om du inte känner dig bekväm med kommandoraden, [så finns en vägledning här.]( #tutorials-using-other-tools )*

#### *Läs detta på [andra språk](Translations.md).*
#### *Läs detta på [andra språk](../Translations.md).*

<img align="right" width="300" src="../assets/fork.png" alt="fork this repository" />

Expand Down

0 comments on commit 2843235

Please sign in to comment.