Commits · eb47093b1cd633e883732afe584804bc90f1e420 · edx / edx-platform · GitLab

14 Aug, 2012 20 commits
- Merge branch 'master' of github.com:MITx/mitx into merge · eb47093b
```
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
```
  Rocky Duan committed Aug 14, 2012
  eb47093b Browse Files
- disable asc sorting for now · 3c32aff1
  Rocky Duan committed Aug 14, 2012
  
  3c32aff1 Browse Files
- make top sort by last_activity_at for now · 0992be37
  Rocky Duan committed Aug 14, 2012
  
  0992be37 Browse Files
- adjust new post button in forum view · 49e840d6
  Rocky Duan committed Aug 14, 2012
  
  49e840d6 Browse Files
- make delete actually working again · 28f0dd27
  Rocky Duan committed Aug 14, 2012
  
  28f0dd27 Browse Files
- prompt window for deleting · 60b2423c
  Rocky Duan committed Aug 14, 2012
  
  60b2423c Browse Files
- Merge pull request #407 from MITx/kimth/generic-coderesponse · cfe712cb
```
Kimth/generic coderesponse
```
  Calen Pennington committed Aug 14, 2012
  cfe712cb Browse Files
- fixed tag autocomplete · 9d3c9e33
  Rocky Duan committed Aug 13, 2012
  
  9d3c9e33 Browse Files
- fixed updating bug · 1f4d2f3d
  Rocky Duan committed Aug 13, 2012
  
  1f4d2f3d Browse Files
- reply now works again · 38bdcabe
  Rocky Duan committed Aug 13, 2012
  
  38bdcabe Browse Files
- fixed focus bug: mistakenly binded event twice · 19ba5785
  Rocky Duan committed Aug 13, 2012
  
  19ba5785 Browse Files
- make retrieved single thread/comment after update integrated with permissions · 6fa02985
  Rocky Duan committed Aug 13, 2012
  
  6fa02985 Browse Files
- add cancel button for new post · 0fa0f2c8
  Rocky Duan committed Aug 13, 2012
  
  0fa0f2c8 Browse Files
- Front end file size limit matches server-end limit · 895cf2c2
  kimth committed Aug 13, 2012
  
  895cf2c2 Browse Files
- LMS-side MAX_FILESIZE set in settings.py · 1c2d0342
  kimth committed Aug 13, 2012
  
  1c2d0342 Browse Files
- Merge pull request #406 from MITx/feature/ichuang/fix-signup-modal-for-ssl · d0e51a2d
```
when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately ...
```
  Calen Pennington committed Aug 13, 2012
  d0e51a2d Browse Files
- Server-side (LMS) checking of uploaded filesize · 936f2c49
  kimth committed Aug 13, 2012
  
  936f2c49 Browse Files
- Merge pull request #404 from MITx/feature/ichuang/consistent-customresponse · 2504880e
```
fix customresponse be consistent with "no answer entered" behavior
```
  Calen Pennington committed Aug 13, 2012
  2504880e Browse Files
- Polling rerenders problem when individual queued items return · d19244c4
  kimth committed Aug 13, 2012
  
  d19244c4 Browse Files
- File submission frontend checks for filesize · a4e283e9
  kimth committed Aug 13, 2012
  
  a4e283e9 Browse Files
13 Aug, 2012 20 commits
- Frontend polling rate aware of queue length at time of submission · 3db07bca
  kimth committed Aug 13, 2012
  
  3db07bca Browse Files
- hide empty brackets when not filtering through tags · dd4f8963
  Rocky Duan committed Aug 13, 2012
  
  dd4f8963 Browse Files
- make following and recent tags display actual things · 62bc1aae
  Rocky Duan committed Aug 13, 2012
  
  62bc1aae Browse Files
- removed edit button in the bottom bar · 2dde3b00
  Rocky Duan committed Aug 13, 2012
  
  2dde3b00 Browse Files
- update discussion.md · ce9b5b07
  Rocky Duan committed Aug 13, 2012
  
  ce9b5b07 Browse Files
- instructions for setting up the environment · 7142b692
  Rocky Duan committed Aug 13, 2012
  
  7142b692 Browse Files
- Merge pull request #402 from MITx/kimth/generic-coderesponse · ae80ae0f
```
Kimth/generic coderesponse
```
  ichuang committed Aug 13, 2012
  ae80ae0f Browse Files
- Frontend queue polling doesn't render HTML until content changes · afd78feb
  kimth committed Aug 13, 2012
  
  afd78feb Browse Files
- added configuration parameter to turn on / off discussion service · 17427752
  Rocky Duan committed Aug 13, 2012
  
  17427752 Browse Files
- when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately should still work · a111a44d
  ichuang committed Aug 13, 2012
  
  a111a44d Browse Files
- Merge branch 'master' into kimth/generic-coderesponse · 9324ae34
  kimth committed Aug 13, 2012
  
  9324ae34 Browse Files
- fix customresponse be consistent with "no answer entered" behavior · 1b06f51f
  ichuang committed Aug 13, 2012
  
  1b06f51f Browse Files
- Merge pull request #403 from MITx/jarv/update-create-dev · 9b7dd919
```
adding maya to supported distro list for create-dev-env.sh
```
  jarv committed Aug 13, 2012
  9b7dd919 Browse Files
- adding maya to supported distro list for create-dev-env.sh · 99f26e4e
  John Jarvis committed Aug 13, 2012
  
  99f26e4e Browse Files
- Merge branch 'master' into kimth/generic-coderesponse · 666c0bd5
  kimth committed Aug 13, 2012
  
  666c0bd5 Browse Files
- Generic CodeResponse XML (+ support for old ExternalResponse XML) · 99e7711a
  kimth committed Aug 13, 2012
  
  99e7711a Browse Files
- remove debugging print stmt · 276f22b9
  Victor Shnayder committed Aug 13, 2012
  
  276f22b9 Browse Files
- Merge pull request #401 from MITx/feature/kfiedler/courseware-style · a7b88550
```
Added tooltip styles, made all buttons the same, and other small changes...
```
  Calen Pennington committed Aug 13, 2012
  a7b88550 Browse Files
- Merge pull request #400 from MITx/feature/victor/enrollment-windows · 0297aff7
```
add course enrollment windows
```
  Calen Pennington committed Aug 13, 2012
  0297aff7 Browse Files
- Merge pull request #399 from MITx/feature/fix_replication_side_effects · 76c4259c
```
Feature/fix replication side effects
```
  Calen Pennington committed Aug 13, 2012
  76c4259c Browse Files