Commit Graph

14212 Commits

Author SHA1 Message Date
Steve Strassmann
55dd0fc8bc workaround for gettext parser bug 2013-05-03 12:45:55 -04:00
Steve Strassmann
dea1198d75 Merge pull request #1925 from edx/bug/straz/date
Bug/straz/date - fix date interpolation
2013-05-03 09:32:00 -07:00
marco
018a3d8a38 branch now runs, but none of the styles are there yet. pushing this mostly to view component.html 2013-05-03 09:20:43 -07:00
marco
370df65d89 Merge branch 'master' into ux/marco/studio-componentsettings 2013-05-03 09:04:03 -07:00
marco
b9da0ffb0a reverting all variables in attempt to properly load unit pages 2013-05-03 09:02:32 -07:00
Brian Talbot
7dd763212e edx.org - fixes to the iframe-based register button's styling 2013-05-03 11:55:14 -04:00
marco
110a51b74e removing variable names to get it to run again 2013-05-03 08:40:35 -07:00
marco
036991dce8 moved bad variable name 2013-05-03 08:10:37 -07:00
brianhw
a294e2d1ac Merge pull request #1937 from edx/victor/press
Press updates
2013-05-03 07:50:26 -07:00
Greg Price
0f7378a171 Modify UserFactory to create a profile for the user
This allows specification of profile parameters when creating a user. Because
the profile contents are always accessed from the database, the user must be
saved to the database before the profile is created. This means that the
profile cannot be created if the user is merely being built (and not saved)
rather than created.
2013-05-03 10:31:35 -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
Victor Shnayder
aae40b4378 Press updates
LH: 381, 382, 383
2013-05-03 08:55:40 -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
marco
c842a5fc7c plugged in more pseudo code for various css class states necessary as well as examples for dropdown case and extra logic required there 2013-05-03 00:33:58 -07:00
marco
fbaed2e28b added shell of css and html organization 2013-05-03 00:00:10 -07:00
ichuang
60977b0e74 formularesponse requires the "samples" attribute; enforce this,
instead of just failing with an obscure error
2013-05-02 18:56:15 -04: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
cahrens
0a1902e7da Merge branch 'master' into feature/christina/fields 2013-05-02 16:29:03 -04:00
e0d
9ee246e407 flexible org repos parsing tested locally 2013-05-02 15:50:33 -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
cahrens
e0ebe6dacb Remove TODO. 2013-05-02 13:53:17 -04:00
cahrens
c01410626f Jasmine test for changedMetadata method. 2013-05-02 13:39:20 -04: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
cahrens
c7713b6211 Merge branch 'master' into feature/christina/fields 2013-05-02 12:32:56 -04:00
cahrens
46100fd258 Cleanup. 2013-05-02 12:32:32 -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
cahrens
93f10ae8a0 Only save changed metadata fields. 2013-05-02 11:41:38 -04:00
Steve Strassmann
c9a80ded25 formatted using sublime/formatjs 2013-05-02 10:59:02 -04:00
cahrens
01ede40b03 Switching branches 2013-05-02 09:43:03 -04:00
Steve Strassmann
485d07a722 tabbing 2013-05-02 09:31:53 -04:00
Steve Strassmann
7c972ebf6e fix date interpolation 2013-05-02 09:29:27 -04:00
marco
d55527b693 changes with aria 2013-05-01 17:22:09 -04:00
marco
e697e495ca Merge branch 'master' into ux/marco/studio-componentsettings 2013-05-01 17:21: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