Commits · 47b4f2c45a738b93ce2ad1527f50f34cd160a5c2 · edx / edx-platform · GitLab

21 Aug, 2012 40 commits
- Merge branch 'master' of github.com:MITx/mitx · 47b4f2c4
  Rocky Duan committed Aug 21, 2012
  
  47b4f2c4 Browse Files
- Merge pull request #489 from MITx/feature/bridger/disable_wiki_attachments · f9d27fd7
```
Disabled wiki attachments.
```
  David Ormsbee committed Aug 21, 2012
  f9d27fd7 Browse Files
- Disabled wiki attachments. · 1e068b6a
  Bridger Maxwell committed Aug 21, 2012
  
  1e068b6a Browse Files
- Merge pull request #479 from MITx/feature/arjun/syllabus · 2c19d014
```
Adding a syllabus page (accessible via course navigation)
```
  Victor Shnayder committed Aug 21, 2012
  2c19d014 Browse Files
- Merge pull request #485 from MITx/feature/kfiedler/courseware-style · cfa2ba95
```
Fix for CSM Sass and fix headers in tutorials 
```
  kimth committed Aug 21, 2012
  cfa2ba95 Browse Files
- Address comments on #484. · 8be7d90c
  Victor Shnayder committed Aug 21, 2012
  
  8be7d90c Browse Files
- Add pytz to requirements · be94e176
  Calen Pennington committed Aug 21, 2012
  
  be94e176 Browse Files
- Adding comments about removing the syllabus tab ASAP. · 02ecfb47
  Arjun Singh committed Aug 21, 2012
  
  02ecfb47 Browse Files
- Adding comments about removing the syllabus tab ASAP. · b86fbdbd
  Arjun Singh committed Aug 21, 2012
  
  b86fbdbd Browse Files
- added shared key authentication · 22657130
  Rocky Duan committed Aug 21, 2012
  
  22657130 Browse Files
- Merge pull request #487 from MITx/feature/cale/sjsu-subdomain · 38d713cb
```
Allow puppet to set COURSE_LISTINGS
```
  David Ormsbee committed Aug 21, 2012
  38d713cb Browse Files
- Allow puppet to set COURSE_LISTINGS · 188584c7
  Calen Pennington committed Aug 21, 2012
  
  188584c7 Browse Files
- Merge pull request #486 from MITx/feature/victor/create-test-courses · 2a8f5a47
```
Feature/victor/create test courses
```
  Calen Pennington committed Aug 21, 2012
  2a8f5a47 Browse Files
- add a course to test start dates · a7a9abab
  Victor Shnayder committed Aug 21, 2012
  
  a7a9abab Browse Files
- comment out debug messages · d3f1f0f8
  Victor Shnayder committed Aug 21, 2012
  
  d3f1f0f8 Browse Files
- fix toylab html · 1dc31ceb
  Victor Shnayder committed Aug 21, 2012
  
  1dc31ceb Browse Files
- make tutorial headers normal size · 3273de93
  Kyle Fiedler committed Aug 21, 2012
  
  3273de93 Browse Files
- Added fix for cms sass · 8a112b0c
  Kyle Fiedler committed Aug 21, 2012
  
  8a112b0c Browse Files
- Merge branch 'feature/bk_forum_int' · cf28dbea
  Rocky Duan committed Aug 21, 2012
  
  cf28dbea Browse Files
- Merge pull request #448 from MITx/feature/ichuang/add-gitreload-to-migrate · dca434ad
```
add gitreload to lms-migration code
```
  Calen Pennington committed Aug 21, 2012
  dca434ad Browse Files
- Merge pull request #484 from MITx/feature/victor/links-to-test-dirs · 61192e52
```
Initial pass at script to create links to test dirs.
```
  Calen Pennington committed Aug 21, 2012
  61192e52 Browse Files
- Initial pass at script to create links to test dirs. · 2aa154c9
  Victor Shnayder committed Aug 21, 2012
  
  2aa154c9 Browse Files
- Merge pull request #472 from MITx/feature/victor/per-course-progress · 99f94b0a
```
Feature/victor/per course progress
```
  Calen Pennington committed Aug 21, 2012
  99f94b0a Browse Files
- Merge pull request #476 from MITx/arjun/fix_choiceresponse · 2106d621
```
Minor change in extract_choices in choicegroup to allow for html in choice text
```
  Calen Pennington committed Aug 21, 2012
  2106d621 Browse Files
- Merge pull request #480 from MITx/feature/victor/policy-dirs · 1a8a3e7a
```
Feature/victor/policy dirs
```
  Calen Pennington committed Aug 21, 2012
  1a8a3e7a Browse Files
- Victor's fixes only apply to sqlite. Added a conditional and now they run on mysql. · 9cc72c49
  Bridger Maxwell committed Aug 21, 2012
  
  9cc72c49 Browse Files
- add docstring comment · d13998a1
  Victor Shnayder committed Aug 21, 2012
  
  d13998a1 Browse Files
- fix migration to remove out of date index · ec90200b
```
* reorder index fields
```
  Victor Shnayder committed Aug 21, 2012
  ec90200b Browse Files
- add test output files to gitignore · d9c753e7
  Victor Shnayder committed Aug 21, 2012
  
  d9c753e7 Browse Files
- Add course_id to StudentModule · f44d794e
```
* Update all uses.
```
  Victor Shnayder committed Aug 21, 2012
  f44d794e Browse Files
- s/[]/{}/ · 2f9b2f19
  Victor Shnayder committed Aug 21, 2012
  
  2f9b2f19 Browse Files
- Merge master · 99703761
  Arjun Singh committed Aug 21, 2012
  
  99703761 Browse Files
- bugfix: set errored_courses in default case · ccf2cff2
  Victor Shnayder committed Aug 21, 2012
  
  ccf2cff2 Browse Files
- Show policy, grading policy, and top-level errors · b97a2af2
```
* Save errors for courses that failed to load in modulestore
* global staff can see course errors on their dashboard
* put policy loading errors into the error trackers
* add has_access(user, 'global', 'staff'), which is equiv to user.is_staff for now
```
  Victor Shnayder committed Aug 21, 2012
  b97a2af2 Browse Files
- Load grading policy from policy/{url_name}/grading_policy.json · f8668544
```
* with backcompat location /grading_policy.json
```
  Victor Shnayder committed Aug 21, 2012
  f8668544 Browse Files
- Let policies be stored in policies/{url_name}/policy.json · eeadf0ba
```
* still backcompat with old mode
```
  Victor Shnayder committed Aug 21, 2012
  eeadf0ba Browse Files
- Merge remote-tracking branch 'origin/hotfix/1.0.4' · 9f23e437
  Calen Pennington committed Aug 21, 2012
  
  9f23e437 Browse Files
- Merge pull request #482 from MITx/feature/dave/nav_fixes · adf2d44d
```
Remove non-functioning News tab. Enable Instructor tab from Discussion page
```
  Calen Pennington committed Aug 21, 2012
  adf2d44d Browse Files
- Merge pull request #478 from MITx/kimth/fix-sequence-modx · 86f20cc1
```
Sequential modx/goto_position hits correct multicourse URL
```
  Calen Pennington committed Aug 21, 2012
  86f20cc1 Browse Files
- Remove non-functioning News tab. Enable Instructor tab from Discussion page · 3f0fba71
  David Ormsbee committed Aug 21, 2012
  
  3f0fba71 Browse Files