Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
15,977 Commits 1 Branch 0 Tags
908fd46f4db3360b7aaf673dd9bc641dfd43bc1e
Commit Graph

2270 Commits

Author SHA1 Message Date
jsa
908fd46f4d notification_prefs: add ajax endpoint to get preference status 2013-07-30 01:43:01 -04:00
Kevin Chugh
803b92fc9a add ajax endpoint for getting notifications status 2013-07-30 01:19:15 -04:00
Your Name
47dbf2e6cb updates but getting status and setting status not working 2013-07-29 18:33:19 -04:00
Your Name
13ca61ba7f fix merge conflict with _variables.scss 2013-07-29 13:32:54 -04:00
Your Name
6276997180 update checkbox with get settings 2013-07-29 13:26:31 -04:00
Don Mitchell
0578175a7c Merge pull request #505 from edx/dhm/xblock_save 
More xblock.save() calls to handle fields set during inits
 2013-07-29 09:34:46 -07:00
Don Mitchell
d1ed6fbc34 More xblock.save() calls to handle fields set during inits 2013-07-29 09:08:37 -04:00
Greg Price
dc90736b5b Allow user id filtering in user preference API 2013-07-25 14:19:29 -04:00
Greg Price
6418a1cf5b Allow user API access in dev environments 
This is achieved by allowing access if settings.DEBUG is True and
settings.EDX_API_KEY is not set or None (which is true for dev.py)
 2013-07-25 14:02:43 -04:00
Adam Palay
2efcb0cdca Change default names for various LMS components 
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"

These default names show up in tooltips.
 2013-07-25 10:38:47 -04:00
Kevin Chugh
d95693ebb7 hook up panel to new stats service 2013-07-25 03:23:04 -04:00
Calen Pennington
76055aa211 Add a manage.py command that understands the extra edX options 2013-07-24 09:04:12 -04:00
Adam
420b092033 Merge pull request #467 from edx/fix/adam/file-upload 
Fix/adam/file upload
 2013-07-23 15:05:18 -07:00
Diana Huang
86ee2bca7a Merge branch 'release' 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
 2013-07-23 17:57:07 -04:00
Diana Huang
2926c94330 Prevent XSS attack via submission_history page. 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
 2013-07-23 17:23:59 -04:00
Chris Dodge
c5ef8dc526 add line break between arguments 2013-07-23 12:15:56 -04:00
Chris Dodge
f78e3a221b fix fat finger string formatting 2013-07-23 12:15:56 -04:00
Chris Dodge
345d2af540 address review feedback 2013-07-23 12:15:56 -04:00
Chris Dodge
e24eb3e4eb added explicit unit test to verify the link rewriting 2013-07-23 12:15:55 -04:00
Chris Dodge
63c5cfda94 add comment and fix mistake in test 2013-07-23 12:10:49 -04:00
Chris Dodge
1c79b9c874 add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio 2013-07-23 12:10:49 -04:00
chrisndodge
8c94be8083 Merge pull request #436 from edx/fix/cdodge/stop-using-unmunged-urlnames-as-display-names 
change from_xml class method on video class to make sure we honor the fa...
 2013-07-23 08:33:27 -07:00
Alexander Kryklia
1eaba8b0b4 Merge pull request #41 from edx/alex/word_cloud_course_factory 
Word cloud tests
 2013-07-23 04:47:38 -07:00
Adam Palay
2b40462263 convert all datetime.now() to datetime.now(UTC) 2013-07-22 17:39:11 -04:00
Adam Palay
af522af2ca formatting 2013-07-22 17:39:11 -04:00
Greg Price
790328dfa8 Add acceptance test for one-click unsubscribe page 2013-07-22 11:50:26 -04:00
Greg Price
47b51e9329 Add endpoints to set user notification preference 
Two endpoints are intended to be used by AJAX calls from the web UI with an
authenticated user. When enabled, the value of the preference is an encryption
of the username, to be used as a token for one-click unsubscribe links. The
third endpoint is the target of unsubscribe links, which displays a page with
an appropriate message to the user.
 2013-07-22 11:50:26 -04:00
Greg Price
6a97ddf53c Add an API to interact with users and preferences 
The new API uses Django REST Framework. For now, it is designed specifically
to support the use cases required by the forum digest notifier (not yet built),
with a goal of making it more generally useful over time.
 2013-07-22 10:57:18 -04:00
Renzo Lucioni
1fc4ac864e Add feature showing current score next to problem title 2013-07-19 16:14:24 -04:00
Adam
73e6e6f443 Merge pull request #394 from edx/fix/foldit-leaderboard 
Fix/foldit leaderboard
 2013-07-19 12:09:37 -07:00
Chris Dodge
22802a4d29 change from_xml class method on video class to make sure we honor the fact that the xml string could actually be a pointer to another file on disk which actually contains the attributes 2013-07-19 13:54:22 -04:00
Joe Blaylock
044a69d63d Merge pull request #52 from edx/nate/simple-chat 
Simple port of Class2Go's chat feature
 2013-07-19 10:10:32 -07:00
Vik Paruchuri
a2522c492c Merge pull request #160 from edx/fix/vik/studio-oe 
Fix/vik/studio oe
 2013-07-19 08:44:16 -07:00
Ned Batchelder
66ca7d750e Merge pull request #411 from edx/ned/studentmodulehistory-cleaner-command 
Ned/studentmodulehistory cleaner command
 2013-07-19 08:33:37 -07:00
Adam Palay
a04539af5d change models to filter by course 2013-07-19 11:03:25 -04:00
Joe Blaylock
50c906732f Chat rebase, test update 
Rebase on today's master and update to unit test to include settings
where needed.
 2013-07-18 15:00:54 -07:00
Nate Hardison
293bd30a59 Use chat settings when deciding whether to render 
Only render the chat widget if both the site has enabled it in the
`MITX_FEATURES` and if the course has enabled it. In addition, fail
gracefully with a log warning if the `JABBER_DOMAIN` is not set, and
do not try to render the widget. However, do go ahead and render the
rest of the courseware.
 2013-07-18 15:00:54 -07:00
Nate Hardison
f4ae0e0cae Test generation of chat settings 
Ensure that the chat connection settings are generated properly for
the template context.
 2013-07-18 15:00:54 -07:00
Nate Hardison
bf8e5e6ba1 Simple port of Class2Go's chat feature 
Embed a chat widget (much like the calculator widget) into the
courseware. To use, you must point it at an ejabberd box,
configured as `JABBER_DOMAIN` in the settings.
 2013-07-18 15:00:53 -07:00
Sarina Canelake
7615a0638b Merge pull request #310 from robertjmarks/master 
Adds in changes for stat2.3x question type
 2013-07-18 13:44:00 -07:00
Diana Huang
3f9431e8cf Provide implicit saves for XBlocks and XModules. 
Update existing tests and provide new ones to test new paradigm.
 2013-07-18 16:37:34 -04:00
Sarina Canelake
f0c9aa3916 Provide set_many methods for Lms and Mongo KeyValueStores 
Refactor new set_many and update XBlock version number.
 2013-07-18 15:30:13 -04:00
RobertMarks
4d880db1b5 Updated behavior for split_answer_dict, get_score, and check_student_inputs (responsetypes.py) 2013-07-18 10:18:53 -07:00
RobertMarks
46ae2f9c26 Added support for a new problem type: ChoicetextResponse 2013-07-18 10:12:56 -07:00
Vik Paruchuri
915f815c63 Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-07-18 11:55:37 -04:00
Ned Batchelder
900e794c02 Only quiet the particular logger we think is too noisy. 2013-07-18 11:53:21 -04:00
Ned Batchelder
3d67c506a3 Use TransactionTestCase, to keep other tests from failing, even though it slows them down. 2013-07-18 11:16:46 -04:00
Ned Batchelder
10f062cf18 Records should be sorted by created,id so that timestamp ties will be broken by id. 2013-07-18 11:16:46 -04:00
Ned Batchelder
83cb3d1924 Add batch and sleep arguments so we can control the speed from the command line. 2013-07-18 11:16:46 -04:00
Ned Batchelder
3a49136f03 Quiet some debug output, get transactions right. 2013-07-18 11:16:46 -04:00