Steve Strassmann
03b9a9e22a
tweak file reference
2013-05-03 15:42:39 -04:00
Sarina
72584b5937
Merge pull request #1914 from edx/fix/sarina/new_formularesponse_defaults
...
Fix/sarina/new formularesponse defaults
2013-05-03 12:32:10 -07:00
cahrens
5c3719b915
Get HTML LaTeX "working" again.
2013-05-03 15:31:18 -04:00
Steve Strassmann
138e0569dd
pull master
2013-05-03 15:18:45 -04:00
Steve Strassmann
e6334584d6
rakefile cleanup
2013-05-03 15:18:29 -04:00
cahrens
9dd074f25b
Cleanup.
2013-05-03 15:09:02 -04:00
David Baumgold
b344976fe7
Making linters happier
2013-05-03 15:08:28 -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
cahrens
37d594ce37
Get rid of non-editable scope.
2013-05-03 14:58:33 -04:00
jarv
5d729c306b
Merge pull request #1942 from edx/fix/jbau/email_timezone_config
...
Inserts overrides in env.lms.aws for email settings and timezone
2013-05-03 11:54:51 -07:00
Jason Bau
7720c0fc8d
Inserts overrides in env.lms.aws for email settings and timezone
...
overrides what is set in env.lms.common using the lms.env.json
file
2013-05-03 11:45:21 -07: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
Steve Strassmann
63e6ff16c3
merge with master
2013-05-03 12:46:29 -04:00
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
Brian Talbot
7dd763212e
edx.org - fixes to the iframe-based register button's styling
2013-05-03 11:55:14 -04: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
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
