Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
12,880 Commits 1 Branch 0 Tags
7aa9a6cfa574e20de26c5de416a0543f91c11cbe
Commit Graph

897 Commits

Author SHA1 Message Date
jarv
f18321cda2 Merge pull request #1919 from edx/feature/gprice/drupal-auto-enroll-on-registration 
Update course registration flow for non-modal registration and login
 2013-05-06 10:31:29 -07:00
John Jarvis
d69bbf272e using new template for "coming-soon" 2013-05-06 12:30:18 -04:00
John Jarvis
424d295686 syntax errors 2013-05-06 12:00:46 -04:00
John Jarvis
e852574a17 adding 404 handling for courses that do not exist 2013-05-06 11:54:09 -04:00
jarv
bf5ac6c263 Merge pull request #1950 from edx/jarv/drupal-new/iframe 
Jarv/drupal new/iframe
 2013-05-06 07:46:28 -07:00
Greg Price
e5846e64bd Modify course registration flow for new login and registration pages 
Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
 2013-05-03 10:01:11 -04:00
John Jarvis
01f8c4c816 Adding iframe view 
example:
http://localhost:8000/courses/HarvardX/CB22x/2013_Spring/mktg-about
 2013-04-30 09:44:21 -04:00
ichuang
977eb6530c allow staff to toggle masquerade on info pages (otherwise can get 
blocked from courseware pages, if course hasn't started yet)
 2013-04-21 21:43:18 -04:00
ichuang
f1a899ac1c Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3 2013-04-20 12:25:47 -04:00
ichuang
81621fbe3a for staff masquerading as student be kind and don't 404 for inaccessible content 2013-04-20 12:12:25 -04:00
ichuang
6cbd353992 make masquerade work properly even if DISABLE_START_DATES true 2013-04-20 11:57:56 -04:00
Jay Zoldak
be76f73107 Consolidate and upgrade factories 2013-04-18 15:11:10 -04:00
ichuang
0ffc399f7d move masquerade call up, to make sure it is used for start date checks 2013-04-17 22:12:12 -04:00
Will Daly
b42c4dacf7 Added test for "radio" choicegroup 2013-04-17 15:32:39 -04:00
Calen Pennington
6644b78819 Fix gradebook when using grade cutoffs other than A/B/C 2013-04-16 11:38:58 -04:00
ichuang
5f74ccd1a0 use ENABLE_MASQUERADE in masquerade.py 2013-04-13 22:52:17 -04:00
ichuang
5ca0393e05 add test for masquerade 2013-04-13 22:47:49 -04:00
ichuang
1c2452e401 make is_masquerading_as_student work with Mock for tests 2013-04-13 22:47:34 -04:00
ichuang
857a6e0bd0 pylint masquerade fixes 2013-04-13 22:47:28 -04:00
ichuang
fdfc37e4e3 masquerade pep8 2013-04-13 22:47:21 -04:00
ichuang
af3e08e8c7 masquerade link in courseware/views.py 2013-04-13 22:47:15 -04:00
ichuang
168a3aadf6 masquerade - remove debug line, careful with ifs in course_nav.html 2013-04-13 22:46:55 -04:00
ichuang
fb0a23238a allow staff to masquerade as student - works 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/course_navigation.html
 2013-04-13 22:46:39 -04:00
ichuang
c905cc7416 add masquerade.py 2013-04-13 22:46:30 -04:00
Jay Zoldak
d8c186d3a1 fix pylint errors in test_login.py 2013-04-12 10:25:12 -04:00
Jay Zoldak
1cc6a0a60d Fix pylint errors 2013-04-11 17:20:38 -04:00
Jay Zoldak
bb1134b8ee Convert login tests to use factories 2013-04-11 16:54:16 -04:00
cahrens
f0d2ff7ba4 Change display_timezone to show_timezone. 2013-04-08 09:11:10 -04:00
cahrens
e4dac6e310 Add display_timezone so course authors can choose not to display timezones in LMS. 2013-04-08 08:38:52 -04:00
Christina Roberts
de44813732 Merge pull request #1808 from MITx/bug/christina/studio 
Show course end date on course about page
 2013-04-04 13:34:00 -07:00
cahrens
57343c7d9e On course about page, display course end date if no about page HTML blog (end_date.html) exists. 
#224
 2013-04-04 15:35:07 -04:00
cahrens
d02dc37d9f On course about page, display course end date if no about page HTML blog (end_date.html) exists. 
#224
 2013-04-04 15:22:56 -04:00
Calen Pennington
99424a9716 Merge pull request #1792 from MITx/fix/ichuang/duplicate-entry-error 
fix IntegrityError duplicate entry issue with module_data Scope.student_state update
 2013-04-04 11:57:59 -07:00
Calen Pennington
e97e8ce5b6 Merge pull request #1781 from MITx/feature/ichuang/xqueue-callback-url-cleanup 
clean up xqueue callback url generation; allow override from settings
 2013-04-04 11:54:13 -07:00
Calen Pennington
7f19d48985 Merge pull request #1795 from MITx/feature/cale/use-open-source-xblock 
Migrate to the open source XBlock repo
 2013-04-04 10:12:00 -07:00
Brian Wilson
d3e7739b3b add user name and email to progress page 2013-04-04 12:03:08 -04:00
Brian Wilson
4c511c3c66 add progress logging 2013-04-04 11:14:52 -04:00
Calen Pennington
039ccb83cc Migrate to the open source XBlock repo 2013-04-04 10:55:31 -04:00
Don Mitchell
9a7324ebfa Merge pull request #1798 from MITx/bug/christina/studio 
Fix due date bug.
 2013-04-03 10:26:40 -07:00
brianhw
7c9875870b Merge pull request #1770 from MITx/fix/brian/remove-input_state 
management command to remove excess input_state entries
 2013-04-03 07:35:47 -07:00
Brian Wilson
b11f0e17f7 respond to feedback 2013-04-03 10:22:43 -04:00
Brian Wilson
b6f95c71ce change command to handle file input instead 2013-04-02 16:20:46 -04:00
ichuang
025c5df16e fix IntegrityError duplicate entry issue with module_data Scope.student_state update 2013-04-01 21:51:45 +00:00
Brian Wilson
1abfff220e when grading, check for always-regrade at the section level too 2013-04-01 14:14:12 -04:00
cahrens
8ace7fe57c Merge branch 'master' into bug/christina/studio 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-04-01 12:30:07 -04:00
cahrens
16f4a3f9c1 Convert due date to a Date (vs. a string with no year). 2013-04-01 11:37:05 -04:00
Victor Shnayder
9c4a88b570 Merge pull request #1743 from MITx/fix/will/bug_288 
Fix/will/bug 288
 2013-04-01 07:22:20 -07:00
ichuang
15d1bc372d clean up xqueue callback url generation; allow override from settings 2013-03-31 19:40:39 +00:00
Brian Wilson
23d96b2533 change submission history to be ordered by id 2013-03-29 21:16:20 -04:00
Brian Wilson
29731ec40b management command to remove excess input_state entries 2013-03-29 15:20:34 -04:00