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

12880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
13d29b8e72 Fix indentation of settings dictionaries. 2013-05-06 16:49:10 -04: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
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
Diana Huang
a8ea201b6a Move the link map to the settings. 2013-05-06 12:55:42 -04: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
Diana Huang
5b3f5a47de Add marketing_link to the Template context dictionary. 
Pep8 fixes
 2013-05-06 10:03:00 -04: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
e4e6c0dd7b Add new URLS to MKTG_URLS. 2013-05-03 15:05:03 -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
Brian Talbot
7dd763212e edx.org - fixes to the iframe-based register button's styling 2013-05-03 11:55:14 -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
1d42df8cb1 Add MKTG_URLS to settings for new footer and header links. 2013-05-03 09:31:47 -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
Diana Huang
582b23d780 Merge pull request #1933 from edx/diana/drupal/fix-cms-tests 
Drupal: Add cookie name to the cms settings so we don't error out while looking for it
 2013-05-03 05:53:44 -07:00
Diana Huang
182d69e36c Add cookie name to the cms settings so we don't error out 
while looking for it
 2013-05-02 17:21:49 -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
e0d
22e147b2c9 Merge pull request #1931 from edx/fix/zoldak/gcli-status 
Change org for gcli status command from mitx to edx
 2013-05-02 11:48:05 -07:00
jarv
161c8cb12e Merge pull request #1929 from edx/jtauber/fix-forks 
fix requirements to use moved forks
 2013-05-02 10:16:46 -07:00
James Tauber
f566b4f003 fix requirements to use moved forks 2013-05-02 13:05:20 -04:00
Jay Zoldak
fc1a22de55 Merge pull request #1921 from edx/fix/zoldak/cms-jasmine-tests 
Remove localization middleware from jasmine test execution
 2013-05-02 09:45:58 -07:00
Jay Zoldak
0b452f6195 Change org for gcli status command from mitx to edx 2013-05-02 12:41:59 -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
brianhw
3650316ff5 Merge pull request #1922 from MITx/fix/cdodge/jsi18n-include 
add leading slash to the jsi18n include
 2013-05-01 13:06:38 -07:00
Chris Dodge
d807b955f7 add leading slash to the jsi18n include 2013-05-01 15:27:36 -04:00
Nate Hardison
1e21526dab Merge pull request #1853 from MITx/feature/nate/updated-dev-env-setup 
Feature/nate/updated dev env setup
 2013-05-01 10:24:51 -07:00
Nate Hardison
2b17904c93 Replacing .rvmrc with .ruby-gemset 
In order to avoid duplicating the Ruby version between the `.rvmrc`
and the `.ruby-version`, we'll get rid of the `.rvmrc` and use the
`.ruby-gemset` file to specify the gemset. These files are supported
by RVM as documented [here](https://gist.github.com/fnichol/1912050).
 2013-05-01 10:22:57 -07:00
Nate Hardison
61ca49ac36 Adding a check for an existing virtualenv 
This way, packages won't be inadvertently installed into the wrong
virtual environment. I tried to have the check just run `deactivate`,
but I couldn't figure out how to get that working, so the script
just bails.
 2013-05-01 10:22:57 -07:00
Nate Hardison
a3bb4bfb9f Updating dev environment setup 
* Script now installs RVM in conventional location (~/.rvm) by
  default, though it allows for the override if desired. This will
  enable folks to install edX alongside other Ruby projects also
  using RVM.
* Script now uses virtualenvwrapper to ease the process of enabling
  the edX virtualenv and to allow for easy switching back and forth
  between virtualenv projects. It now also installs the "mitx"
  virtualenv in the conventional location of ~/.virtualenv.
* Adding a .rvmrc file so that the Ruby environment will be
  automatically activated (via `rvm use`) whenever the user hits
  the `mitx/` directory.
 2013-05-01 10:22:57 -07:00
Jay Zoldak
bdfe1cff39 Remove localization middleware from jasmine test execution 2013-05-01 11:34:28 -04:00
Jay Zoldak
f2fd90bc61 Merge pull request #1917 from MITx/fix/cale/lms-jasmine-tests 
Fix/cale/lms jasmine tests
 2013-05-01 08:23:41 -07:00
Jay Zoldak
7f93443dfb Make the test_root/db directory and add a .gitignore for the db files that will be created there. 2013-05-01 10:53:58 -04:00
Christina Roberts
a537bd7f05 Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo 
Fix/btalbot/studio courseinfo
 2013-04-30 13:34:52 -07:00
Ned Batchelder
cc1a8a4bc7 Merge pull request #1918 from MITx/ned/personal-requirements 
Ned/personal requirements
 2013-04-30 13:13:01 -07:00
Ned Batchelder
5b82ffd2ad A little documentation. 2013-04-30 16:11:22 -04:00
Ned Batchelder
091ca9c3f0 Add a private-requirements.txt for personal changes to how things are installed. Good for installing libs as working dirs. 2013-04-30 16:11:22 -04:00