Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Syed Hassan Raza
482b31b9a4 Handle dates have year smaller than 1900 2015-06-30 14:07:26 +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
Braden MacDonald
751e98d505 Merge pull request #8713 from open-craft/fix-pr-8658-lib-create-form 
Fix: users without course creation permission were not shown new libr…
 2015-06-29 14:15:34 -07:00
Alison Hodges
f4209803f2 Remove "instructor" label or change to "Admin" 
Clarifies what the roles are, makes Studio and LMS naming parallel.
 2015-06-29 17:03:18 -04:00
Alison Hodges
1a9a69829a Merge pull request #8712 from edx/ahodges/template_typo 
Fixes DOC-1957
 2015-06-29 17:00:28 -04:00
Adam Palay
4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 
Conflicts:
	requirements/edx/github.txt
 2015-06-29 16:55:57 -04:00
Adam
9c40dd924c Merge pull request #8709 from edx/hotfix/2015-06-29 
update xblock only to mark field values as dirty if they've changed (…
 2015-06-29 16:51:00 -04:00
Frances Botsford
15b9104471 generic and Team card/listing FED 
adjusting styles for teams cards
 2015-06-29 16:14:07 -04:00
Braden MacDonald
4e9db25281 Fix: users without course creation permission were not shown new library form 2015-06-29 13:14:04 -07:00
Adam Palay
61431015c2 update xblock only to mark field values as dirty if they've changed (TNL-2475) 
force save "download_video" field if not set

set timezone to UTC explicitly
 2015-06-29 14:28:45 -04:00
Alison Hodges
caa6a07d15 Fixes DOC-1957 2015-06-29 13:48:11 -04:00
Will Daly
14b48ed38e Merge pull request #8710 from edx/will/ecom-1801 
Fix login/logout errors caused by unicode cookie names
 2015-06-29 10:14:50 -07:00
Will Daly
4632a07c07 Fix login/logout errors caused by unicode cookie names 2015-06-29 09:23:15 -07: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
Davorin Sego
2c22a4d879 Responsive Homepage Hero, Header, Footer 2015-06-29 12:14:55 +02:00
dino-cikatic
f5275a54e8 Merge pull request #8575 from edx/dcikatic/fix-search-engine-set 
Fix SEARCH_ENGINE set logic in settings files
 2015-06-29 12:06:39 +02:00
Awais
b8e04f30a1 ECOM-1597 adding signals to update min-grade requirement. 2015-06-29 15:01:19 +05:00
Zia Fazal
bcbd1464d4 New course cannot be started till web certificate is active 
fixed broken test

changes based on feedback on 6/24

fixed broken unit test after feedback changes

added more checks and updated tests

fixed broken bok choy test

Fixed pylint quality error

trying to fix pylint quality error
 2015-06-29 12:53:21 +05:00
Sarina Canelake
614bcafb7c Merge pull request #8696 from edx/sarina/update-i18n-tools 
Update i18n-tools to latest version LOC-67
 2015-06-28 04:16:16 -04:00
Sarina Canelake
e83e88172b Don't i18n test files 2015-06-26 17:50:21 -04:00
Sarina Canelake
ed51fe0d74 Update i18n-tools to latest version 2015-06-26 17:29:25 -04:00
Braden MacDonald
072ae99d12 Merge pull request #8140 from edx/feature/shibboleth-tpa 
Feature: Shibboleth/SAML SSO
 2015-06-26 14:17:24 -07:00
David Ormsbee
936256715d Merge pull request #8620 from mcgachey/lti-deployment 
[LTI Provider] Added an authentication backend to log in LTI users
 2015-06-26 17:16:52 -04:00
Frances Botsford
9969549b3a fix for instr dash and wiki responsive 2015-06-26 17:04:20 -04:00
Diana Huang
42d8091b49 Merge pull request #8688 from edx/diana/polling-cleanup 
Clean up capa polling to have exponential backoff
 2015-06-26 17:00:53 -04:00
Braden MacDonald
cf308d87b9 New Hinted Login View - PR 8591 2015-06-26 13:24:01 -07:00
Braden MacDonald
7437bcfe12 New provider config options, New Institution Login Menu - PR 8603 2015-06-26 13:24:01 -07:00
Braden MacDonald
5bf0b1794d Bump python-social-auth and python-same to upstream's latest master - PR 8599 2015-06-26 13:24:00 -07:00
Braden MacDonald
00226bf3c0 Asynchronous metadata fetching using celery beat - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
cd941eada7 New SAML/Shibboleth tests - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
b4904adc1e Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155 2015-06-26 13:23:59 -07:00
Braden MacDonald
caca3e1bdf SAML2 third_party_auth provider(s) - PR 8018 2015-06-26 13:23:59 -07:00
Chris
454986a029 Merge pull request #7589 from jolyonb/jbloomfield/printing-checkmarks 
Making background pictures printable
 2015-06-26 16:20:34 -04:00
Diana Huang
254d6c6821 Put a timeout on poling for codeinput and matlab problems. 2015-06-26 15:29:49 -04:00
Adam
2de67bd34d Merge pull request #8680 from edx/hotfix/2015-06-25 
fix the source_version xblock after discard changes
 2015-06-26 15:29:48 -04:00
Sarina Canelake
c7c11f2e4b Set Courseware Search to False in default devstack, because it doesn't work 2015-06-26 15:21:39 -04:00
Sarina Canelake
2942846afe Merge pull request #8667 from edx/sarina/update-middleware-LOC-87 
Fix dark lang and django.middleware.locale behaviors
 2015-06-26 15:17:32 -04:00