Matt Drayer
6b93532c63
Merge pull request #10077 from edx/ziafazal/SOL-1258
...
SOL-1258: Percentage appearing wrong for specific numbers
2015-10-08 08:28:08 -04:00
Usman Khalid
f6193c872e
Merge pull request #10059 from edx/usman/use-included-staticfiles-app
...
Upgrade django pipeline to v.1.5.3.
2015-10-08 16:10:36 +05:00
Zia Fazal
14c310017b
minimum score percentage rounded
...
round before converting a decimal into integer
2015-10-08 12:01:40 +05:00
Usman Khalid
dbcd1bf430
Use django.contrib.staticfiles instead of django-staticfiles.
...
TNL-3137
2015-10-06 19:52:38 +05:00
Brian Beggs
143ca802ae
Merge pull request #10043 from edx/revert-9934-usman/use-included-staticfiles-app
...
Revert "Upgrade django-pipeline and staticfiles"
2015-10-05 15:29:17 -04:00
Bill DeRusha
fe23052511
Merge pull request #9979 from edx/bderusha/boardman-traffic
...
Add IP to all python Segment tracking calls
2015-10-05 14:55:55 -04:00
Brian Beggs
0ca679e244
Revert "Upgrade django-pipeline and staticfiles"
2015-10-05 14:40:28 -04:00
Usman Khalid
0ce679fc06
Merge pull request #9934 from edx/usman/use-included-staticfiles-app
...
Upgrade django-pipeline and staticfiles.
2015-10-02 22:37:24 +05:00
David Baumgold
0219e18fa8
Merge pull request #10023 from edx/release
...
Release into master
2015-10-02 12:58:50 -04:00
Usman Khalid
2b59d46a31
Use django.contrib.staticfiles instead of django-staticfiles.
...
TNL-3137
2015-10-02 18:26:25 +05:00
Bill DeRusha
ca6633bd98
Add IP to all python Segment tracking calls
2015-10-01 21:21:16 -04:00
Bill DeRusha
bcb71a3255
Rename SEGMENT_KEY to have a unique key name for both CMS and LMS
2015-10-01 19:40:27 -04:00
David Baumgold
69bc10235e
Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts
2015-10-01 15:28:55 -04:00
chrisndodge
d9a21d72fc
Merge pull request #9945 from edx/cdodge/credit-status-messaging
...
Make the message to the end user consistent across as requirement typ…
2015-09-30 12:40:59 -04:00
chrisndodge
cc15a9ada8
Merge pull request #9975 from edx/cdodge/bump-proctoring
...
update reference to edx-proctoring to account for requested iconograp…
2015-09-30 12:38:31 -04:00
David Baumgold
459f2e0705
Disable some tests for comprehensive theming
...
Depends on functionality that has been temporarily reverted
2015-09-30 12:18:09 -04:00
David Baumgold
7cd9db1216
Disable some tests for comprehensive theming
...
Depends on functionality that has been temporarily reverted
2015-09-30 11:33:41 -04:00
Chris Dodge
bf26b09265
update reference to edx-proctoring to account for requested iconography changes from UX team. Also update test to conform with changes
2015-09-30 10:10:23 -04:00
Chris Dodge
799571b213
Make the message to the end user consistent across as requirement types, except for grade requirements
2015-09-29 22:24:59 -04:00
Bill DeRusha
a6873cb883
Merge pull request #9875 from edx/bderusha/segment-cleanup
...
Segment Clean Up
2015-09-29 10:33:03 -04:00
Chris Dodge
3b650133bf
bump version of edx-proctoring to 0.9.11
2015-09-27 17:53:13 -04:00
Bill DeRusha
c721ff5a82
Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY
2015-09-24 11:49:03 -04:00
clrux
0b64f2d612
Merge pull request #9525 from edx/clrux/ac-76
...
LMS: Course navigation revamp
2015-09-23 14:26:10 -04:00
Ahsan Ulhaq
508ded2673
LMS: course navigation menu refactor
2015-09-23 13:13:18 -04:00
Nimisha Asthagiri
946102a3e0
Merge pull request #9823 from edx/mobile/xblock-rendering-api
...
MA-1337 xBlock Rendering View
2015-09-21 17:00:05 -04:00
Nimisha Asthagiri
31d5d513f8
MA-1337 xBlock Rendering View
2015-09-21 16:17:11 -04:00
David Baumgold
03aeae4bd7
Merge pull request #8271 from edx/sass-theming
...
Comprehensive Theming
2015-09-21 10:55:18 -04:00
muhammad-ammar
6a5ce5d544
Upgrade factory_boy
...
TNL-3179
2015-09-18 18:02:38 +05:00
David Baumgold
6ebf2515f4
Comprehensive theming
...
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
2015-09-17 15:39:03 -04:00
Waheed Ahmed
18411cd480
Fixed discussion module get_course.
...
TNL-3237
2015-09-12 00:27:18 +05:00
Chris Dodge
68ee28f8b0
update edx-proctoring to 0.9.x
2015-09-11 10:00:05 -04:00
David Ormsbee
127467f20a
Merge pull request #9023 from mcgachey/lti-collated-grades
...
[LTI Provider] Grade passback for non-leaf blocks.
2015-09-02 07:34:10 -04:00
Ned Batchelder
af609f103f
Merge pull request #9494 from edx/ned/move-recommender-tests
...
Move recommender XBlock tests to openedx/tests/external
2015-09-01 10:20:24 -04:00
Ned Batchelder
f925a4af9c
Move recommender XBlock tests to openedx/tests/xblock_integration
...
I want to make clear that these tests rely on XBlocks in other repos,
and that ideally in time we would move these tests into the XBlock repo.
2015-08-31 17:14:47 -04:00
clrux
5b545c2b0d
Revert "Course navigation menu accessibility issue"
2015-08-28 13:28:08 -04:00
clrux
52a8bc50cb
Merge pull request #9367 from edx/clrux/ac-76-course-nav
...
Course navigation menu accessibility issue
2015-08-28 13:27:44 -04:00
chrisndodge
69ddbc0dc4
Merge pull request #9370 from edx/cdodge/add-course-id-to-survey-answers
...
add the ability to persist the course_key where the user answered the…
2015-08-28 13:03:58 -04:00
Chris Rodriguez
c0bfdf5e5d
Removing instances of old mechanism; tests
2015-08-28 07:50:33 -04:00
Chris Rodriguez
c9b775bda2
wip test fixes
2015-08-28 07:50:33 -04:00
Ahsan Ulhaq
b32d2205d4
Course navigation menu accessibility issue
...
Following have been done
1- Change the structure of the course navigation Menu HTML
2- Add some basic styling
3- Add basic JS for html rendering
4- Update tests according to new structure
AC-76
2015-08-28 07:49:31 -04:00
Phil McGachey
9e6c44911d
[LTI Provider] Grade passback for non-leaf blocks.
...
This change allows graded assignments to be added to a campus LMS
regardless of the granularity at which the problem sits. Previously
a grade could only be returned if the usage ID for the problem itself
was specified in the LTI launch.
The code assumes that courses taking advantage of this functionality
are arranged in a hiearchy (with sections being parents to verticals,
and verticals being parents to problems). When a grading event occurs
it traverses the parent hiearchy to identify any previous graded LTI
launches for which the new scoring event should generate a grade
update. It then calculates and sends scores to each of those outcome
services.
Since grade calculation is an expensive operation, the code optimizes
the case where a problem has been added only once as a leaf unit. In
that case it is able to behave as before, just taking the grade from
the signal without having to calculate grades for the whole course.
2015-08-27 15:54:43 -04:00
Peter Fogg
38fb6eaede
Add signals for user's discussion activity.
...
These signals are caught by the Teams app and used to update
`last_activity_at` on both teams and individual users.
TNL-2497
2015-08-26 12:07:54 -04:00
David Ormsbee
6b12969ea2
Use bulk_operations in group access tests.
2015-08-24 01:00:36 -04:00
David Ormsbee
3d1ce45187
Switch TestRecommender to use SharedModuleStoreTestCase (for performance)
2015-08-21 13:41:09 -04:00
Chris Dodge
d3c08f89ed
add the ability to persist the course_key where the user answered the survey
2015-08-21 13:40:57 -04:00
Matt Drayer
ebed8cd42a
Merge pull request #9339 from edx/ziafazal/SOL-493
...
ziafazal/SOL-493: Fetch scores via ScoresClient
2015-08-20 10:20:48 -04:00
Ahsan Ulhaq
a495847b45
Merge pull request #9373 from edx/ahsan/ECOM-2114-Add-USD-to-prices-on-track-selection-pages
...
Add USD labels to prices on track selection pages
2015-08-20 00:37:27 +05:00
Ahsan Ulhaq
3d62580fc2
Add USD labels to prices on track selection pages
...
ECOM-2114
2015-08-19 23:59:15 +05:00
Chris Dodge
c08fbd1406
only include JS when feature flag is on and the course has proctoring enabled
2015-08-19 11:07:14 -04:00
Zia Fazal
05e2cc9402
fetch StudentModule via query-chunking
...
using ScoresClient instead of StudentModule
using ScoresClient without FieldDataCache
2015-08-19 12:57:32 +05:00