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

4451 Commits

Author SHA1 Message Date
Greg Price
7d544d449f Remove edX news from dashboard if marketing site is enabled 2013-05-10 11:03:49 -04:00
Greg Price
a0fb4d6c85 Merge branch 'master' into drupal-new 
Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html
 2013-05-10 10:30:10 -04:00
David Baumgold
d09e93142f Merge pull request #1980 from edx/backbone-1.0.0 
Upgrade to Backbone 1.0.0
 2013-05-09 09:34:35 -07:00
Greg Price
f8539cc2d7 Redirect authenticated users from registration or login to dashboard 2013-05-08 17:10:54 -04:00
Greg Price
0e525d69ff Disable SSL cert validation for Zendesk API 
They are currently using a CA that is not installed on our servers. Since it
isn't a top-tier CA and we aren't submitting anything particularly sensitive
anyway, we don't have to feel too bad about this.
 2013-05-08 15:45:12 -04:00
Christina Roberts
0c6c7868ae Merge pull request #1965 from edx/feature/christina/fields 
Pass through the value (either default or inherited) that a metadata field WILL have if it is not explicitly set.
 2013-05-08 10:32:55 -07:00
David Baumgold
ec79ebd4a7 Updated Backbone.js and Underscore.js 
Backbone 1.0.0, Underscore 1.4.4
 2013-05-08 09:29:15 -04:00
Will Daly
b19c80ccb5 Merge pull request #1957 from edx/fix/will/bug_392 
Added unit tests for safe_key() to resolve bug 392.
 2013-05-08 06:23:49 -07:00
VikParuchuri
fb4685fe9a Merge pull request #1976 from edx/vik/fix/oe-bugs 
Vik/fix/oe bugs
 2013-05-07 14:54:17 -07:00
Vik Paruchuri
5cd9641f24 Update peer grading comment 2013-05-07 17:35:00 -04:00
Vik Paruchuri
530ac51c1c Add .error callback back in 2013-05-07 17:33:34 -04:00
Vik Paruchuri
2648a19cc2 Fix check for use for single location 2013-05-07 17:08:14 -04:00
Vik Paruchuri
e0d1eca6aa Delete two lines. without this, the xblock fields are never created in cases where the module is "fresh" (ie has no existing data) 2013-05-07 16:56:08 -04:00
Will Daly
aaa383b8ca safe_key() now hashes the prefix/version as well, just in case 
these are configured to be too long in the settings.
 2013-05-07 15:48:51 -04:00
Vik Paruchuri
1398b55713 Comment touched modules 2013-05-07 15:48:19 -04:00
Vik Paruchuri
9e03280f50 Make peer grading fields stringy and fix js to avoid strange error 2013-05-07 15:33:15 -04:00
Diana Huang
2947ce246f Better error handling for when marketing urls are missing from the settings. 2013-05-07 13:17:30 -04:00
cahrens
9e1c935b60 Merge branch 'master' into feature/christina/fields 2013-05-07 12:39:45 -04:00
Christina Roberts
729ca900e6 Merge pull request #1920 from edx/feature/christina/fields 
Pass additional field information from editable_metadata_fields, remove system_metadata_fields variable.
 2013-05-07 09:38:34 -07:00
Will Daly
1b0b365fa6 Added unit tests for safe_key() to resolve bug 392. 
Updated safe_key() so that it: (a) avoids creating keys that
are too long for memcache, and (b) handles unicode in keys, prefixes,
and versions

Added __init__.py, which should have been in the last commit

Pep8/Pylint fixes
 2013-05-06 17:26:18 -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
Jay Zoldak
c2cd75469b Change the methodology to ignore .js files by default. Any .js files that are coded can be handled individually. 2013-05-06 17:05:47 -04:00
cahrens
594d28a653 Pass default value through. 2013-05-06 16:03:41 -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
Jay Zoldak
522751e425 Ignore the js files that are compiled from coffeescript when running the xmodule jasmine tests 2013-05-06 14:28:05 -04:00
Greg Price
ec3c8458e7 Merge pull request #1911 from edx/feature/gprice/feedback-button 2013-05-06 11:03:41 -07: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
Greg Price
87072a9a58 Add an endpoint for submission of Zendesk tickets by end users 
This functionality requires the Zendesk URL, user, and API key to be specified
in django.conf.settings. Also, add a flag to MITX_FEATURES (enabled by default)
to control the endpoint and the front-end feature (yet to be added).
 2013-05-06 13:35:51 -04:00
Diana Huang
a8ea201b6a Move the link map to the settings. 2013-05-06 12:55:42 -04:00
cahrens
84ff2a0941 Merge branch 'master' into feature/christina/fields 2013-05-06 12:42:18 -04:00
Christina Roberts
66185423a2 Merge pull request #1945 from edx/feature/christina/computed_default 
Get rid of _computed_default.
 2013-05-06 09:28:37 -07:00
David Baumgold
5e288b60ca Merge pull request #1943 from edx/cleanup 
One more attempt at making linters happier
 2013-05-06 07:15:21 -07:00
Diana Huang
5b3f5a47de Add marketing_link to the Template context dictionary. 
Pep8 fixes
 2013-05-06 10:03:00 -04:00
cahrens
e44c6b6bf8 Don't reach in to default value. 2013-05-03 17:05:02 -04:00
cahrens
32d67be5f5 Get rid of _computed_default. 2013-05-03 16:42:41 -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
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
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
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
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
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
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
cahrens
01ede40b03 Switching branches 2013-05-02 09:43:03 -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