Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,143 Commits 1 Branch 0 Tags
08eb8fa7c19eaff4870cd0bea6d06a80915000eb
Commit Graph

23143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
ec308e9771 Add lettuce test for transferring ownership of a course using the course team page 2013-08-01 12:11:49 -04:00
Peter Fogg
8bd686d63c Show notification on component reorder. 2013-08-01 11:56:16 -04:00
Julian Arni
9f4b7261a8 Merge branch 'master' into jkarni/docs-merge 2013-08-01 11:41:44 -04:00
David Baumgold
607c06cba8 Stop using authz functions to change user groups 
They contain too much incorrect permission checking
 2013-08-01 11:24:42 -04:00
Will Daly
cadb81355e Merge pull request #548 from edx/will/fix-auto-auth-csrf-2 
Ensure auto-auth feature flag actually disables CSRF
 2013-08-01 08:20:32 -07:00
Peter Fogg
e501a176b1 Merge pull request #540 from edx/peter-fogg/overview-reorder-notification 
Show notification on course outline reorder.
 2013-08-01 07:17:59 -07:00
e0d
97013d610a Merge pull request #541 from edx/e0d/escalated-priv-migrations 
adding migrate env for cms
 2013-08-01 07:15:08 -07:00
Adam
933935a887 Merge pull request #433 from edx/tsinghuax/lms-i18n 
Tsinghuax/lms i18n
 2013-08-01 07:00:00 -07:00
Brian Talbot
a1f43fa6fd Studio: revises prompt messages for team roles UI 2013-08-01 09:58:32 -04:00
David Baumgold
21318d142d Add confirmation prompt when deleting a user from a course team 2013-08-01 09:58:32 -04:00
David Baumgold
2617b478c0 Add error messaging to course team page 
Hitting "Add User" with no email address, or trying to add a user to the course
team multiple times
 2013-08-01 09:58:32 -04:00
Will Daly
b78f6f7a3d Added pylint exceptions to load test settings. 2013-08-01 09:42:31 -04:00
Peter Fogg
4a77693f4a Show notification on course outline reorder. 2013-08-01 09:41:27 -04:00
Will Daly
9e5d64b8df Removed check for AUTOMATIC_AUTH_FOR_LOAD_TESTING because 
it's already implied that you're using load testing settings.
 2013-08-01 09:29:58 -04:00
Will Daly
ab1461542d Moved CSRF override into its own settings file 2013-08-01 09:27:46 -04:00
e0d
60aaa8a876 Merge pull request #544 from edx/e0d/fix-loadtest-feature-flag 
these values are set implicitly at :147, setting them here clobbers them
 2013-08-01 06:01:43 -07:00
e0d
ef75f9bb2c adding migrate env for cms 
cleanup
 2013-08-01 08:43:20 -04:00
Will Daly
39030c6683 Remove CSRF middleware/processor in aws and dev settings, 
not common.  This ensures that we load the MITX_FEATURES
token BEFORE deciding to disable CSRF.
 2013-07-31 23:59:25 -04:00
Adam Palay
69ffb6a87b replace edx with variable substitution 
fixes template errors

keep tos untranslated

formatting fixes
 2013-07-31 19:39:15 -04:00
Calen Pennington
e8ee29786f Remove news carousel and other unused pages 
Remove unused course_filter page

removes university_profile urls and templates

removes all university_profile views

remove news from templates/index
 2013-07-31 19:39:15 -04:00
Calen Pennington
0d3c44996a LMS i18n from Tsinghua 2013-07-31 19:39:15 -04:00
chrisndodge
8573ac3909 Merge pull request #510 from edx/feature/cdodge/allow-course-run-in-course-create 
Feature/cdodge/allow course run in course create
 2013-07-31 14:44:50 -07:00
David Baumgold
64ad5567f3 Create urls/views/templates for dev-only views 
Our designers find it helpful to be able to stub out simple views that aren't ready
to be seen for production yet, and check them into version control so that other
people can see them and provide feedback. This commit introduces a few new files
and directories for this purpose, as well as a sample view that will only be seen
in dev mode, and never in production.
 2013-07-31 17:20:26 -04:00
Calen Pennington
8f97608200 Merge pull request #527 from edx/cale/restrict-us-to-less-than-distribute-0.7,-which-breaks-setuptools 
Restrict us to less than distribute 0.7, which breaks setuptools
 2013-07-31 14:00:31 -07:00
e0d
8abd7bb6fe these values are set implicitly at :147, setting them here clobbers them 2013-07-31 16:40:54 -04:00
Sef Kloninger
0246339819 fix crash in peer eval xmodule 
As documented in Jira LMS-806:

Steps to reproduce:
* as one user, for a peer evaluated problem, enter something that needs
  peer grading
* as another user, log in and fire up the peer grading panel. You should
  see something that needs attention, a yellow exclamation badge
* clicking on the "do grading" panel will fail with a 500, stacktrace
  attached.
* it's possible that the question where this is being done must first have
  professor calibration done in order for peers to be able to actually get
  work to grade.

Don Mitchell debugged this with me and saw some problems in the ways
that the peer_evaluation xmodule code was accessing dates. Instead of
using the normal lms accessors, by going straight into the _module_data
it would be bypassing some important code (caching?). Fixing this to be
more standard did the trick.
 2013-07-31 13:31:25 -07:00
Don Mitchell
b80aad2308 Merge pull request #528 from edx/dhm/rename_revision 
Rename CourseLocator.revision to branch
 2013-07-31 13:18:17 -07:00
David Baumgold
59c367b883 Merge pull request #542 from edx/db/fix-pylint 
Fix some pylint issues
 2013-07-31 13:12:54 -07:00
David Baumgold
248793c127 Fix some pylint issues 2013-07-31 15:42:11 -04:00
David Ormsbee
e68ddcd057 Merge branch 'release' 2013-07-31 15:33:30 -04:00
Frances Botsford
b6777118c6 removing animate class from course creation for now 2013-07-31 15:25:38 -04:00
Calen Pennington
094bf7e55d Merge pull request #536 from edx/cale/make-render_template-mocking-clearer 
Make render_template mocking clearer
 2013-07-31 11:37:55 -07:00
Brian Wilson
635d36fcf9 Add audit log definition, and use for logging of logins in external_auth and student apps. Move test_login to student app. Improve conditional tests for Shibboleth login logic. (Does not include reconfiguring log settings.) 2013-07-31 13:32:21 -04:00
frances botsford
2ac27550a5 Merge pull request #537 from edx/fix/frances/studio-ie-menu-bug 
fix for ie bug where drop down menus were still clickable when collapsed
 2013-07-31 10:19:56 -07:00
Calen Pennington
b64aa813c8 Make render_template mocking clearer 2013-07-31 12:19:33 -04:00
Frances Botsford
9ab21be98c fix for ie bug where drop down menus were still clickable when collapsed 2013-07-31 12:17:21 -04:00
Calen Pennington
e43dbd29c4 Merge pull request #487 from edx/cale/lms-xblock-student-view 
Cale/lms xblock student view
 2013-07-31 09:04:38 -07:00
Will Daly
b27857ca17 Merge pull request #534 from edx/will/fix-signup-test 
Fix broken Studio signup.feature acceptance test
 2013-07-31 08:32:01 -07:00
Brian Talbot
b85f92de8d Studio: wraps new course creation form in authorship rights logic 2013-07-31 11:29:00 -04:00
Don Mitchell
68e1bcf42e Remove edu from doc string examples & typos 2013-07-31 11:24:51 -04:00
Peter Fogg
25955a79c4 Merge pull request #492 from edx/peter-fogg/fix-stud-146 
Fix word cloud modules not exporting correctly.
 2013-07-31 08:19:32 -07:00
Jonah Stanley
8d11c246e1 Merge pull request #516 from edx/jonahstanley/upgrade-chrome-version 
Jonahstanley/upgrade chrome version
 2013-07-31 08:17:46 -07:00
Ned Batchelder
15859dd880 Merge pull request #522 from edx/ned/quiet-mongoimport-noise-during-tests 
Quiet mongoimport noise during tests
 2013-07-31 07:25:57 -07:00
Ned Batchelder
4cb8f58b27 Quiet mongoimport noise during tests 2013-07-31 10:25:09 -04:00
jkarni
bba0611584 Merge pull request #532 from edx/jkarni/fix/superfluous-fn 
Remove get_preview_module.
 2013-07-31 07:21:29 -07:00
Vasyl Nakvasiuk
1233d73e01 Merge pull request #497 from edx/alex/graphical_slider_tool_for_studio 
"Graphical Slider Tool" integration into studio
 2013-07-31 06:36:49 -07:00
Don Mitchell
f2977704fe Remove unused tests 
which a previous refactoring had replaced. Coverage of locator.py is
100%
 2013-07-31 09:35:21 -04:00
Calen Pennington
99f9894f1c Switch LMS over to using XBlock rendering commands 
This makes the LMS use an XBlock's student_view, rather than an
XModule's get_html to render for display. However, it does not yet use
wrap_child to handle instructor debug information or url rewriting.

[LMS-219]
 2013-07-31 09:22:10 -04:00
Will Daly
a48c7cfc26 Replaced direct call to browser.is_text_present() with 
`world.css_find()` to protect against StaleElementException
in Jenkins.
 2013-07-31 08:38:46 -04:00
Vasyl Nakvasiuk
61327bc599 fix python code styles 2013-07-31 10:43:06 +03:00