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

4392 Commits

Author SHA1 Message Date
Chris Dodge
57eca325d2 move some files from lms/djangoapps/django_comment_client to common/djangoapps/django_comment_common 2013-05-06 15:59:35 -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
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
David Baumgold
b344976fe7 Making linters happier 2013-05-03 15:08:28 -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
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
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
Chris Dodge
1f1a6e3ec5 add more images to support templates 2013-04-30 11:46:49 -04:00
Sarina Canelake
95a224fcea Fix pep8 violations 2013-04-30 11:21:20 -04:00
Sarina Canelake
573116073e Add error message when factorial given non-integral value 2013-04-30 11:16:14 -04:00
Christina Roberts
1e8619288a Merge pull request #1912 from MITx/fix/cdodge/broken-template-image 
add dependent image for the image response template
 2013-04-30 08:11:11 -07:00
Chris Dodge
02ed9f26c4 add dependent image for the image response template 2013-04-30 10:07:42 -04:00
Brian Talbot
886205dec3 revised placeholder course overview HTML value 2013-04-29 17:23:14 -04:00
Chris Dodge
33aada6d22 fix broken test. Since we're pre-populating the course overview when creating a course, the clone_course fails because it asserts that the destination course that it clones into is empty. Need to check that the course is basically empty (e.g. a course module and a overview module) 2013-04-29 16:43:32 -04:00
Brian Talbot
a861c8b310 revised placeholder course and faculty images - more opacity to reinforce placeholderness 2013-04-29 16:03:00 -04:00
Chris Dodge
680e932b8b use default staff images that is in /common/static/... 2013-04-29 15:42:58 -04:00
Brian Talbot
4e251a3b19 adding in placeholder images for a course and its faculty 2013-04-29 15:38:55 -04:00
Sarina Canelake
f95331dcc1 fix more pep8 violations 2013-04-29 15:01:11 -04:00
Sarina Canelake
6993daf116 Fix pep8 violations 2013-04-29 15:01:05 -04:00
Sarina Canelake
46792c82de Remove debugging print statements 2013-04-29 15:00:54 -04:00
Sarina Canelake
ed43afb08f Add additional unit test comment 2013-04-29 15:00:45 -04:00
Sarina Canelake
696879bd26 Add unit tests for formularesponse type 2013-04-29 15:00:36 -04:00
Sarina Canelake
c79843c541 Add factorial as a default function for formula response 2013-04-29 15:00:26 -04:00
Christina Roberts
72dfd4995e Merge pull request #1903 from MITx/fix/cdodge/dangling-verticals-on-delete 
Fix/cdodge/dangling verticals on delete
 2013-04-29 11:58:22 -07:00
Chris Dodge
d7693d96b7 unit test should just use direct store. Also remove unused import and logging. 2013-04-29 09:18:49 -04:00
Calen Pennington
8c4526ed07 Fix coffeescript error in video spec file 2013-04-29 07:32:16 -04:00
Calen Pennington
4a397972fa Sort the css and js assets by numerical index 2013-04-29 07:31:48 -04:00
Chris Dodge
7d206e020d remove comment which is no longer valid as well as debug log messages 2013-04-26 16:13:26 -04:00
Chris Dodge
bbea8eb9f3 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-verticals-on-delete 2013-04-26 15:25:47 -04:00
Chris Dodge
55266f6e96 add a overview.yaml template and also clone that template into a newly created course 2013-04-26 13:39:22 -04:00
Diana Huang
2df3fe9344 Revert "fix merge conflict" 
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
 2013-04-26 12:40:35 -04:00
Chris Dodge
2e64bc33ff make sure delete_item always uses the draft store 2013-04-26 12:37:37 -04:00
Calen Pennington
8c54d5d610 Fix accidental force push that reset master 
Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd410. 5d912b8a is a merge commit
that merged a branch onto master, so I am merging the same commit
back into master.
 2013-04-26 10:50:53 -04:00
Chris Dodge
f6417b4f71 add a delete-all-versions flag to the delete_item method in the modulestores. Extend tests to verify. Still wip 2013-04-25 15:24:31 -04:00
Diana Huang
886e74342d Move the testcenter login to external_auth 
* hide the login behind a setting that is turned off by default
* clean out some of the outdated settings and hardcoded test strings
 2013-04-25 11:12:19 -04:00
cahrens
c7962cf07b Don't explicitly declare display_name. 2013-04-24 16:41:58 -04:00
Calen Pennington
9d94adbd1f Merge pull request #1871 from MITx/feature/cale/fast-dev-server 
Speed up local development
 2013-04-24 12:12:05 -07:00
cahrens
45f86b662a Delete unused file. 2013-04-24 14:59:32 -04:00
cahrens
cc2d06975e Remove duplicated StringyX definitions. 2013-04-24 14:59:32 -04:00