Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

7928 Commits

Author SHA1 Message Date
Ned Batchelder
bbf508ca7b fix-setattr-and-getattr 2013-09-13 14:44:49 -04:00
Ned Batchelder
37e81007d6 keep-bson-in-mongo-code 2013-09-13 14:29:56 -04:00
Vik Paruchuri
c6e5e67483 Fix linking problem for peer grading, add in a test 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_peer_grading.py
 2013-09-13 11:09:06 -04:00
Vik Paruchuri
00050a08a4 Address review comments 2013-09-13 11:07:36 -04:00
Vik Paruchuri
640b7fe6b5 Fix problem with peer grading list not rendering, test 2013-09-13 11:07:22 -04:00
Valera Rozuvan
27015578f2 Removed an inclusion of t-copy-sub1 in SCSS. 
This line was not doing anything and simply causing a warning while
SASS was compiling. The following is the warning:

---
WARNING on line 35 of /home/valera/edx_all/edx-platform/common/static
/xmodule/descriptors/css/_000-5df8e10160f918d31f2b2e8be3ce247d.scss:
".xmodule_edit.xmodule_VideoDescriptor .editor-with-tabs .edit-header
.component-name" failed to @extend ".t-copy-sub1".

  The selector ".t-copy-sub1" was not found.
  Use "@extend .t-copy-sub1 !optional" if the extend should be able to
    fail.
---
 2013-09-13 10:11:45 +03:00
Felipe Montoya
45a1e551f9 i18n: problem submit buttons. 2013-09-12 18:13:16 -05:00
Diana Huang
90951a7bdb Merge branch 'release' 
Conflicts:
	CHANGELOG.rst
	common/lib/xmodule/xmodule/js/fixtures/lti.html
	common/lib/xmodule/xmodule/js/spec/lti/constructor.js
	common/lib/xmodule/xmodule/js/src/lti/lti.js
	common/lib/xmodule/xmodule/lti_module.py
	lms/djangoapps/courseware/features/certificates.py
	lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
	lms/djangoapps/courseware/tests/test_lti.py
	lms/djangoapps/shoppingcart/models.py
	lms/envs/aws.py
 2013-09-12 16:03:39 -04:00
Julian Arni
2aaade0f32 Utility functions for finding courses by id 2013-09-12 15:51:20 -04:00
Julian Arni
3e62c5e29a Cleaner tests 2013-09-12 15:48:00 -04:00
Julian Arni
af64621467 Remove unnecessary encode 2013-09-12 15:48:00 -04:00
Julian Arni
d54b197d24 Fix unicode errors on exceptions and logging 2013-09-12 15:47:59 -04:00
Julian Arni
1cfad39f1e Add tests for imports with unicode filenames 2013-09-12 15:47:59 -04:00
Julian Arni
1813b22ab0 Fix import errors with unicode filenames 2013-09-12 15:47:59 -04:00
cahrens
988833ded9 pylint/pep8 2013-09-12 14:30:00 -04:00
cahrens
95ad1826d4 Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format. 2013-09-12 14:30:00 -04:00
cahrens
08d9942993 Allow custom formatting of due date strings. 
STUD-724

Test course for allowing custom formatting of due date strings.

STUD-724

Try making the name of the course match the folder name.

More cleanup.

More cleanup.

updates.
 2013-09-12 14:30:00 -04:00
Julian Arni
238899faac Make default parser keep comments 2013-09-12 10:59:56 -04:00
cahrens
1184a97b0b Do not store expanded action URLs. 
They are not portable. STUD-681.

Minor updates.
 2013-09-12 09:47:30 -04:00
Calen Pennington
58a5cdd81f Replace references to .system 2013-09-12 09:29:17 -04:00
Valera Rozuvan
b858810aa4 Updating LTI Jasmine tests. 
Due to the fact that by default the LTI settings have "http://www.example.com"
set as the default form action (launch_url), tests were updated to reflect the
fact that when setting is in default state, form is not submited, even when
the form action is not empty.
 2013-09-12 11:07:07 +03:00
Adam Palay
9538ae35d4 change graders text to unicode 2013-09-11 18:34:03 -04:00
David Baumgold
049aa3bbfd Merge pull request #880 from edx/db/update-requests-lib 
Update `requests` library to 1.2.3
 2013-09-11 13:03:55 -07:00
David Baumgold
acd23ad933 reformat for readability 2013-09-11 13:26:17 -04:00
Alexander Kryklia
4621952a55 Stub headers if scheme not provided. 2013-09-11 19:32:06 +03:00
Alexander Kryklia
96bb5e1692 Merge branch 'db/update-requests-lib' of github.com:edx/edx-platform into db/update-requests-lib 2013-09-11 19:17:13 +03:00
Alexander Kryklia
68409f0c7a Add default launch url for lti. 2013-09-11 19:16:46 +03:00
Calen Pennington
74dbb9d74e Remove unused XModuleDescriptor.get_sample_state method 2013-09-11 12:12:19 -04:00
David Baumgold
6a8546801c Response.json is now a callable 2013-09-11 10:18:00 -04:00
Valera Rozuvan
dd5506eeb7 Adding styles to fix issue BLD-221. 
If you make the window smaller, and keep reducing it's size, at some
point the controls will not fit, and some will be bumped to the next row.
When the widnow is resized below the width 1024, extra styling rules
will kick in to fix this issue. The word "Speed" from the speeds control
will be temporarirly hidden.
 2013-09-11 10:29:32 +03:00
David Baumgold
871ad7d694 Pass hostname to LTI XModule 
Necessary for RFC compliance with oauthlib
 2013-09-10 14:21:56 -04:00
David Baumgold
a1d3899a4d Use oauthlib directly for LTI module 2013-09-10 11:02:30 -04:00
David Baumgold
45f38ddf81 Update requests library to 1.2.3 2013-09-10 09:59:21 -04:00
Valera Rozuvan
ee02c06250 Add Learning Tools Interoperability (LTI) blade. 
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
 2013-09-10 12:30:42 +03:00
Valera Rozuvan
d02ef8bc12 Add Learning Tools Interoperability (LTI) blade. 
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
 2013-09-09 23:54:49 +03:00
Alexander Kryklia
719ec8f9d8 Revert "Merge pull request #804 from edx/valera/lti_module" 
This reverts commit 2894b21c32, reversing
changes made to 34d0fe1554.
 2013-09-09 22:51:57 +03:00
Alexander Kryklia
ecc37227f2 Fix 2013-09-09 19:32:44 +03:00
Alexander Kryklia
8377f490f0 Revert "Add custom LTI exception." 
This reverts commit ef4b7b9b1d.
 2013-09-09 19:30:44 +03:00
Alexander Kryklia
03de84ecfe Fix 2013-09-09 19:16:18 +03:00
Alexander Kryklia
ef4b7b9b1d Add custom LTI exception. 2013-09-09 19:16:18 +03:00
Valera Rozuvan
86dbb1fe3f Addressing comments on PR 804. 
Rewriting expect() calls to use Jasmine jQuery event spies. Making individual
it() tests independent.
 2013-09-09 19:16:18 +03:00
Alexander Kryklia
45da4115d1 Fix 2013-09-09 19:16:17 +03:00
Alexander Kryklia
5e3c6736ab Fixes. 2013-09-09 19:16:16 +03:00
Alexander Kryklia
6220da32c9 Improve code. 2013-09-09 19:16:16 +03:00
Alexander Kryklia
dd4fe82b00 Improve code. 2013-09-09 19:16:16 +03:00
Valera Rozuvan
6fc280d611 Updated Jasmine tests. 
Now the introductory text is of a more serious nature.
 2013-09-09 19:16:16 +03:00
Alexander Kryklia
56f01ce056 Improve code. 2013-09-09 19:16:16 +03:00
Alexander Kryklia
32138d3539 Improve code. 2013-09-09 19:16:16 +03:00
Alexander Kryklia
a2224e6820 Improve code style. 2013-09-09 19:16:15 +03:00
Alexander Kryklia
663ff81bc1 Updates documentation. 2013-09-09 19:16:15 +03:00