Commits · 54cc876075c5c2a471846c3af20ced6bcdabf60d · edx / edx-platform · GitLab

27 Nov, 2012 9 commits
- Merge branch 'feature/btalbot/cms-settings' of · 54cc8760
```
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	cms/templates/settings.html
	lms/static/sass/bourbon
```
  Don Mitchell committed Nov 27, 2012
  54cc8760 Browse Files
- Got time change hooked up but gained a spurious call to change on date · 5331ae05
```
change.
```
  Don Mitchell committed Nov 27, 2012
  5331ae05 Browse Files
- settings - adjusted markup to leverage Timepicker's datepair functionality for… · 075bc75a
```
settings - adjusted markup to leverage Timepicker's datepair functionality for validating start/end dates
```
  Brian Talbot committed Nov 27, 2012
  075bc75a Browse Files
- Merge branch 'feature/btalbot/cms-settings' of · d165da3f
```
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	cms/templates/settings.html
	lms/static/sass/bourbon
```
  Don Mitchell committed Nov 27, 2012
  d165da3f Browse Files
- Minor cache to pull talbott's changes · 5e2dba6b
  Don Mitchell committed Nov 27, 2012
  
  5e2dba6b Browse Files
- settings - revised date and time picker markup to use already set conventions… · bffd4255
```
settings - revised date and time picker markup to use already set conventions with the .datepair class
```
  Brian Talbot committed Nov 27, 2012
  bffd4255 Browse Files
- Merge branch 'feature/btalbot/cms-settings' of · 8a27e177
```
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	cms/templates/settings.html
	lms/static/sass/bourbon
```
  Don Mitchell committed Nov 27, 2012
  8a27e177 Browse Files
- Details tab works except for file references · 22380195
  Don Mitchell committed Nov 27, 2012
  
  22380195 Browse Files
- settings - added in additional time fields for course dates · c3e11b42
  Brian Talbot committed Nov 27, 2012
  
  c3e11b42 Browse Files
26 Nov, 2012 6 commits
- reset default tab · 153285c3
  Tom Giannattasio committed Nov 26, 2012
  
  153285c3 Browse Files
- reworked slider logic · bb2e78ce
  Tom Giannattasio committed Nov 26, 2012
  
  bb2e78ce Browse Files
- settings - added in example of anon discussions disabled state · be848023
  Brian Talbot committed Nov 26, 2012
  
  be848023 Browse Files
- settings - resolved date and time picker UI bugs · 4027576e
  Brian Talbot committed Nov 26, 2012
  
  4027576e Browse Files
- settings - revised grading slider UI cosmetics · 4097bc10
  Brian Talbot committed Nov 26, 2012
  
  4097bc10 Browse Files
- settings - added in controls for sorting discussion categories · ef95e1d9
  Brian Talbot committed Nov 26, 2012
  
  ef95e1d9 Browse Files
21 Nov, 2012 3 commits
- Merge branch 'feature/btalbot/cms-settings' of · 0ebdbb92
```
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	lms/static/sass/bourbon
```
  Don Mitchell committed Nov 21, 2012
  0ebdbb92 Browse Files
- Beginning test of details tab. · f0c94a2c
  Don Mitchell committed Nov 21, 2012
  
  f0c94a2c Browse Files
- settings - added in drag and drop anchors - wip · baf8b481
  Brian Talbot committed Nov 21, 2012
  
  baf8b481 Browse Files
20 Nov, 2012 6 commits
- Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into · f8ee5c26
```
feature/dhm/cms-settings

Conflicts:
	cms/templates/settings.html
```
  Don Mitchell committed Nov 20, 2012
  f8ee5c26 Browse Files
- Another checkpoint before pull/merge · 339949f9
  Don Mitchell committed Nov 20, 2012
  
  339949f9 Browse Files
- settings - general class/ID naming convention cleaning · 6c3c3776
  Brian Talbot committed Nov 20, 2012
  
  6c3c3776 Browse Files
- settings - discussion UI revision · a69d3cb0
  Brian Talbot committed Nov 20, 2012
  
  a69d3cb0 Browse Files
- settings - made assignment types user-determined fields vs. pre-set types in UI · 278c731a
  Brian Talbot committed Nov 20, 2012
  
  278c731a Browse Files
- settings - refactored radio/checkbox input formatting · f29f605f
  Brian Talbot committed Nov 20, 2012
  
  f29f605f Browse Files
19 Nov, 2012 16 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