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

4425 Commits

Author SHA1 Message Date
Calen Pennington
ee52726853 Merge pull request #2000 from edx/fix/cale/dont-show-template-course 
Filter out the template course from the mongo modulestore get_courses function
 2013-05-10 04:06:33 -07:00
ichuang
2bb180a353 Merge pull request #1935 from edx/fix/formularesponse_needs_samples 
formularesponse requires the "samples" attribute
 2013-05-09 19:02:57 -07:00
Calen Pennington
ea859bd6c7 Filter out the template course from the mongo modulestore get_courses function 2013-05-09 16:22:23 -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
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
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
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
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
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
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
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
Victor Shnayder
aae40b4378 Press updates 
LH: 381, 382, 383
 2013-05-03 08:55:40 -04: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
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
Sarina Canelake
2cb3af1e35 Only throw factorial-related exception on factorial raised exception 2013-05-01 10:53:22 -04:00
cahrens
13fe9c11cb Merged with master. 2013-05-01 09:33:35 -04:00
cahrens
1c8cef32ef Remove unused import. 2013-05-01 09:30:20 -04:00
cahrens
94e41319ee Unit test, remove display_name for now so there is no visible change. 2013-05-01 09:09:33 -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
Jay Zoldak
aa4e29d2f1 Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs 2013-04-30 15:22:08 -04:00
Christina Roberts
4c97f92245 Merge pull request #1916 from MITx/fix/cdodge/more-broken-template-images 
add more images to support templates
 2013-04-30 09:50:41 -07:00
Chris Dodge
c5d520574d also move the MIT dome image in Latex to be in our source pack 2013-04-30 12:02:58 -04:00