Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,246 Commits 1 Branch 0 Tags
64a142d0e6da36a899d84bb100e42e7cd171ba99
Commit Graph

31246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
64a142d0e6 Merge pull request #8763 from edx/sarina/mark-tests-as-flaky 
Mark test as flaky; TNL-2647
 2015-07-02 12:08:27 -04:00
frances botsford
05249d590f Merge pull request #8697 from edx/frances/fix/lmsbigwindow 
InstrDash and Wiki content responsive
 2015-07-02 11:40:20 -04:00
Andy Armstrong
281ebaa3b3 Merge pull request #8683 from edx/andya/run-optimized-devstack 
Support running Studio with optimized assets
 2015-07-02 11:39:37 -04:00
Sarina Canelake
d5b26c7f8c Mark test as flaky; TNL-2647 2015-07-02 11:18:09 -04:00
Jesse Zoldak
3de778b78c Merge pull request #8757 from edx/zoldak/7000 
Lower pylint threshold to 7000!
 2015-07-02 10:43:27 -04:00
Jesse Zoldak
7a852b0b1c Lower pylint threshold to 7000! 2015-07-02 09:04:28 -04:00
Andy Armstrong
85814f0bbf Support running Studio with optimized assets 2015-07-01 18:22:31 -04:00
Ned Batchelder
9d5b5658a4 Merge pull request #8552 from edx/ned/smarter-mako-caching 
Make edxmako cache properly with changing lookup paths
 2015-07-01 17:47:04 -04:00
Adam
10c9912b47 Merge pull request #8740 from edx/revert-8672-aj/tnl2551-randomized-problems-not-working 
Revert "Fixed randomized problems which were not appearing to work."
 2015-07-01 16:27:24 -04:00
Awais Jibran
c93d48249d Fixed quality report 2015-07-02 00:29:50 +05:00
Awais Jibran
5306ac02b0 Revert "Fixed randomized problems which were not appearing to work." 2015-07-02 02:35:54 +05:00
Sarina Canelake
4f991ebaab Merge pull request #8718 from open-craft/smarnach/add-poll-xblock 
Add the Poll XBlock to the requirements.
 2015-07-01 14:00:42 -04:00
Sven Marnach
e8398b571e Add the Poll XBlock to the requirements and ADVANCED_COMPONENT_TYPES. 2015-07-01 18:34:10 +02:00
Braden MacDonald
cd3abf37cd Merge pull request #8733 from open-craft/fix-shibboleth-fetch 
Fix errors with fetching Shibboleth metadata
 2015-07-01 09:17:52 -07:00
Kelketek
c676bf0460 Merge pull request #8679 from open-craft/recursive_state_reset 
Make resetting of attempts and student state on blocks recursive. (SOL-858)
 2015-07-01 10:05:42 -05:00
frances botsford
b127bfe0c7 Merge pull request #8468 from edx/frances/teams-listings 
Team card/listing
 2015-07-01 11:04:10 -04:00
Awais Jibran
9e0ed9b759 Merge pull request #8672 from edx/aj/tnl2551-randomized-problems-not-working 
Fixed randomized problems which were not appearing to work.
 2015-07-01 19:04:36 +05:00
Peter Fogg
69b90275a3 Merge pull request #8690 from edx/peter-fogg/fix-passing-grades 
Fix not being able to set course passing grades above 80%.
 2015-07-01 09:56:21 -04:00
Peter Fogg
890cd6a470 Add grading spec tests. 2015-07-01 09:08:39 -04:00
Peter Fogg
46ea862f04 Fix not being able to set course passing grades above 80%. 2015-07-01 09:08:39 -04:00
Awais Jibran
e64ae13a34 Fixed randomized problems which were not appearing to work. 
TNL-2551
 2015-07-01 16:34:34 +05:00
Ahsan Ulhaq
36e31e10e4 Merge pull request #8687 from edx/ahsan/ECOM-1782-Order-Credit-Eligibility-line-items-progress-page 
Order of Credit Eligibility line items
 2015-07-01 14:45:33 +05:00
Ahsan Ulhaq
7787974dd5 Order of Credit Eligibility line items 
Displayed eligibility line items on the Progress page of a Credit course
in the order of appearance in the courseware.

ECOM-1782
 2015-07-01 13:40:39 +05:00
Braden MacDonald
4487b6d184 Fix errors with fetching Shibboleth metadata 2015-06-30 20:50:45 -07:00
Clinton Blackburn
1ee3094dd3 Merge pull request #8670 from edx/clintonb/course-mode-api 
Added Courses endpoint for Commerce API
 2015-06-30 23:29:55 -04:00
Clinton Blackburn
45de93a250 Added course endpoints for Commerce API 
XCOM-314
 2015-06-30 22:36:47 -04:00
Renzo Lucioni
39dadb57f0 Merge pull request #8698 from edx/renzo/fulfillment-logging 
Improve logging of ecommerce interactions
 2015-06-30 21:31:41 -04:00
Sarina Canelake
5f95226b00 Merge pull request #8731 from Stanford-Online/aliang8/missing-comma 
Add missing comma to tuple
 2015-06-30 18:20:02 -04:00
Renzo Lucioni
d330831871 Improve logging of ecommerce interactions 
Adds standardized audit logging for checkout and enrollment change requests. XCOM-427.
 2015-06-30 17:34:16 -04:00
Albert Liang
fe19d0cc7e Add Albert Liang to AUTHORS 2015-06-30 14:17:14 -07:00
Albert Liang
4b332bfcf0 Add missing comma to tuple 
Currently, Python implicitly concatenates two string entries located next to
each other because there is no comma separating them.  The code concatenates
"*.pyc" and "sass/*.scss", creating a single entry called "*.pycsass/*.scss".
 2015-06-30 14:02:07 -07:00
Braden MacDonald
e145d7f855 Merge pull request #8699 from open-craft/sso-a11y 
Improve screen reader user experience on logistration page
 2015-06-30 11:11:38 -07:00
David Baumgold
a9c67c562e Merge pull request #8527 from edx/db/ensure-noseids-dir-exists 
Ensure noseid dir exists when running tests
 2015-06-30 10:03:56 -04:00
Muhammad Ammar
06a1486934 Merge pull request #8450 from edx/ammar/tnl2303-course-outline-ora1-warning-message 
Display message on course outline in Studio when course contains ORA 1
 2015-06-30 15:04:02 +05:00
muhammad-ammar
b0eda4cac9 Display warning message on course outline in Studio when course contains deprecated features/components 
TNL-2303
 2015-06-30 13:26:18 +05:00
Braden MacDonald
49d200c7ec Improve screen reader user experience on logistration page 2015-06-29 14:38:41 -07:00
Alison Hodges
1a9a69829a Merge pull request #8712 from edx/ahodges/template_typo 
Fixes DOC-1957
 2015-06-29 17:00:28 -04:00
Frances Botsford
15b9104471 generic and Team card/listing FED 
adjusting styles for teams cards
 2015-06-29 16:14:07 -04:00
Alison Hodges
caa6a07d15 Fixes DOC-1957 2015-06-29 13:48:11 -04:00
Christopher Lee
a26b00ba41 Merge pull request #8656 from edx/gprice/discussion-api-set-group-id 
Allow group_id to be set in discussion API
 2015-06-29 12:02:29 -04:00
Awais Qureshi
1aa074da8a Merge pull request #8606 from edx/awais786/ECOM-1597-min-grade-update-with-signals 
Awais786/ecom 1597 min grade update with signals
 2015-06-29 20:26:34 +05:00
Greg Price
b8576e74d6 Allow group_id to be set in discussion API 
This also fixes two bugs:
* A thread created by a non-privileged user in a cohorted course would
  not have group_id set
* Any user could set the endorsed field on creation of a comment
 2015-06-29 11:08:03 -04:00
Christina Roberts
1e8ebc807d Merge pull request #8705 from edx/christina/delete-dead-code 
Delete unused student_profile code (WIP profile).
 2015-06-29 09:43:29 -04:00
Jonathan Piacenti
412f120547 Make resetting of attempts and student state on blocks recursive. 2015-06-29 13:08:01 +00:00
cahrens
a4da143ca6 Delete unused student_profile code (WIP profile). 2015-06-29 08:56:11 -04:00
Sarina Canelake
0b42c7724f Merge pull request #8701 from edx/sarina/20150628-update-translations 
Update translations (autogenerated message)
 2015-06-29 08:49:39 -04:00
Sarina Canelake
bd37853e45 Update translations (autogenerated message) 2015-06-29 08:42:06 -04:00
Sarina Canelake
13dc7ed485 Fix i18n paver command wrt cleanup 2015-06-29 08:23:14 -04:00
Sarina Canelake
65d68a888f Merge pull request #8694 from edx/sarina/default-OpenedX-no-search 
Set Courseware Search to False in default devstack, because it doesn't work.
 2015-06-29 07:45:34 -04:00
Davorin Šego
fe9887a99c Merge pull request #8389 from edx/dsego/SOL-734 
Make header & footer responsive
 2015-06-29 13:15:13 +02:00