Rocky Duan
97f1e2f5e4
removed debug line
2012-08-14 16:39:22 -07:00
Rocky Duan
eef24a5ebe
added administrator role
2012-08-14 15:58:04 -07:00
Rocky Duan
529c323771
fixed bug caused by missing course_id in retrieved comments
2012-08-14 15:57:02 -07:00
Rocky Duan
d4f024ed26
small bug fix
2012-08-14 15:06:54 -07:00
Rocky Duan
50e95de9ef
a place to start for the user profiel & fixed some bugs
2012-08-14 15:04:36 -07:00
Rocky Duan
04387289fa
fixed bugs caused by merging
2012-08-14 13:43:04 -07:00
Rocky Duan
eb47093b1c
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
common/djangoapps/student/models.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-14 12:54:43 -07:00
Rocky Duan
3c32aff123
disable asc sorting for now
2012-08-14 12:50:22 -07:00
Rocky Duan
0992be3749
make top sort by last_activity_at for now
2012-08-14 12:45:22 -07:00
Rocky Duan
49e840d62b
adjust new post button in forum view
2012-08-14 12:43:15 -07:00
Rocky Duan
28f0dd2759
make delete actually working again
2012-08-14 10:24:41 -07:00
Rocky Duan
60b2423c91
prompt window for deleting
2012-08-14 10:21:11 -07:00
Calen Pennington
cfe712cb2a
Merge pull request #407 from MITx/kimth/generic-coderesponse
...
Kimth/generic coderesponse
2012-08-14 08:48:50 -07:00
Rocky Duan
9d3c9e333f
fixed tag autocomplete
2012-08-13 23:58:42 -07:00
Rocky Duan
1f4d2f3d8a
fixed updating bug
2012-08-13 23:27:55 -07:00
Rocky Duan
38bdcabe53
reply now works again
2012-08-13 23:23:13 -07:00
Rocky Duan
19ba57858c
fixed focus bug: mistakenly binded event twice
2012-08-13 22:55:08 -07:00
Rocky Duan
6fa0298546
make retrieved single thread/comment after update integrated with permissions
2012-08-13 21:42:28 -07:00
Rocky Duan
0fa0f2c8ae
add cancel button for new post
2012-08-13 21:15:04 -07:00
kimth
895cf2c2ed
Front end file size limit matches server-end limit
2012-08-13 21:18:49 -04:00
kimth
1c2d034283
LMS-side MAX_FILESIZE set in settings.py
2012-08-13 21:17:47 -04:00
Calen Pennington
d0e51a2df2
Merge pull request #406 from MITx/feature/ichuang/fix-signup-modal-for-ssl
...
when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately ...
2012-08-13 18:01:21 -07:00
kimth
936f2c49f5
Server-side (LMS) checking of uploaded filesize
2012-08-13 21:00:29 -04:00
Calen Pennington
2504880e57
Merge pull request #404 from MITx/feature/ichuang/consistent-customresponse
...
fix customresponse be consistent with "no answer entered" behavior
2012-08-13 17:55:24 -07:00
kimth
d19244c48b
Polling rerenders problem when individual queued items return
2012-08-13 20:41:16 -04:00
kimth
a4e283e975
File submission frontend checks for filesize
2012-08-13 20:20:19 -04:00
kimth
3db07bca5f
Frontend polling rate aware of queue length at time of submission
2012-08-13 19:42:08 -04:00
Rocky Duan
dd4f89638d
hide empty brackets when not filtering through tags
2012-08-13 16:38:18 -07:00
Rocky Duan
62bc1aaef7
make following and recent tags display actual things
2012-08-13 16:32:08 -07:00
Rocky Duan
2dde3b00d5
removed edit button in the bottom bar
2012-08-13 16:23:32 -07:00
Rocky Duan
ce9b5b0750
update discussion.md
2012-08-13 16:16:40 -07:00
Rocky Duan
7142b69259
instructions for setting up the environment
2012-08-13 16:12:09 -07:00
ichuang
ae80ae0f62
Merge pull request #402 from MITx/kimth/generic-coderesponse
...
Kimth/generic coderesponse
2012-08-13 16:08:52 -07:00
kimth
afd78febfb
Frontend queue polling doesn't render HTML until content changes
2012-08-13 19:07:44 -04:00
Rocky Duan
1742775262
added configuration parameter to turn on / off discussion service
2012-08-13 15:35:19 -07:00
ichuang
a111a44da0
when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately should still work
2012-08-13 18:09:14 -04:00
kimth
9324ae3485
Merge branch 'master' into kimth/generic-coderesponse
2012-08-13 17:56:06 -04:00
ichuang
1b06f51fd8
fix customresponse be consistent with "no answer entered" behavior
2012-08-13 17:41:24 -04:00
jarv
9b7dd91997
Merge pull request #403 from MITx/jarv/update-create-dev
...
adding maya to supported distro list for create-dev-env.sh
2012-08-13 13:42:49 -07:00
John Jarvis
99f26e4ea8
adding maya to supported distro list for create-dev-env.sh
2012-08-13 16:40:46 -04:00
kimth
666c0bd56c
Merge branch 'master' into kimth/generic-coderesponse
2012-08-13 16:26:27 -04:00
kimth
99e7711aca
Generic CodeResponse XML (+ support for old ExternalResponse XML)
2012-08-13 15:48:33 -04:00
Victor Shnayder
276f22b965
remove debugging print stmt
2012-08-13 15:32:04 -04:00
Calen Pennington
a7b88550c7
Merge pull request #401 from MITx/feature/kfiedler/courseware-style
...
Added tooltip styles, made all buttons the same, and other small changes...
2012-08-13 12:29:48 -07:00
Calen Pennington
0297aff761
Merge pull request #400 from MITx/feature/victor/enrollment-windows
...
add course enrollment windows
2012-08-13 12:29:14 -07:00
Calen Pennington
76c4259c15
Merge pull request #399 from MITx/feature/fix_replication_side_effects
...
Feature/fix replication side effects
2012-08-13 12:25:42 -07:00
Kyle Fiedler
731f1cd7a8
Added tooltip styles, made all buttons the same, and other small changes throughout the courseware
2012-08-13 15:05:43 -04:00
Victor Shnayder
8716f88155
add course enrollment windows
...
* if the course metadata have enrollment_start and/or enrollment_end,
only allow normal users to enroll post start and pre end.
* If DARK_LAUNCH is on, staff can enroll outside the window
2012-08-13 15:03:46 -04:00
Victor Shnayder
add050593a
address comment on #392
2012-08-13 14:23:41 -04:00
Victor Shnayder
706fd99cab
Address comments on #394
2012-08-13 14:21:19 -04:00
