Commits · 339949f934da5b7079730717e09a5faff98a4771 · edx / edx-platform · GitLab

20 Nov, 2012 1 commit
- Another checkpoint before pull/merge · 339949f9
  Don Mitchell committed Nov 20, 2012
  
  339949f9 Browse Files
19 Nov, 2012 22 commits
- Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into · 7fecf1f2
```
feature/dhm/cms-settings

Conflicts:
	cms/static/sass/_settings.scss
	cms/templates/settings.html
```
  Don Mitchell committed Nov 19, 2012
  7fecf1f2 Browse Files
- Checkpoint to rebase · 241c9bb1
  Don Mitchell committed Nov 19, 2012
  
  241c9bb1 Browse Files
- Merge branch 'course-info' into feature/dhm/cms-settings · a9233dfd
```
Conflicts:
	cms/djangoapps/contentstore/views.py
```
  Don Mitchell committed Nov 19, 2012
  a9233dfd Browse Files
- settings - simplified course details fields per Mark's feedback and radio/checkbox UI · d3703079
  Brian Talbot committed Nov 19, 2012
  
  d3703079 Browse Files
- settings - radio/checkbox UI - wip · c7784e30
  Brian Talbot committed Nov 19, 2012
  
  c7784e30 Browse Files
- settings - field alignment, radio/checkbox formatting · ab87ff6b
  Brian Talbot committed Nov 19, 2012
  
  ab87ff6b Browse Files
- Cleaned up imports · 8c8be3e8
  Don Mitchell committed Nov 19, 2012
  
  8c8be3e8 Browse Files
- Everything tested and ready for Tom to fix · 88cc5a08
  Don Mitchell committed Nov 19, 2012
  
  88cc5a08 Browse Files
- Hopefully the course-info changes I had made w/o link destruction · 91a91f4d
  Don Mitchell committed Nov 19, 2012
  
  91a91f4d Browse Files
- Batch together alter statements to minimize how long we lock the auth_users table · 336caa0f
  David Ormsbee committed Nov 19, 2012
  
  336caa0f Browse Files
- add press mentions for October, update missing logos, and add sorting. · cb36d675
  Brian Wilson committed Nov 19, 2012
  
  cb36d675 Browse Files
- update press page mentions through September, and home page pointers for early November. · e56030ef
  Brian Wilson committed Nov 19, 2012
  
  e56030ef Browse Files
- Revert overly aggressive killing. · 60368ec3
```
(don't worry--askbot is still dead)
```
  Victor Shnayder committed Nov 19, 2012
  60368ec3 Browse Files
- add migration to remove askbot columns · 956b7047
  Victor Shnayder committed Nov 19, 2012
  
  956b7047 Browse Files
- remove (almost) all references to askbot. · b18136d0
  Victor Shnayder committed Nov 19, 2012
  
  b18136d0 Browse Files
- settings - various style/alignment tweaks to inline/existinf fields · bc4d5f41
  Brian Talbot committed Nov 19, 2012
  
  bc4d5f41 Browse Files
- Add migration to make columns added by askbot nullable, in preparation for eventually deleting them · 8525b898
  Calen Pennington committed Nov 19, 2012
  
  8525b898 Browse Files
- settings - revised assignment grace period text · 14f668a4
  Brian Talbot committed Nov 19, 2012
  
  14f668a4 Browse Files
- settings - revised assignment due time field and provided UTC context/help · cff581d5
  Brian Talbot committed Nov 19, 2012
  
  cff581d5 Browse Files
- settings - revised discussion settings UI to include standard discussion… · 0114366c
```
settings - revised discussion settings UI to include standard discussion categories and adding new ones
```
  Brian Talbot committed Nov 19, 2012
  0114366c Browse Files
- settings - revised faculty photo and syllabus states to either has or does not have · bf4f678b
  Brian Talbot committed Nov 19, 2012
  
  bf4f678b Browse Files
- settings - added disabled states for course name/org/number · 731ea226
  Brian Talbot committed Nov 19, 2012
  
  731ea226 Browse Files
16 Nov, 2012 8 commits
- Everything tested and ready for Tom to fix · 842bbe92
  Don Mitchell committed Nov 16, 2012
  
  842bbe92 Browse Files
- Hopefully the course-info changes I had made w/o link destruction · fbc48026
  Don Mitchell committed Nov 16, 2012
  
  fbc48026 Browse Files
- adding in datepicker functionality - wip · 968b604b
  Brian Talbot committed Nov 16, 2012
  
  968b604b Browse Files
- roughed in all form fields - wip · 89187624
  Brian Talbot committed Nov 16, 2012
  
  89187624 Browse Files
- added and wired in SymbolSet font icon library assets · 5b44a330
  Brian Talbot committed Nov 16, 2012
  
  5b44a330 Browse Files
- added and wired in SymbolSet font icon library assets · 6f52fea0
  Brian Talbot committed Nov 16, 2012
  
  6f52fea0 Browse Files
- settings - wip · 74dec7f1
  Brian Talbot committed Nov 16, 2012
  
  74dec7f1 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/cale/cms-master · 0fff578e
```
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
```
  Calen Pennington committed Nov 16, 2012
  0fff578e Browse Files
15 Nov, 2012 8 commits
- Merge pull request #1052 from MITx/feature/victor/actual-askbot-removal · 7c7ca3ff
```
Removing Askbot
```
  David Ormsbee committed Nov 15, 2012
  7c7ca3ff Browse Files
- Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/btalbot/cms-settings · 6014a7a2
```
Conflicts:
	cms/djangoapps/contentstore/views.py
```
  Brian Talbot committed Nov 15, 2012
  6014a7a2 Browse Files
- in progress discussion work · 4c220ea4
  Brian Talbot committed Nov 15, 2012
  
  4c220ea4 Browse Files
- Batch together alter statements to minimize how long we lock the auth_users table · eff3a7c3
  David Ormsbee committed Nov 15, 2012
  
  eff3a7c3 Browse Files
- added in fields for problems and discussions portions of CMS settings · 1a297674
  Brian Talbot committed Nov 15, 2012
  
  1a297674 Browse Files
- Merge branch 'master' into feature/victor/actual-askbot-removal · 156dc1fb
```
Conflicts:
	lms/envs/aws.py
```
  David Ormsbee committed Nov 15, 2012
  156dc1fb Browse Files
- Merge pull request #1050 from MITx/bridger/feature/progress_percent_fix · dbe7346a
```
Fixed redunant rounding of final grade percent, which was causing floating point weirdness.
```
  David Ormsbee committed Nov 15, 2012
  dbe7346a Browse Files
- Fixed redunant rounding of final grade percent, which was causing floating point weirdness. · ba57e8a7
  Bridger Maxwell committed Nov 15, 2012
  
  ba57e8a7 Browse Files
14 Nov, 2012 1 commit
- finalized layout and styling for course details and faculty settings · 65869461
  Brian Talbot committed Nov 14, 2012
  
  65869461 Browse Files