Joss Whedon - Revision history

LIMAFOX76 at 11:35, 3 April 2018

2018-04-03T11:35:18Z

← Older revision		Revision as of 11:35, 3 April 2018
Line 33:		Line 33:
	<!-- MCU-RELATED INFORMATIONS -->		<!-- MCU-RELATED INFORMATIONS -->
	\| film = {{related films\|Avengers\|Ultron}}<!-- each film must be separated by a <br/> -->		\| film = {{related films\|Avengers\|Ultron}}<!-- each film must be separated by a <br/> -->
	\| series = {{related series group\|aos}}<!-- each series must be separated by a <br/> -->		\| series = {{related series group\|aos\|slingshot}}<!-- each series must be separated by a <br/> -->
	\| short = <!-- each short must be separated by a <br/> -->		\| short = <!-- each short must be separated by a <br/> -->
	\| mcu occupation = {{Function\|function=writer\|series=aos\|text=Creator\|show=t}}<br/>{{Functions\|function=writer\|series1=Avengers\|text=Screenplay}}<br/>{{Functions\|function=writer\|series1=Avengers\|text=Story}}<br/>{{Functions\|function=writer\|series1=aos\|series2=Ultron\|text=Writer}}<br/>{{Functions\|function=Director\|series1=aos\|series2=Avengers\|series3=Ultron\|text=Director}}<br/>{{Functions\|function=Producer\|series1=aos\|series2=Slingshot\|text=Executive producer}}		\| mcu occupation = {{Function\|function=writer\|series=aos\|text=Creator\|show=t}}<br/>{{Functions\|function=writer\|series1=Avengers\|text=Screenplay}}<br/>{{Functions\|function=writer\|series1=Avengers\|text=Story}}<br/>{{Functions\|function=writer\|series1=aos\|series2=Ultron\|text=Writer}}<br/>{{Functions\|function=Director\|series1=aos\|series2=Avengers\|series3=Ultron\|text=Director}}<br/>{{Functions\|function=Producer\|series1=aos\|series2=Slingshot\|text=Executive producer}}

LIMAFOX76: /* Filmography */

2018-04-03T11:34:06Z

Filmography

Show changes

LIMAFOX76 at 11:26, 3 April 2018

2018-04-03T11:26:28Z

← Older revision		Revision as of 11:26, 3 April 2018
Line 21:		Line 21:
	\| marriage = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->		\| marriage = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->
	\| parents = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->		\| parents = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->
	\| siblings = [[~~Brother~~::Jed Whedon]] (brother)<!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->		\| siblings = [[Half-brother::Jed Whedon]] (half-brother)<!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->
	\| children = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->		\| children = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->
	\| other relatives = [[Sister-in-law::Maurissa Tancharoen]] (sister-in-law)<!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->		\| other relatives = [[Sister-in-law::Maurissa Tancharoen]] (sister-in-law)<!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->
Line 38:		Line 38:
	\| character = <!-- only put the most importants; each character must be separated by a <br/> -->		\| character = <!-- only put the most importants; each character must be separated by a <br/> -->
	}}		}}
	'''Joss Whedon''' (born June 23, [[1964]]) is an American writer, director and producer. He wrote and directed {{ep\|Avengers}} and {{ep\|Ultron}}, and created with his brother [[Jed Whedon\|Jed]] and his sister-in-law [[Maurissa Tancharoen]] the TV series {{series\|aos}} and serves as Executive producer. He co-wrote (with Jed Whedon and Maurissa Tancharoen) and directed the [[episode:Pilot\|pilot episode]].		'''Joss Whedon''' (born June 23, [[1964]]) is an American writer, director and producer. He wrote and directed {{ep\|Avengers}} and {{ep\|Ultron}}, and created with his half-brother [[Jed Whedon\|Jed]] and his sister-in-law [[Maurissa Tancharoen]] the TV series {{series\|aos}} and serves as Executive producer. He co-wrote (with Jed Whedon and Maurissa Tancharoen) and directed the [[episode:Pilot\|pilot episode]].

	{{toclimit\|2}}		{{toclimit\|2}}

LIMAFOX76 at 11:23, 3 April 2018

2018-04-03T11:23:29Z

← Older revision		Revision as of 11:23, 3 April 2018
Line 21:		Line 21:
	\| marriage = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->		\| marriage = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->
	\| parents = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->		\| parents = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->
	\| siblings = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->		\| siblings = [[Brother::Jed Whedon]] (brother)<!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->
	\| children = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->		\| children = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->
	\| other relatives = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->		\| other relatives = [[Sister-in-law::Maurissa Tancharoen]] (sister-in-law)<!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->
	\| affair = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->		\| affair = <!-- only if the person(s) are MCU-related, each person must be separated by a <br/> -->
	<!-- PROFESIONAL INFORMATIONS -->		<!-- PROFESIONAL INFORMATIONS -->
Line 38:		Line 38:
	\| character = <!-- only put the most importants; each character must be separated by a <br/> -->		\| character = <!-- only put the most importants; each character must be separated by a <br/> -->
	}}		}}
	'''Joss Whedon''' (born June 23, [[1964]]) is an American writer, director and producer. He wrote and directed {{ep\|Avengers}} and {{ep\|Ultron}}, and created with his brother [[Jed Whedon\|Jed]] and his sister-in-law [[Maurissa Tancharoen]] the TV series {{series\|aos}} and serves as Executive producer. He ~~cowrote~~ and directed the [[episode:Pilot\|pilot episode]].		'''Joss Whedon''' (born June 23, [[1964]]) is an American writer, director and producer. He wrote and directed {{ep\|Avengers}} and {{ep\|Ultron}}, and created with his brother [[Jed Whedon\|Jed]] and his sister-in-law [[Maurissa Tancharoen]] the TV series {{series\|aos}} and serves as Executive producer. He co-wrote (with Jed Whedon and Maurissa Tancharoen) and directed the [[episode:Pilot\|pilot episode]].

	{{toclimit\|2}}		{{toclimit\|2}}
Line 520:		Line 520:
	\|WHIH-2x01=\|WHIH-2x02=\|WHIH-2x03=\|WHIH-2x04=\|WHIH-2x05=		\|WHIH-2x01=\|WHIH-2x02=\|WHIH-2x03=\|WHIH-2x04=\|WHIH-2x05=
	<!-- Slingshot-->		<!-- Slingshot-->
	\| Slingshot Season =		\| Slingshot Season = t
	\| Slingshot Season 1 =		\| Slingshot Season 1 = t
	\|Slingshot-1x01=\|Slingshot-1x02=\|Slingshot-1x03=\|Slingshot-1x04=\|Slingshot-1x05=\|Slingshot-1x06=		\|Slingshot-1x01=t\|Slingshot-1x02=t\|Slingshot-1x03=t\|Slingshot-1x04=t\|Slingshot-1x05=t\|Slingshot-1x06=t
	}}		}}

Line 530:		Line 530:

	* {{WP}}		* {{WP}}
	* {{IMDb name\|<!-- IMDb number -->}}		* {{IMDb name\|0923736<!-- IMDb number -->}}

	== References ==		== References ==

LIMAFOX76 at 11:15, 3 April 2018

2018-04-03T11:15:54Z

@@ Line 38: / Line 38: @@
  | character        = <!-- only put the most importants; each character must be separated by a <br/> -->
 }}
 {{toclimit|2}}
@@ Line 355: / Line 356: @@
 |AOS-5x01=|AOS-5x02=|AOS-5x03=|AOS-5x04=|AOS-5x05=|AOS-5x06=|AOS-5x07=|AOS-5x08=|AOS-5x09=|AOS-5x10=|AOS-5x11=
 |AOS-5x12=|AOS-5x13=|AOS-5x14=|AOS-5x15=|AOS-5x16=|AOS-5x17=|AOS-5x18=|AOS-5x19=|AOS-5x20=|AOS-5x21=|AOS-5x22=
 <!-- Marvel's Agent Carter -->
  | AC Season =

LIMAFOX76: /* Notes */

2018-04-03T11:04:31Z

Notes

← Older revision		Revision as of 11:04, 3 April 2018
Line 175:		Line 175:
	\| name =		\| name =
	\| functiontext =		\| functiontext =
	\| function = ~~Screenplay~~		\| function = Screenplayer
	<!-- Phase One Movies -->		<!-- Phase One Movies -->
	\| Phase One = t<!-- Anything to activate it -->		\| Phase One = t<!-- Anything to activate it -->

LIMAFOX76: /* Notes */

2018-04-03T11:03:11Z

Notes

@@ Line 173: / Line 173: @@
 }}
 {{Function navbox
  | name         =
  | functiontext = Creator

LIMAFOX76: /* Invovlment in the Marvel Cinematic Universe */

2018-04-03T11:01:53Z

Invovlment in the Marvel Cinematic Universe

← Older revision		Revision as of 11:01, 3 April 2018
Line 45:		Line 45:

	* '''Creator''' ({{series\|aos}}, with [[Jed Whedon]] and [[Maurissa Tancharoen]])		* '''Creator''' ({{series\|aos}}, with [[Jed Whedon]] and [[Maurissa Tancharoen]])
	* '''~~Writer~~''' (~~[[AOS]]:~~ {{ep\|~~Pilot~~}})		* '''Screenplay/Story''' ({{ep\|Avengers}})
			* '''Writer''' ([[AOS]]: {{ep\|Pilot}}; {{ep\|Ultron}})
	* '''Director''' ({{ep\|Avengers}}; [[AOS]]: {{ep\|Pilot}}; {{ep\|Ultron}})		* '''Director''' ({{ep\|Avengers}}; [[AOS]]: {{ep\|Pilot}}; {{ep\|Ultron}})
	* '''Executive producer''' ({{series\|aos}})		* '''Executive producer''' ({{series\|aos}})

LIMAFOX76 at 11:00, 3 April 2018

2018-04-03T11:00:03Z

← Older revision		Revision as of 11:00, 3 April 2018
Line 185:		Line 185:
	\| The Avengers =		\| The Avengers =
	<!-- Phase Two Movies -->		<!-- Phase Two Movies -->
	\| Phase Two = t<!-- Anything to activate it -->		\| Phase Two = <!-- Anything to activate it -->
	\| Phase Two visible = <!-- Anything to see all the films -->		\| Phase Two visible = <!-- Anything to see all the films -->
	\| Iron Man 3 =		\| Iron Man 3 =
Line 191:		Line 191:
	\| Winter Soldier =		\| Winter Soldier =
	\| Guardians of the Galaxy =		\| Guardians of the Galaxy =
	\| Age of Ultron = t		\| Age of Ultron =
	\| Ant-Man =		\| Ant-Man =
	<!-- Phase Three Movies -->		<!-- Phase Three Movies -->
Line 293:		Line 293:
	\| The Avengers =		\| The Avengers =
	<!-- Phase Two Movies -->		<!-- Phase Two Movies -->
	\| Phase Two = <!-- Anything to activate it -->		\| Phase Two = t<!-- Anything to activate it -->
	\| Phase Two visible = <!-- Anything to see all the films -->		\| Phase Two visible = <!-- Anything to see all the films -->
	\| Iron Man 3 =		\| Iron Man 3 =
Line 299:		Line 299:
	\| Winter Soldier =		\| Winter Soldier =
	\| Guardians of the Galaxy =		\| Guardians of the Galaxy =
	\| Age of Ultron =		\| Age of Ultron = t
	\| Ant-Man =		\| Ant-Man =
	<!-- Phase Three Movies -->		<!-- Phase Three Movies -->

LIMAFOX76 at 10:59, 3 April 2018

2018-04-03T10:59:15Z

← Older revision		Revision as of 10:59, 3 April 2018
Line 35:		Line 35:
	\| series = {{related series group\|aos}}<!-- each series must be separated by a <br/> -->		\| series = {{related series group\|aos}}<!-- each series must be separated by a <br/> -->
	\| short = <!-- each short must be separated by a <br/> -->		\| short = <!-- each short must be separated by a <br/> -->
	\| mcu occupation = {{Function\|function=writer\|series=aos\|text=Creator\|show=t}}<br/>{{Functions\|function=writer\|series1=~~aos~~\|\|~~series2~~=Avengers\|~~series3~~=Ultron\|text=Writer}}<br/>{{Functions\|function=Director\|series1=aos\|\|series2=Avengers\|series3=Ultron\|text=Director}}<br/>{{Functions\|function=Producer\|series1=aos\|\|series2=Slingshot\|text=Executive producer}}		\| mcu occupation = {{Function\|function=writer\|series=aos\|text=Creator\|show=t}}<br/>{{Functions\|function=writer\|series1=Avengers\|text=Screenplay}}<br/>{{Functions\|function=writer\|series1=Avengers\|text=Story}}<br/>{{Functions\|function=writer\|series1=aos\|series2=Ultron\|text=Writer}}<br/>{{Functions\|function=Director\|series1=aos\|series2=Avengers\|series3=Ultron\|text=Director}}<br/>{{Functions\|function=Producer\|series1=aos\|series2=Slingshot\|text=Executive producer}}
	\| character = <!-- only put the most importants; each character must be separated by a <br/> -->		\| character = <!-- only put the most importants; each character must be separated by a <br/> -->
	}}		}}
Line 185:		Line 185:
	\| The Avengers =		\| The Avengers =
	<!-- Phase Two Movies -->		<!-- Phase Two Movies -->
	\| Phase Two = <!-- Anything to activate it -->		\| Phase Two = t<!-- Anything to activate it -->
	\| Phase Two visible = <!-- Anything to see all the films -->		\| Phase Two visible = <!-- Anything to see all the films -->
	\| Iron Man 3 =		\| Iron Man 3 =
Line 191:		Line 191:
	\| Winter Soldier =		\| Winter Soldier =
	\| Guardians of the Galaxy =		\| Guardians of the Galaxy =
	\| Age of Ultron =		\| Age of Ultron = t
	\| Ant-Man =		\| Ant-Man =
	<!-- Phase Three Movies -->		<!-- Phase Three Movies -->

← Older revision		Revision as of 11:01, 3 April 2018
Line 45:		Line 45:

	* '''Creator''' ({{series\|aos}}, with [[Jed Whedon]] and [[Maurissa Tancharoen]])		* '''Creator''' ({{series\|aos}}, with [[Jed Whedon]] and [[Maurissa Tancharoen]])
	* '''~~Writer~~''' (~~[[AOS]]:~~ {{ep\|~~Pilot~~}})		* '''Screenplay/Story''' ({{ep\|Avengers}})
			* '''Writer''' ([[AOS]]: {{ep\|Pilot}}; {{ep\|Ultron}})
	* '''Director''' ({{ep\|Avengers}}; [[AOS]]: {{ep\|Pilot}}; {{ep\|Ultron}})		* '''Director''' ({{ep\|Avengers}}; [[AOS]]: {{ep\|Pilot}}; {{ep\|Ultron}})
	* '''Executive producer''' ({{series\|aos}})		* '''Executive producer''' ({{series\|aos}})