Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,365 Commits 1 Branch 0 Tags
2c83dc3f09b49d740407daaffe05ab8fd549ed8a
Commit Graph

8693 Commits

Author SHA1 Message Date
Valera Rozuvan
e8d07d5377 Carried over old work on video alpha 2 to new branch on top of merged video alpha. 2013-08-01 20:08:42 +03:00
marco
77e57448b3 cleaned up sass document format and added baseline variable throughout capa and combined open ended problems. no style rule changes, simply whitespace, ordering of properties, and the addition of baseline over direct pixels for padding and margins. 2013-08-01 12:42:11 -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
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
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
Calen Pennington
b64aa813c8 Make render_template mocking clearer 2013-07-31 12:19:33 -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
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
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
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
Vasyl Nakvasiuk
61327bc599 fix python code styles 2013-07-31 10:43:06 +03:00
David Baumgold
7d7513b6fe Merge pull request #470 from edx/db/course-team-admin-grants 
Grant admin rights to members of the course team
 2013-07-30 13:36:56 -07:00
Don Mitchell
119652a62a Rename CourseLocator.revision to branch 
and all related vars and methods.
 2013-07-30 14:37:33 -04:00
Peter Fogg
512269f842 Add descriptor for modules with empty XML data. 
This allows a more general approach to modules such as word_cloud and
video which have no XML data (it's all store in metadata), but use
XmlDescriptor for backwards compatibility. They now generate an empty
tag on export, and clear out empty tags on import.

Also a small change to the video module as a result -- if it's asked
to parse empty XML data, it won't try to parse anything.
 2013-07-30 13:53:38 -04:00
David Baumgold
71bb527022 Merge pull request #515 from edx/db/template-improvements 
Studio: Improvements for loading JS templates on Advanced Settings and Course Updates pages
 2013-07-30 08:24:54 -07:00
Peter Fogg
f355e4a8f4 More general solution to word cloud export problems. 2013-07-30 10:29:12 -04:00
Peter Fogg
0967cb0d9d Fix word cloud modules not exporting correctly. 2013-07-30 10:29:12 -04:00
Jim Abramson
77a796e2c7 Merge pull request #520 from edx/feature/kevin/email_notifications_panel 
Feature/kevin/email notifications panel
 2013-07-30 05:30:56 -07:00
Diana Huang
0d10a872c8 Merge pull request #499 from edx/diana/login-redirect 
Only redirect when redirect url is an internal page.
 2013-07-30 05:29:39 -07:00
Vasyl Nakvasiuk
d6f794c4d7 gst module: add configuration and render properties 2013-07-30 11:59:41 +03:00
Kevin Chugh
4f7edbf67d fix notifications URL 2013-07-30 01:50:33 -04:00
Kevin Chugh
5c91edd4a5 update coffeescript to use new status url 2013-07-30 01:43:49 -04:00
Kevin Chugh
8f98a1c2be remove failing jasmine tests and print statements 2013-07-30 00:46:47 -04:00
Kevin Chugh
99f235ec56 first pass at jasmine tests 2013-07-30 00:13:03 -04:00
Kevin Chugh
62f6e2d52b home button working, default to home when no thread selected 2013-07-29 23:33:50 -04:00
Your Name
47dbf2e6cb updates but getting status and setting status not working 2013-07-29 18:33:19 -04:00
Brian Talbot
611dab077f Studio: places 'add team member' call to course team view 2013-07-29 17:29:15 -04:00
Your Name
4afa5481dd set and get settings and fix discussion.css post-variable-apocalypse 2013-07-29 16:11:59 -04:00
Calen Pennington
8ed33b3dd5 Merge pull request #478 from edx/cale/xmodule-descriptor-studio-view 
Cale/xmodule descriptor studio view
 2013-07-29 11:43:29 -07:00
David Baumgold
97fb08ab08 Make mitxmako.render_to_response not require a dictionary argument 2013-07-29 14:28:55 -04:00
Diana Huang
d1b503d53a Only redirect when redirect url is an internal page. 2013-07-29 14:18:04 -04:00
Your Name
13ca61ba7f fix merge conflict with _variables.scss 2013-07-29 13:32:54 -04:00
Adam
50ef0d1c09 Merge pull request #503 from edx/fix/back-button 
fixes back nav button
 2013-07-29 10:29:40 -07: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
393aa1da26 Ensure parent update of children decaches correctly 2013-07-29 12:23:19 -04:00
Don Mitchell
d1ed6fbc34 More xblock.save() calls to handle fields set during inits 2013-07-29 09:08:37 -04:00
Vasyl Nakvasiuk
57bc010a0a gst integration into studio 2013-07-26 17:22:27 +03:00
Christina Roberts
166aea62bb Merge pull request #341 from edx/talbs/studio-authorship 
Studio: Authorship Rights Request UI + Dashboard Clean-up
 2013-07-26 03:59:07 -07:00
Vik Paruchuri
12a2c06fb1 Remove console.log statements 2013-07-25 15:57:21 -04:00
Vik Paruchuri
2d966209f4 fix test 2013-07-25 15:55:34 -04:00
Vik Paruchuri
1a4be13d4c Improve rubric look and feel 2013-07-25 15:40:09 -04:00
Adam Palay
62a54555b6 fixes back nav button 2013-07-25 15:32:43 -04:00
Vik Paruchuri
29bd64555f Get table to take up the width of the page 2013-07-25 15:30:11 -04:00
Vik Paruchuri
b6ff513e33 Add in get last response functionality 2013-07-25 15:06:40 -04:00