Commits · 72e6588be44e9fe5eab76e3df6ea144df0e9740b · edx / edx-platform · GitLab

21 Aug, 2012 11 commits
- Merge branch 'master' into refactor · 72e6588b
  Rocky Duan committed Aug 21, 2012
  
  72e6588b 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
- got reply working under backbone framework · 07f818da
  Rocky Duan committed Aug 21, 2012
  
  07f818da Browse Files
- some progress · 9dedd532
  Rocky Duan committed Aug 20, 2012
  
  9dedd532 Browse Files
- Merge branch 'feature/bk_forum_int' into refactor · 9ac26715
```
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	lms/templates/discussion/index.html
	requirements.txt
```
  Rocky Duan committed Aug 20, 2012
  9ac26715 Browse Files
- updated seed_permissions_and_roles to accept course_id as a parameter · bca6699b
  Rocky Duan committed Aug 20, 2012
  
  bca6699b Browse Files
- attempt to migrate more code · 17683c43
  Rocky Duan committed Aug 20, 2012
  
  17683c43 Browse Files
- updated backbone & single thread retrieval now working · a905ac9e
  Rocky Duan committed Aug 20, 2012
  
  a905ac9e Browse Files
- continue working on backbone & got vote migrated and working · d189a49e
  Rocky Duan committed Aug 20, 2012
  
  d189a49e Browse Files
- Meaningless commit to force build · c3718e49
  David Ormsbee committed Aug 20, 2012
  
  c3718e49 Browse Files
20 Aug, 2012 29 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' 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
- Merge branch 'master' into refactor · 0b3e9909
```
Conflicts:
	lms/djangoapps/django_comment_client/tests.py
	lms/static/coffee/src/discussion/content.coffee
	requirements.txt
```
  Rocky Duan committed Aug 20, 2012
  0b3e9909 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into refactor · 8684ae29
```
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
```
  Rocky Duan committed Aug 20, 2012
  8684ae29 Browse Files
- fixed test · dc599c46
  Rocky Duan committed Aug 20, 2012
  
  dc599c46 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
- Adjust settings so we can change the comments service URL from Django config · b6dfa50a
  David Ormsbee committed Aug 20, 2012
  
  b6dfa50a 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
- Merge branch 'master' of github.com:MITx/mitx · cc1dd65e
  Victor Shnayder committed Aug 20, 2012
  
  cc1dd65e Browse Files
- Oops. Make modx_dispatch and xqueue callback work again. · 5f612c78
```
- use get_instance, not get_item
- finish the id->location rename for modx_dispatch arg
```
  Victor Shnayder committed Aug 20, 2012
  5f612c78 Browse Files
- removed dependency on datehelper · af17ba7a
  Rocky Duan committed Aug 20, 2012
  
  af17ba7a Browse Files
- Merge pull request #468 from MITx/feature/kfiedler/courseware-style · 2f2a4cc6
```
Made save buttons blue, finished remaining askbot bugs, and removed all instances of $mit-red
```
  thomasxiii committed Aug 20, 2012
  2f2a4cc6 Browse Files
- Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red · 20d9e6e8
  Kyle Fiedler committed Aug 20, 2012
  
  20d9e6e8 Browse Files
- Added styles for save button · 7c824f77
  Kyle Fiedler committed Aug 20, 2012
  
  7c824f77 Browse Files
- Merge pull request #464 from MITx/kimth/textbook · de4abe30
```
Kimth/textbook
```
  Calen Pennington committed Aug 20, 2012
  de4abe30 Browse Files
- Merge pull request #461 from MITx/feature/victor/multi-run-policy · 259e2136
```
Keep each course's descriptors separate
```
  Calen Pennington committed Aug 20, 2012
  259e2136 Browse Files
- Merge pull request #467 from MITx/bridger/feature/clean_up · 9bde5e7a
```
Bridger/feature/clean up
```
  David Ormsbee committed Aug 20, 2012
  9bde5e7a Browse Files
- python code for time_ago_in_words is unnecessary now · 7b5e66b6
  Rocky Duan committed Aug 20, 2012
  
  7b5e66b6 Browse Files
- render time ago in front end · 348a7b6e
  Rocky Duan committed Aug 20, 2012
  
  348a7b6e Browse Files