Code

Joinus jinpa#1934

Code

Closed

jinpa wants to merge 20 commits intoopenedx:masteropenedx/edx-platform:masterfrom flowerhack:joinus-jinpaflowerhack/edx-platform:joinus-jinpaCopy head branch name to clipboard

+162-1

Commits

Commits on Dec 11, 2013

• join us

  

  Julia Hansbrough

  committed
  9751c9e

  Copy full SHA for 9751c9e

• Empty view and model files for app

  

  Julia Hansbrough

  committed
  69bb175

  Copy full SHA for 69bb175

• Template outline

  

  Julia Hansbrough

  committed
  9f289fc

  Copy full SHA for 9f289fc

• Basic view logic

  

  Julia Hansbrough

  committed
  2f06ef5

  Copy full SHA for 2f06ef5

• Hello world

  

  Julia Hansbrough

  committed
  8ed027d

  Copy full SHA for 8ed027d

• urls

  

  Julia Hansbrough

  committed
  7f8d28a

  Copy full SHA for 7f8d28a

• Unbreak urls

  

  Julia Hansbrough

  committed
  afe7642

  Copy full SHA for afe7642

Commits on Dec 12, 2013

• Hello world works

  

  Julia Hansbrough

  committed
  b163550

  Copy full SHA for b163550

• add groups tab

  rpongsaj

  committed
  50b9c7a

  Copy full SHA for 50b9c7a

• Tabs work

  

  Julia Hansbrough

  committed
  1474ea7

  Copy full SHA for 1474ea7

• init

  

  Julia Hansbrough

  committed
  847c894

  Copy full SHA for 847c894

• add form and basic styling

  rpongsaj

  committed
  45ebad9

  Copy full SHA for 45ebad9

• Model outline

  

  Julia Hansbrough

  committed
  27903df

  Copy full SHA for 27903df

• Rename joinus app

  cpennington

  committed
  063581a

  Copy full SHA for 063581a

• start simple form

  rpongsaj

  committed
  79ebb4d

  Copy full SHA for 79ebb4d

• set up view for joining a group

  rpongsaj

  committed
  20c4b5e

  Copy full SHA for 20c4b5e

• correct path to joinus template

  rpongsaj

  committed
  d41faf0

  Copy full SHA for d41faf0

• condense joinus views

  rpongsaj

  committed
  31704f4

  Copy full SHA for 31704f4

• Added Groups to JoinUs model

  

  Julia Hansbrough

  committed
  e3297fb

  Copy full SHA for e3297fb

• hardwire some groups, and print them in the groups-tab

  jinpa

  committed
  4c6eebd

  Copy full SHA for 4c6eebd