Commits · 2eabe867b98a5e6008eee3f3969a643cd7f05f3f · edx / edx-platform · GitLab

21 Aug, 2012 16 commits
- Merge branch 'feature/bk_forum_int' of github.com:MITx/mitx into feature/bk_forum_int · 2eabe867
  Rocky Duan committed Aug 21, 2012
  
  2eabe867 Browse Files
- added shared key authentication · 22657130
  Rocky Duan committed Aug 21, 2012
  
  22657130 Browse Files
- Merge branch 'feature/bk_forum_int' · cf28dbea
  Rocky Duan committed Aug 21, 2012
  
  cf28dbea 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 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
- 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
- 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 24 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
- simplified mustache helper loading · f82c2e00
  Rocky Duan committed Aug 20, 2012
  
  f82c2e00 Browse Files
- removed unnecessary dependency · 1c161a76
  Rocky Duan committed Aug 20, 2012
  
  1c161a76 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
- Adjust settings so we can change the comments service URL from Django config · b6dfa50a
  David Ormsbee committed Aug 20, 2012
  
  b6dfa50a Browse Files
- Removed inactive 'view this revision' button from history page. · c0c23baa
  Bridger Maxwell committed Aug 20, 2012
  
  c0c23baa Browse Files
- Updated django-wiki version. · 8543f253
  Bridger Maxwell committed Aug 20, 2012
  
  8543f253 Browse Files
- Remove unnecessary import that was failing a test · 47bf5160
  David Ormsbee committed Aug 20, 2012
  
  47bf5160 Browse Files
- Merge pull request #470 from MITx/jarv/dependency-update · e89a7b67
```
ensuring pystache>=0.5.2
```
  jarv committed Aug 20, 2012
  e89a7b67 Browse Files
- ensuring pystache>=0.5.2 · bb80c66e
  John Jarvis committed Aug 20, 2012
  
  bb80c66e Browse Files
- Merge pull request #469 from MITx/jarv/dependency-update · d7327651
```
updating dependencies for pystache, networkx, graphviz and removing redu...
```
  David Ormsbee committed Aug 20, 2012
  d7327651 Browse Files
- updating dependencies for pystache, networkx, graphviz and removing redundant… · 55251039
```
updating dependencies for pystache, networkx, graphviz and removing redundant dependency for django-staticfiles
```
  John Jarvis committed Aug 20, 2012
  55251039 Browse Files
- added pystache dependency · 3762efd2
  David Ormsbee committed Aug 20, 2012
  
  3762efd2 Browse Files
- Fixed bug in breadcrumbs. · 46d2e71a
  Bridger Maxwell committed Aug 20, 2012
  
  46d2e71a Browse Files
- Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki · d31f0c9f
```
Conflicts:
	requirements.txt
```
  Bridger Maxwell committed Aug 20, 2012
  d31f0c9f Browse Files