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

15754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
5168a080ff Don't add users marked with is_staff to course creation table. 2013-07-22 14:45:22 -04:00
cahrens
6629d5d3a3 Merge branch 'master' into talbs/studio-authorship 
Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html
 2013-07-22 12:15:42 -04:00
Peter Fogg
9a61038c87 Merge pull request #432 from edx/peter-fogg/update-asset-deletion-prompt 
Change delete asset prompt to Warning type for consistency.
 2013-07-22 06:10:15 -07:00
Calen Pennington
1b6f81b0c2 Merge pull request #408 from edx/cale/make-release-email-script-wiki-friendly 
Make release email script wiki-friendly
 2013-07-22 05:59:02 -07:00
Jason Bau
6c3de222cc Merge pull request #450 from edx/jbau/configure-session 
Allow session backend to be configurable
 2013-07-21 20:44:15 -07:00
Calen Pennington
679b118ed3 Merge pull request #271 from edx/dhm/next-gen-modulestore 
Next gen modulestore
 2013-07-20 04:51:11 -07:00
Calen Pennington
6dab09f5f2 PEP8 and Pylint fixes 2013-07-20 06:26:38 -04:00
Jason Bau
034de2cfd2 Allow session backend to be configurable and also add PLATFORM_NAME 
to cms settings (it was throwing 500s for Stanford when the CMS
calls render_from_lms)
 2013-07-19 17:43:37 -07:00
Will Daly
efc6a3081d Merge pull request #444 from edx/will/fix-acceptance-tests 
Will/fix acceptance tests
 2013-07-19 14:16:50 -07:00
Will Daly
76a63a6ef0 Disabled test failing due to bug in Studio 2013-07-19 17:13:51 -04:00
Renzo Lucioni
011ceb8e63 Merge pull request #418 from edx/renzo/in-context-progress 
Renzo/in context progress
 2013-07-19 14:01:40 -07:00
Will Daly
17daa2a023 Fixed two other tests 2013-07-19 16:49:16 -04:00
Will Daly
27d51b3453 Attempt to fix video test 2013-07-19 16:49:15 -04:00
Renzo Lucioni
9af87e41ba Resolve issues with persistence and sequential bar 2013-07-19 16:14:24 -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
Don Mitchell
913c601ac1 Move default set_many impl to xblock 2013-07-19 15:08:24 -04:00
Adam
032b02df24 Merge pull request #445 from edx/adam/fix/wiki 
set django-wiki to its most recent version
 2013-07-19 12:02:39 -07:00
Don Mitchell
549ef5d494 Ensure kvs up-to-date if code accessing it. 2013-07-19 14:55:49 -04:00
Adam Palay
7165acc499 set django-wiki to its most recent version 2013-07-19 14:40:41 -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
Don Mitchell
62afa23a0d Make tests not msec time sensitive 2013-07-19 13:10:14 -04:00
Don Mitchell
df7b917b40 Implement next generation modulestore 
A new modulestore backed by mongo that changes the data format to
facilitate easy versioning, sharing content between courses, and fast
lookup of course structure and Scope.settings data.

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
 2013-07-19 13:10:14 -04:00
Don Mitchell
4a127e51c9 Merge pull request #441 from edx/dhm/course_update_bugs 
POST requests were claiming request.method == 'PUT'
 2013-07-19 08:56:01 -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
Don Mitchell
541c98a3af POST requests were claiming request.method == 'PUT' 
So, changed handlers to look for either value.
 2013-07-19 11:14:01 -04:00
Don Mitchell
63c3bb0812 Reproduce POST showing up as PUT error 2013-07-19 11:12:23 -04:00
Adam Palay
a04539af5d change models to filter by course 2013-07-19 11:03:25 -04:00
Don Mitchell
e3602941ee Merge pull request #440 from edx/dhm/adaptive_template 
Bug report: remove <?xml version..> tag
 2013-07-19 07:57:29 -07:00
Alexander Kryklia
0e58f3ac57 Merge pull request #439 from edx/alex/fix_code_jail_imports_and_draganddrop_yaml 
Fixes code_jail imports and draganddrop yaml
 2013-07-19 07:50:26 -07:00
chrisndodge
37dc27cec4 Merge pull request #438 from edx/fix/cdodge/missing-space-on-landing-page 
I18N work seems to have lost a very prominent space in the landing page
 2013-07-19 07:43:10 -07:00
chrisndodge
d78af5cf51 Merge pull request #294 from edx/feature/cdodge/add-dump-course-structure 
add a new django-admin command to dump out a course structure document. ...
 2013-07-19 07:04:41 -07:00
Don Mitchell
eee1d6f593 Bug report: remove <?xml version..> tag 
https://edx-wiki.atlassian.net/browse/STUD-428
 2013-07-19 09:15:29 -04:00
Alexander Kryklia
67f6d6c4d1 Fixes code_jail imports and draganddrop yaml 2013-07-19 12:05:17 +03:00
Chris Dodge
95302b02a8 I18N work seems to have a very prominent space in the landing page 2013-07-18 21:12:49 -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
3aec9fdb77 Add setting to enable/disable chat site-wide 
To protect against chat blowing things up, we include a way to
enable and disable it on an entire site-wide basis.
 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
c53a550f3b Remove additional jQuery include 
jQuery already available across the whole site at the top level, so
no need to include it again specifically for the chat widget.
 2013-07-18 15:00:54 -07:00
Nate Hardison
a0ab47658a Move Candy.js files to new vendor/ directory 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
Ned Batchelder
24564223cc Merge pull request #435 from edx/ned/allow-tempfiles-in-sandbox 
Use CodeJail with FSIZE support, and default to 50k
 2013-07-18 14:26:44 -07:00
Ned Batchelder
89c48f4a30 Use CodeJail with FSIZE support, and default to 50k 2013-07-18 17:25:05 -04:00
Vik Paruchuri
a478fa9ff7 Change error class 2013-07-18 16:56:38 -04:00
Don Mitchell
921e78b8ae Merge pull request #421 from edx/dhm/template_acceptance 
Fix due/start date setting in edit_subsection
 2013-07-18 13:49:55 -07:00
Don Mitchell
0aa9c6c1ae json field value conversion test 2013-07-18 16:48:29 -04:00
Don Mitchell
badf86f71b Have save_item parse json formatted field values by type 
including allowing javascript to serialize date/time natively.
 2013-07-18 16:48:29 -04:00
Don Mitchell
025a95885a Generate TypeError if from or to_json fail. 2013-07-18 16:47:15 -04:00