Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,363 Commits 1 Branch 0 Tags
e8f067de8f2be4c7864ad1bdf4e0794de175e0dc
Commit Graph

2941 Commits

Author SHA1 Message Date
Greg Price
3fd8b6ff59 Merge pull request #1960 from edx/feature/gprice/drupal-reset-buttons 2013-05-07 08:17:44 -07:00
Brian Talbot
7aa9a6cfa5 Merge pull request #1962 from edx/fix/btalbot/lms-mktgiframe 
edx.org - resolved iframe button styles in IE + added in coming soon state
 2013-05-07 08:04:45 -07:00
Brian Talbot
9a01bb5e52 edx.org - adding back js-dependent register class to register button 2013-05-07 11:02:02 -04:00
Brian Talbot
126c9f9f37 edx.org - further revision to iframe register button states: coming soon styling 2013-05-07 11:00:21 -04:00
Brian Talbot
3b84d77131 edx.org - resolved (in a dirty way) iframed buttons picking up style in IE and added in coming soon style treatment 2013-05-07 10:25:41 -04:00
Arthur Barrett
4070e019e4 modified the html static book to only enable annotator.js when notes are enabled for the course 2013-05-06 19:29:44 -04:00
Diana Huang
a081ba4bbb Merge pull request #1934 from edx/diana/drupal/fix-lms-links 
Fix links between marketing site and courseware.
 2013-05-06 14:14:29 -07:00
Diana Huang
6110b54ca8 Address code review feedback 
* Fix indentation/line break issues
* Handle marketing root URL as a separate case in marketing_link
* Move link map to its own setting.
 2013-05-06 14:56:06 -04:00
Arthur Barrett
c5728fb036 fix undefined variable name error in mako template 2013-05-06 14:48:51 -04:00
Greg Price
ec3c8458e7 Merge pull request #1911 from edx/feature/gprice/feedback-button 2013-05-06 11:03:41 -07:00
Arthur Barrett
04e75485ba merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html. 2013-05-06 13:40:38 -04:00
Greg Price
00729a8c13 Add an omnipresent help tab to the LMS 
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
 2013-05-06 13:35:52 -04:00
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
e852574a17 adding 404 handling for courses that do not exist 2013-05-06 11:54:09 -04:00
Ned Batchelder
ec7a04fdb3 A /debug/run_python endpoint for staff to test the sandboxing of Python code. 2013-05-06 11:39:17 -04:00
Victor Shnayder
06846d9187 update EPFL profile. LH # 374 2013-05-06 11:06:05 -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
Diana Huang
c9a6fe18f0 Create new marketing_link function to abstract link generation 
and use it for the new marketing site links.
 2013-05-03 15:06:24 -04:00
Diana Huang
3e217c8f85 Use new login page for marketing site when student is trying to 
access login_required page.
 2013-05-03 15:04:41 -04:00
Brian Talbot
192e1d798d edx.org - trying a fix for IE ignoring styles within registration button iframe 2013-05-03 13:33:47 -04:00
John Jarvis
258537e3d2 adding csrf middleware token to form submission 2013-05-03 13:05:10 -04:00
John Jarvis
58dbcf9d31 break out of iframe 2013-05-03 13:04:36 -04:00
Greg Price
d61945081d Fix disable/re-enable submit button 2013-05-03 13:01:39 -04:00
Diana Huang
d35283cf65 Reduce the amount of repeated HTML and add checks for the correct settings. 2013-05-03 10:17:40 -04:00
Greg Price
031a74865e Add login link to registration page if user is trying to enroll in a class 
If an unauthenticated user clicks on a course registration button, they will
be redirected to the user registration page. Now, that page will include a link
to the login page. If the user follows the link and logs in successfully, then
they will be enrolled in the class.
 2013-05-03 10:01:11 -04: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
Diana Huang
e0ac6834da Fix links between marketing site and courseware. 
Update links in footer to point to the right pages.
Update link on dashboard without any classes.
Update links in header.
Update links on sign in and register pages.
 2013-05-03 09:31:47 -04:00
Victor Shnayder
aae40b4378 Press updates 
LH: 381, 382, 383
 2013-05-03 08:55:40 -04:00
Diana Huang
45baf013fe Merge branch 'master' into drupal-new 2013-05-02 17:04:39 -04:00
Brian Talbot
d7d68a1e8c edx.org - resolved JQuery submit() method error on <iframe> register button actions 2013-05-02 15:31:17 -04:00
John Jarvis
59c56c2610 fixing old about view, iframe updates 2013-05-02 15:05:12 -04:00
Brian Talbot
7705941a65 edx.org - added in isolated register button styling/states for <iframe>-based registration fix 2013-05-02 11:54:16 -04:00
John Jarvis
aa895cbc6b Adding mktg_iframe.html 2013-04-30 13:13:31 -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
dcadams
44bdea0044 Merge branch 'master' of github.com:MITx/mitx into feature-dcadams-usermanagement 2013-04-29 14:35:45 -07:00
Diana Huang
befe7beccb Add accessibility text to the Contact page. 2013-04-29 16:55:29 -04:00
dcadams
b62b4ac267 Merge branch 'master' of github.com:MITx/mitx into feature-dcadams-usermanagement 2013-04-29 09:38:32 -07:00
dcadams
c64f0b1a18 Modifications to instructor dashboard - enrollment tab: 
- Remove single enrollment/unenrollment
- Make unenrollment work with multi-email listbox.
- Provide checkbox for auto-enroll on activate if user not yet signed
up.
- Enroll student when activating if auto-enroll flag set.
 2013-04-29 09:38:10 -07:00
Diana Huang
2df3fe9344 Revert "fix merge conflict" 
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
 2013-04-26 12:40:35 -04:00
Steve Strassmann
8baddc0645 Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n 2013-04-24 10:41:09 -04:00
Calen Pennington
621a935577 Merge pull request #1858 from MITx/feature/ichuang/masquerade-v3 
Allow course staff to masquerade as students in viewing courseware
 2013-04-24 04:17:34 -07:00
Your Name
acfd0d9fd6 fix merge conflict 2013-04-23 10:30:51 -04:00
Kevin Chugh
d6bc426ecd Merge pull request #1731 from MITx/feature/kevin/pinning_inline 
Feature/kevin/pinning inline
 2013-04-23 07:24:22 -07:00
Your Name
3f1d97b065 Merge branch 'master' into feature/kevin/flagging 2013-04-22 17:22:33 -04:00
chrisndodge
0eed587571 Merge pull request #1839 from MITx/feature/sef/pressreleases 
Press Releases: generic matching rule instead of explicit lines in url.py
 2013-04-22 07:01:36 -07:00
Kevin Chugh
e8c646142f Merge branch 'master' into feature/kevin/flagging 2013-04-21 06:15:55 -04:00
Kevin Chugh
649578ea2f unify flag moderator permissions 2013-04-21 06:15:23 -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
3de927fe01 untabify course_nagivation.html 2013-04-17 21:22:08 -04:00