Rocky Duan
a06cc229a0
watch/unwatch threads; display current vote
2012-07-24 15:34:17 -04:00
Calen Pennington
6bf0e093bc
Add tests for the edit page for the toy course, and make sure that exporting to github sets up the git repo properly
2012-07-24 15:05:07 -04:00
Calen Pennington
39b59484a6
Re-add login requirement to save_item
2012-07-24 15:05:07 -04:00
Calen Pennington
6b28786784
Use the new name for item_id in contentstore.views.save_item
2012-07-24 15:05:07 -04:00
Calen Pennington
45144ec4ce
Remove the live preview code from the html and raw modules, in preparation for updating the preview on save
2012-07-24 15:05:07 -04:00
Calen Pennington
1aba46de55
Be consistent with the metadata key name for the data directory
2012-07-24 15:05:07 -04:00
Calen Pennington
15ac476781
Display preview html on the module edit page. Javascript for previews doesn't yet function
2012-07-24 15:05:07 -04:00
Calen Pennington
a81015a91b
Move I4xSystem into xmodule so that the definition is available to the CMS
2012-07-24 15:05:07 -04:00
Calen Pennington
97cdb67b49
Log error messages when failing to parse xml from a string that contain context of where the error occurred in the string (in definition_to_xml)
2012-07-24 15:05:07 -04:00
Calen Pennington
57d8361acb
Escape characters from raw xml data going into the text box so that the round-trip doesn't get rid of neccessary xml escaping
2012-07-24 15:05:06 -04:00
Calen Pennington
4aab04e4ab
Merge pull request #290 from MITx/feature/cpennington/disable-start-date-flag
...
Add feature flag for disabling course start dates
2012-07-24 11:46:58 -07:00
Calen Pennington
98910a2d49
Address review comments
2012-07-24 14:46:46 -04:00
Calen Pennington
66f79251dc
Add feature flag for disabling course start dates
2012-07-24 13:22:50 -04:00
Calen Pennington
d8f8d8c656
Merge branch 'release/1.0'
...
Conflicts:
common/djangoapps/student/views.py
lms/djangoapps/courseware/courses.py
2012-07-24 08:52:50 -04:00
David Ormsbee
1d5e42f175
Remove very large, no longer used images
2012-07-24 00:05:13 -04:00
David Ormsbee
cf549df5e4
Merge pull request #289 from MITx/dormsbee/hack_fix_pwd_reset
...
Dormsbee/hack fix pwd reset
2012-07-23 20:55:57 -07:00
David Ormsbee
f22810524d
Use settings.SITE_NAME instead of hardcoded edx.org
2012-07-23 23:54:35 -04:00
David Ormsbee
d688b7d249
Merge branch 'release/1.0' into dormsbee/hack_fix_pwd_reset
2012-07-23 23:43:48 -04:00
David Ormsbee
729070763f
Convert @mitx.mit.edu emails to @edx.org emails
2012-07-23 23:43:34 -04:00
David Ormsbee
614f4540d0
Place a domain_override to force Django to use edx.org instead of example.com.
...
Django hardcodes the subject line for password reset emails. You're supposed
to be able to override it with a properly named template, but that didn't
make it into 1.3.1 (which is what we're deploying on now). We're not using
the Sites framework at this time, so this was the "fix".
2012-07-23 23:41:45 -04:00
David Ormsbee
749740eb07
Actually, the bg play YT bug was there because of the lack of a class on the section. Re-removing the YouTube title.
2012-07-23 23:05:06 -04:00
David Ormsbee
75ba3ebbd4
Reverting the YouTube title hiding commit because it brings back the 'video playing in the background when you hit back' bug
2012-07-23 23:02:04 -04:00
David Ormsbee
8b503eb1ef
Remove YouTube title from showing in homepage video (thanks, Arjun).
2012-07-23 22:59:45 -04:00
David Ormsbee
2a37f7a921
Merge pull request #288 from MITx/dormsbee/hack_fix_pwd_reset
...
Bad hardcoded hack fix to password reset.
2012-07-23 19:31:02 -07:00
David Ormsbee
8db59825f1
Bad hardcoded hack fix to password reset.
...
We used to use Django templates and the Sites framework. At some point we
stopped, but this was leftover. The site_name no longer gets set properly.
It's probably a config issue, but not one I want to deal with right before
release, so I'm hardcoding it to link to the prod edx.org site until we
can sort what's what in the morning.
2012-07-23 22:27:33 -04:00
David Ormsbee
7e8986fce9
Merge pull request #287 from MITx/release_fixes
...
Release fixes
2012-07-23 18:03:21 -07:00
Bridger Maxwell
e7bb31af5b
Changed unenroll to unregister on dashboard.
2012-07-23 20:46:39 -04:00
David Ormsbee
48d69faf4e
Merge pull request #286 from MITx/dormsbee/help
...
Dormsbee/help
2012-07-23 17:40:58 -07:00
David Ormsbee
e53ea2f81d
Add common tech problems to help page
2012-07-23 20:39:26 -04:00
David Ormsbee
38d54f42ca
Let people know courses are free. <sigh>
2012-07-23 20:38:09 -04:00
Bridger Maxwell
cfe1255432
Updated error messages for missing signup fields.
2012-07-23 20:03:38 -04:00
Bridger Maxwell
80f46c216b
Capitalized facebook on contact page.
2012-07-23 19:56:10 -04:00
Bridger Maxwell
45bdcbdcae
Unecessary capitalized letter on contact page.
2012-07-23 19:55:07 -04:00
Bridger Maxwell
e3b023b0ac
Removed unecessary quotation mark from contact page.
2012-07-23 19:54:03 -04:00
Bridger Maxwell
7c48ab2509
Changed press dates to international format.
2012-07-23 19:53:08 -04:00
jarv
6666c2fe8a
Merge pull request #285 from MITx/release_fixes
...
Fixed bugs caused by modal cloning. Now, only video modals are cloned.
2012-07-23 16:25:03 -07:00
Rocky Duan
8c3931ba0a
removed unnecessary args
2012-07-23 19:24:28 -04:00
Kyle Fiedler
157af877cb
Merge branch 'kf-multicourse-design' into release/1.0
2012-07-23 19:20:49 -04:00
Kyle Fiedler
3008c17730
Added bottom margin for articles in help
2012-07-23 19:19:50 -04:00
Bridger Maxwell
1e1e777e04
Fixed bugs caused by modal cloning. Now, only video modals are cloned.
2012-07-23 19:19:27 -04:00
Kyle Fiedler
18ec7ca8e8
Added social links to the footer of the press release
2012-07-23 19:17:22 -04:00
Rocky Duan
d6be47d942
refactored out thread rendering; vote
2012-07-23 19:03:36 -04:00
David Ormsbee
8b94318b33
Merge pull request #284 from MITx/dormsbee/jobs_desc
...
Dormsbee/jobs desc
2012-07-23 15:59:26 -07:00
David Ormsbee
503a7b5d12
Finish a pass at the tech sections of the job page, add new edX fellow description
2012-07-23 18:58:09 -04:00
David Ormsbee
ee7caad181
Change jobs contact to be jobs@edx.org for all
2012-07-23 18:58:09 -04:00
David Ormsbee
799da8de3c
Merge pull request #283 from MITx/release_fixes
...
Fix for appending course enroll to login/register form
2012-07-23 15:49:57 -07:00
Bridger Maxwell
973e474a9c
Fix for appending course enroll to login/register form, now that the form is being cloned.
2012-07-23 18:46:02 -04:00
David Ormsbee
2fb5bb6e86
Merge pull request #282 from MITx/kf-multicourse-design
...
Added styles for help page
2012-07-23 15:45:48 -07:00
Kyle Fiedler
6aac776a33
Added styles for help page
2012-07-23 18:40:58 -04:00
David Ormsbee
0832373859
Merge pull request #281 from MITx/kf-multicourse-design
...
IE fixes!!!!!!!!!!!!!!!
2012-07-23 15:24:27 -07:00
