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

12513 Commits

Author SHA1 Message Date
David Baumgold
34ac9db328 Merge pull request #10021 from mitocw/enhancement/aq/remove_gradebook_draging 
Add scrolling with dragging and added tool tip to student record.
 2015-10-09 10:59:55 -04:00
Matt Drayer
06129ada30 Merge pull request #8788 from edx/mattdrayer/eliminate-base-distinguished 
mattdrayer/eliminate-base-distinguished: Switch back to honor/verified
 2015-10-09 09:36:08 -04:00
Matt Drayer
31cbef709a mattdrayer/eliminate-base-distinguished: Switch back to honor/verified 
* talbs: Remove obsolete stuff
* frrrances: remove base and distinguished sass references and image assets
* mattdrayer: Cleaned up JSON syntax for test setups
 2015-10-09 00:29:42 -04:00
Amir Qayyum Khan
8b6c3757fe Removed dragging and added tool tip to student record. 
Clarify and reformat some comments; rename a few functions to clarify those.

Convert tabs to spaces.

Fix inaccurate comment

Fixed jshint issues

Adjust how user-select is applied to the gradebook view. Add i18n for a string.

Allow selection when not dragging.
 2015-10-08 15:47:10 -04:00
clrux
f6d3471106 Merge pull request #10086 from edx/clrux/ac-76-test-cleanup 
Fixing JS tests for the accordion navigation
 2015-10-08 12:17:21 -04:00
Chris Rodriguez
a631a662df Fixing JS tests for the course navigation 2015-10-08 09:43:25 -04:00
Peter Pinch
ec023c22e6 Merge pull request #10034 from mitocw/fix/gdm/hide_block_from_ccx 
Fixed visibility of hidden blocks in CCX schedule
 2015-10-08 08:54:02 -04:00
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
frances botsford
416ab258ee Merge pull request #9879 from edx/frances/cleanup-on-demand-box-style 
Align On-demand cert message with pattern library styles
 2015-10-07 16:39:48 -04:00
Calen Pennington
624bc9a734 Merge pull request #9911 from cpennington/fix-plat-858 
Delete DIRECT_ONLY_CATEGORIES from both draft and published branches by default
 2015-10-07 14:41:40 -04:00
Andy Armstrong
8914aaf8d4 Refactor discussions code to address flaky test 
TNL-3247

Removed remaining synchronous AJAX calls from discussions
Updated the profile view tests to use an attached view for testing
Removed one-time JQuery intiialization that could fail and break multiple tests
 2015-10-07 11:22:48 -04:00
Clinton Blackburn
c1686a939c Merge pull request #10072 from edx/release 
Hotfixes for 2015-10-06
 2015-10-07 10:09:03 -04:00
Giovanni Di Milia
f2a1d0e54b Coaches can't see blocks "hide from students" 
If a block is marked as "hide from students" cannot be seen in the
CCX schedule
 2015-10-07 09:07:29 -04:00
chrisndodge
c044099044 Merge pull request #10074 from edx/muhhshoaib/SOL-1267-ecommerce-tab-lost-expand-collapse-regions 
SOL-1267 eCommerce tab on Instructor Dashboard has lost the expand/collapse regions
 2015-10-07 08:56:12 -04:00
Muhammad Shoaib
f876f3f457 SOL-1267 
-fixed the bug in the accordion of the e-commerce html file
 2015-10-07 13:58:46 +05:00
Chris Dodge
8609f80db0 Add email and manual enrollment reason into the Enrollment Report 2015-10-06 22:34:54 -04:00
Clinton Blackburn
be4f37f26b Credit fixes 
- Fixed receipt page button
- Fixed message on dashboard

ECOM-2492
 2015-10-06 17:51:39 -04:00
Calen Pennington
f8f9b91c16 Make unpublish raise the same errors in split and old-mongo when asked to unpublish a DIRECT_ONLY_CATEGORY 2015-10-06 16:54:34 -04:00
Edward Zarecor
8afb36057b Merge pull request #10060 from edx/release 
Release
 2015-10-06 15:51:43 -04:00
Clinton Blackburn
2653f0ad6b Fixed credit form submission bug 
Firefox requires the form to be attached to a DOM element

ECOM-2492
 2015-10-06 11:49:45 -04:00
Usman Khalid
111a45664c Use settings.PIPELINE_ENABLED instead of settings.FEATURES[USE_DJANGO_PIPELINE]. 2015-10-06 19:52:38 +05:00
Usman Khalid
dbcd1bf430 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-06 19:52:38 +05:00
Usman Khalid
130bbd7993 Upgrade to django-pipeline v1.5.3. 
TNL-3137
 2015-10-06 19:52:38 +05:00
Calen Pennington
7e55437db6 Allow retry_failed_photo_verifications to take a list of receipt_ids to retry 2015-10-05 22:46:45 -04:00
Calen Pennington
e57619b007 When retrying, use the previously copied photo_id 2015-10-05 22:46:45 -04:00
Peter Fogg
7f4bd900d1 Add management command to set SoftwareSecure verification status. 2015-10-05 22:46:45 -04:00
zubair-arbi
c78b1be515 add new column 'copy_id_photo_from' for 'SoftwareSecurePhotoVerification' model to track initial verification with 'photo_id_key' 2015-10-05 22:46:45 -04:00
Clinton Blackburn
17f0193362 Merge pull request #10044 from edx/merge-release-into-master 
Merging changes for hotfix/2015-10-05
 2015-10-05 16:11:31 -04: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
Clinton Blackburn
f967cfce8b Merged release to master 
Resolved conflicts from hotfix-2015-10-05
 2015-10-05 14:46:32 -04:00
Brian Beggs
0ca679e244 Revert "Upgrade django-pipeline and staticfiles" 2015-10-05 14:40:28 -04:00
Ned Batchelder
b7cf392009 Merge pull request #10027 from edx/ned/better-immutable-field-exception 
Include a message in the teams.ImmutableMembershipFieldException
 2015-10-05 14:36:03 -04:00
Clinton Blackburn
0dba843608 Multiple credit fixes 
- Added support for Unicode characters when creating the signature
- Using <textarea> for form data to support newline characters
- Generating form with jQuery instead of relying on existing DOM element
- Removed duplicated credit request code
- Corrected spaing on dashboard
- Enabled functionality by default

Dashboard cleanup
-- Cleaned styles
-- Added wrapper class to use for hiding the actions
-- Cleaned JS toggling of error container
-- Corrected dashboard and receipt text

ECOM-2172
 2015-10-05 09:35:10 -04:00
Matt Drayer
1d121b81c6 Merge pull request #10012 from edx/ziafazal/MAYN-129 
MAYN-129: additional payment details were not shown
 2015-10-05 07:56:57 -04:00
Matt Drayer
890a675054 Merge pull request #10005 from edx/saleem-latif/MAYN-131-complete-fix 
MAYN-131: Update Unsupported Browser message
 2015-10-05 07:50:38 -04:00
Ned Batchelder
84a94c2358 Include a message in the teams.ImmutableMembershipFieldException 
Also add a __repr__ to CourseTeam so that it could be useful too.
 2015-10-02 15:00:01 -04:00
Brian Beggs
5550ca30b1 Merge pull request #9999 from edx/bbeggs/TNL-3452-master 
Fixed select_related fields for course embargos and the mobile user api. TNL-3452
 2015-10-02 13:55:30 -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
Diana Huang
7bfb1127f5 Merge pull request #9771 from edx/diana/add-team-to-reports 
Add team column to grade reports.
 2015-10-02 09:35:25 -04:00
Usman Khalid
2b59d46a31 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-02 18:26:25 +05:00
Usman Khalid
98df2336f3 Upgrade to django-pipeline v.1.5.3. 
TNL-3137
 2015-10-02 18:26:25 +05:00
Peter Pinch
94d5f736bf Merge pull request #9986 from mitocw/fix/jf/enroll-ccx-coaches 
Enroll CCX coaches in the courses to which they're added
 2015-10-02 08:13:32 -04:00
Zia Fazal
460b19fa1b fixed form submit selector 
reduced left margin
 2015-10-02 16:57:23 +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
Sarina Canelake
972196fe3f Merge pull request #9978 from mitocw/fix/gs/min_count_keyerror 
Fixed KeyError in CCX
 2015-10-01 15:43:28 -04:00