Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,363 Commits 1 Branch 0 Tags
e8f067de8f2be4c7864ad1bdf4e0794de175e0dc
Commit Graph

3005 Commits

Author SHA1 Message Date
Miles Steele
cc737cb1b2 rename enrollment section to membership 2013-08-02 09:52:12 -04:00
Miles Steele
02432e05cc integrate slickgrid, add instructor.enrollment, add instructor.access, refactor & clean 2013-08-02 09:52:12 -04:00
Miles Steele
6ff568ce9d remove pid and version 2013-08-02 09:52:12 -04:00
Miles Steele
daeabb06bf add instructor dashboard beta (partial) (view, template, coffeescript, api endpoints) 2013-08-02 09:52:12 -04:00
Miles Steele
4238cb569f fix repoint dump_grades script 2013-08-02 09:52:11 -04:00
Miles Steele
2e1d729e57 move instructor views.py to views/legacy.py 2013-08-02 09:52:11 -04:00
Chris Dodge
93df9c4c30 resolve merge conflicts 2013-08-02 09:41:02 -04:00
polesye
042b7d5f60 Merge pull request #428 from edx/valera/video_alpha2_refactor 
Valera/video alpha2 refactor
 2013-08-02 01:04:13 -07:00
brianhw
a628b62d1e Merge pull request #511 from edx/feature/brian/audit-log 
Use audit logger for logging of logins in external_auth...
 2013-08-01 14:08:08 -07:00
Adam Palay
0076d6a64d fix error handling 
distinguish logged error and instructor-facing error
 2013-08-01 14:56:28 -04:00
Adam Palay
bbd52e05a2 converts user objects to unicode, improve error logging 2013-08-01 14:56:27 -04:00
Valera Rozuvan
52fa6591c2 Corrected all isues found during refactoring #2. 
Added missing file.~
Undid a mistake.
Copied Python tests from video_alpha1.
moves TestLogic to __init__.py
reorginizes xmodule logic tests
adds docstrings for poll tests
adds docstring for word cloud and conditional tests
adds docstrings for video alpha tests
adds videoalphafactory for tests, not finished
adds imports
Bug fixing.
fix video/videoalpha tests
Updated lettuce test. Now it is aware of the fact that Video and Video Alpha players have different base CSS classes.
Removed REFACTOR comments.
Turn off autoplay for Video Alpha in Studio.
Carry over fix for bug where in Firefox changing to speed 1.0 has no effect.
Carry over JavaScript Jasmine tests from jmclaus/videoalpha2_js branch.
Exporting state object from main function of Video Alpha.
More stuff from jmclaus/videoalpha2_js branch.
Specs in html5_video.js all pass except ten of them. Cleaned code a bit and moved it out of display_spec.js
One more spec passes
Fixed remaning tests in spec/../html5_video.js test suite. Removed test video files.
Added JavaScript Jasmine tests for main of Video Alpha 2.
adds test for volume control and updates helper file for videoalpha
 2013-08-01 20:08:45 +03: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
David Ormsbee
e68ddcd057 Merge branch 'release' 2013-07-31 15:33:30 -04: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
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
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
jsa
fc5d4aa745 make user_api compatible with HTTP basic auth 2013-07-30 17:13:48 -04:00
Calen Pennington
487c9a4f10 Merge pull request #524 from edx/cale/external_discussion_tab 
Cale/external discussion tab
 2013-07-30 08:59:09 -07:00
Calen Pennington
5e4cf50086 Make sure that all tab types used by the default for the course.tabs field work correctly 2013-07-30 11:32:31 -04:00
Carlos Andrés Rocha
b8d1a138ae Show dates when the data was collected in the instructor dashboard panel 2013-07-30 11:16:27 -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
jsa
05f31f8bf1 Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel 2013-07-30 02:31:05 -04:00
jsa
7a7c070999 notification_prefs/views: correct docstring 2013-07-30 02:30:45 -04:00
Kevin Chugh
e1e591f8bf address code review comments 2013-07-30 01:55:20 -04:00
Kevin Chugh
c3e609fe40 fix merge conflict 2013-07-30 01:44:40 -04:00
Kevin Chugh
5c91edd4a5 update coffeescript to use new status url 2013-07-30 01:43:49 -04:00
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
jsa
6463bcae6c user_api: get username into user object 
so it can be used to generate unsubscribe tokens
 2013-07-29 15:20:08 -04:00
Diana Huang
d1b503d53a Only redirect when redirect url is an internal page. 2013-07-29 14:18:04 -04:00
JonahStanley
20ce33dcdb Fixed broken tests from chrome versioning 2013-07-29 13:38:27 -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
Kristin Stephens
71a1562e21 Fix offline_gradecalc 
Bug: Throws error when can't find a user on the request object for grading or can't find a session attribute.

Fix: Added a user attribute with a value of the current student and a session attribute with a value of an empty dictionary.
 2013-07-25 14:31:20 -07: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