Commits · 05d28200ef03646811486ca3c83fc23b1b59143c · edx / edx-platform · GitLab

22 Aug, 2012 40 commits
- Merge branch 'master' of github.com:MITx/mitx into merge · 05d28200
  Rocky Duan committed Aug 22, 2012
  
  05d28200 Browse Files
- Merge pull request #507 from MITx/kimth/fix_syllabus · 3913427c
```
Quick workaround on syllabus_present that broke staging
```
  David Ormsbee committed Aug 22, 2012
  3913427c Browse Files
- Quick workaround on syllabus_present that broke staging · 0d689b31
  kimth committed Aug 22, 2012
  
  0d689b31 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into merge · 908a5c5d
  Rocky Duan committed Aug 22, 2012
  
  908a5c5d Browse Files
- Merge pull request #506 from MITx/feature/tomg/fall-design · ca36fb67
```
additional firefox bug
```
  David Ormsbee committed Aug 22, 2012
  ca36fb67 Browse Files
- fixed autosubscribe · 3cbaba19
  Rocky Duan committed Aug 22, 2012
  
  3cbaba19 Browse Files
- Merge branch 'master' into feature/tomg/fall-design · c1befd5f
  Tom Giannattasio committed Aug 22, 2012
  
  c1befd5f Browse Files
- fixed tutorial sequence nav bug · 1a7b5b85
  Tom Giannattasio committed Aug 22, 2012
  
  1a7b5b85 Browse Files
- make inline page working · 3b76fe16
  Rocky Duan committed Aug 22, 2012
  
  3b76fe16 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into merge · 951fb063
```
Conflicts:
	lms/envs/dev.py
```
  Rocky Duan committed Aug 22, 2012
  951fb063 Browse Files
- Merge pull request #502 from MITx/pmitros/berkeley_enrollment_hack · fafbe416
```
Enrollment hack for allowing Berkeley to add their students.
```
  David Ormsbee committed Aug 22, 2012
  fafbe416 Browse Files
- Merge pull request #505 from MITx/feature/tomg/fall-design · e206bf2f
```
Feature/tomg/fall design
```
  Calen Pennington committed Aug 22, 2012
  e206bf2f Browse Files
- Fixed minor issues (removed two unnecessary lines) · 69a3ea63
  Piotr Mitros committed Aug 22, 2012
  
  69a3ea63 Browse Files
- Merge pull request #501 from MITx/kimth/autodisable-syllabus · 3b24ae10
```
Dynamically disable syllabus per-course
```
  David Ormsbee committed Aug 22, 2012
  3b24ae10 Browse Files
- Added missing file · 3777cd2f
  Piotr Mitros committed Aug 22, 2012
  
  3777cd2f Browse Files
- Merge pull request #504 from MITx/feature/bridger/new_wiki · c86ee73b
```
Feature/bridger/new wiki
```
  David Ormsbee committed Aug 22, 2012
  c86ee73b Browse Files
- Merge branch 'master' into feature/tomg/fall-design · a05cf054
  Tom Giannattasio committed Aug 22, 2012
  
  a05cf054 Browse Files
- fixed firefox outline bugs · 2c827c46
  Tom Giannattasio committed Aug 22, 2012
  
  2c827c46 Browse Files
- Merge pull request #503 from MITx/feature/ichuang/fix-staff-debug · e093a365
```
staff debug view currently presents an empty window - this fixes
```
  Calen Pennington committed Aug 22, 2012
  e093a365 Browse Files
- We use django-wiki's built-in wikilinks markdown extension. They were clashing. · a694d103
  Bridger Maxwell committed Aug 22, 2012
  
  a694d103 Browse Files
- fix staff debug view, and also add new source_link · 7c242939
  ike committed Aug 22, 2012
  
  7c242939 Browse Files
- Enrollment hack for allowing Berkeley to add their students. · a301abd5
  Piotr Mitros committed Aug 22, 2012
  
  a301abd5 Browse Files
- Delete page · cca5fe2f
  Kyle Fiedler committed Aug 22, 2012
  
  cca5fe2f Browse Files
- Added delete page and padding and hid th on overflow · f4f8b7bf
  Kyle Fiedler committed Aug 22, 2012
  
  f4f8b7bf Browse Files
- Merge master · f4660771
  kimth committed Aug 22, 2012
  
  f4660771 Browse Files
- Remove ENABLE_SYLLABUS flag from envs/common · 64788a73
  kimth committed Aug 22, 2012
  
  64788a73 Browse Files
- Add more excludes to rakefile · 5b7ae1a9
  Calen Pennington committed Aug 22, 2012
  
  5b7ae1a9 Browse Files
- Dynamically disable syllabus per-course · 960cf579
  kimth committed Aug 22, 2012
  
  960cf579 Browse Files
- added fix for error styles and swapped some the button order · 74643321
  Kyle Fiedler committed Aug 22, 2012
  
  74643321 Browse Files
- fixed search highlighting · 9b26a209
  Rocky Duan committed Aug 22, 2012
  
  9b26a209 Browse Files
- Merge pull request #500 from MITx/feature/cale/university-branding · 8b8ee9f4
```
Feature/cale/university branding
```
  David Ormsbee committed Aug 22, 2012
  8b8ee9f4 Browse Files
- Merge pull request #494 from MITx/feature/arjun/course_specific_css · 2eb0de99
```
Feature/arjun/course specific css
```
  Calen Pennington committed Aug 22, 2012
  2eb0de99 Browse Files
- Merge pull request #499 from MITx/feature/bridger/new_wiki · d7351905
```
Added optional <wiki> tag to course to specify an alternative wiki page.
```
  Calen Pennington committed Aug 22, 2012
  d7351905 Browse Files
- adding more details about the state of course.css_class · 23e3d371
  Arjun Singh committed Aug 22, 2012
  
  23e3d371 Browse Files
- Add HarvardX- and MITx- on-edx-logo.png files · 55984e31
  Calen Pennington committed Aug 22, 2012
  
  55984e31 Browse Files
- Use the university profile page for courses and index if we are in a branded… · 5ca636e6
```
Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH
```
  Calen Pennington committed Aug 22, 2012
  5ca636e6 Browse Files
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · 1277c5f8
  Kyle Fiedler committed Aug 22, 2012
  
  1277c5f8 Browse Files
- Added styles for the wiki directory · d0c92aa1
  Kyle Fiedler committed Aug 22, 2012
  
  d0c92aa1 Browse Files
- Added optional <wiki> tag to course to specify an alternative wiki page. · 788c74e0
  Bridger Maxwell committed Aug 22, 2012
  
  788c74e0 Browse Files
- Remove special styling for courseware header logo · b841591b
  Calen Pennington committed Aug 22, 2012
  
  b841591b Browse Files