Commits · d13998a13530622090634116a672a76c815c6c9d · edx / edx-platform · GitLab

21 Aug, 2012 29 commits
- 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
- 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
- re-add pystache_custom requirement · 8b01334a
  David Ormsbee committed Aug 21, 2012
  
  8b01334a Browse Files
- Use data(...) rather than hidden span · 7d1fd538
  kimth committed Aug 21, 2012
  
  7d1fd538 Browse Files
- Fix MathJax in sequentials · 9b3f560c
  kimth committed Aug 21, 2012
  
  9b3f560c Browse Files
- Merge pull request #458 from MITx/feature/bk_forum_int · 32723cab
```
Berkeley Forum Merge
```
  David Ormsbee committed Aug 21, 2012
  32723cab Browse Files
- remove no-longer-need < escape. Re #466 · f1d670f9
  Victor Shnayder committed Aug 21, 2012
  
  f1d670f9 Browse Files
- Add command to seed forum permissions to existing users · 08e892ce
  David Ormsbee committed Aug 21, 2012
  
  08e892ce Browse Files
- Remove student removal (we shouldn't ever delete users) · 1c84f8e2
  David Ormsbee committed Aug 21, 2012
  
  1c84f8e2 Browse Files
- Fix tests for other courses - create default discussion roles on demand if they don't exist · b0894c39
  David Ormsbee committed Aug 21, 2012
  
  b0894c39 Browse Files
- Merge pull request #477 from MITx/feature/arjun/check_filesubmission_names · 1666858c
```
Allowing filesubmissions to specify which files are allowed and require that certain files are present.
```
  Calen Pennington committed Aug 21, 2012
  1666858c Browse Files
- Merge branch 'master' into feature/bk_forum_int · b31722bc
  David Ormsbee committed Aug 21, 2012
  
  b31722bc Browse Files
- Removed signal removal in django_comment_client test (we're no longer doing user replication) · 6d371640
  David Ormsbee committed Aug 21, 2012
  
  6d371640 Browse Files
- Merge pull request #471 from MITx/feature/bridger/new_wiki · e0173d71
```
New wiki update
```
  Calen Pennington committed Aug 21, 2012
  e0173d71 Browse Files
- Added new wiki 404 page · 63900ef4
  Kyle Fiedler committed Aug 21, 2012
  
  63900ef4 Browse Files
- disable user replication and associated tests · 783a3905
  David Ormsbee committed Aug 21, 2012
  
  783a3905 Browse Files
- Sequential modx/goto_position hits correct multicourse URL · 231aa467
  kimth committed Aug 21, 2012
  
  231aa467 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki · fa3734b6
```
Conflicts:
	repo-requirements.txt
```
  Bridger Maxwell committed Aug 21, 2012
  fa3734b6 Browse Files
- Allowing filesubmissions to specify which files are allowed and require that… · 11ffc6bb
```
Allowing filesubmissions to specify which files are allowed and require that certain files are present.
```
  Arjun Singh committed Aug 21, 2012
  11ffc6bb Browse Files
- updated seed_permissions_and_roles to accept course_id as a parameter · bca6699b
  Rocky Duan committed Aug 20, 2012
  
  bca6699b Browse Files
- Merge pull request #474 from MITx/kimth/progress-hide · b29e547d
```
Kimth/progress hide
```
  Calen Pennington committed Aug 20, 2012
  b29e547d Browse Files
- Merge pull request #466 from MITx/feature/victor/html-escape-errors · 27c0104b
```
html escape errors
```
  Calen Pennington committed Aug 20, 2012
  27c0104b Browse Files
- Meaningless commit to force build · c3718e49
  David Ormsbee committed Aug 20, 2012
  
  c3718e49 Browse Files
20 Aug, 2012 11 commits
- disable askbot and enable berkeley forum in AWS config · 66a9512e
  David Ormsbee committed Aug 20, 2012
  
  66a9512e Browse Files
- Fix some links taht were still pointing to the old courseware course_navigation pages. · 1ebc810a
  David Ormsbee committed Aug 20, 2012
  
  1ebc810a Browse Files
- Merge branch 'master' of github.com:MITx/mitx · ef2bfac3
  Victor Shnayder committed Aug 20, 2012
  
  ef2bfac3 Browse Files
- add test database for new toy course. Trying to fix build · c5aef507
  Victor Shnayder committed Aug 20, 2012
  
  c5aef507 Browse Files
- Merge branch 'master' into feature/bk_forum_int · eb96497c
```
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
```
  David Ormsbee committed Aug 20, 2012
  eb96497c Browse Files
- Lowercase · eaef8c70
  kimth committed Aug 20, 2012
  
  eaef8c70 Browse Files
- Don't tabulate hidden chapters and sections in the Progress view · 7e7247d8
  kimth committed Aug 20, 2012
  
  7e7247d8 Browse Files
- Merge pull request #473 from MITx/feature/pystache_custom · 46c3e8a2
```
Remove pystache in favor of our custom version
```
  jarv committed Aug 20, 2012
  46c3e8a2 Browse Files
- Remove pystache in favor of our custom version · 356fac14
  David Ormsbee committed Aug 20, 2012
  
  356fac14 Browse Files
- remove pystache dependency · 8ab98d33
  David Ormsbee committed Aug 20, 2012
  
  8ab98d33 Browse Files
- html escape errors · 868b076e
  Victor Shnayder committed Aug 20, 2012
  
  868b076e Browse Files