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

33507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
dba67df23f Merge pull request #10382 from jzoldak/zoldak/adjust-circle-parallelism 
Adjust circleCI config for parallelism
 2015-10-27 14:16:31 -04:00
Nimisha Asthagiri
c032fefc74 Merge pull request #10364 from edx/mobile/graph_traversals 
Reusable Graph Traversals
 2015-10-27 14:00:01 -04:00
Michael Frey
bb53cad0fa Merge pull request #10377 from edx/release 
Release
 2015-10-27 13:10:49 -04:00
Peter Pinch
cda95d7a28 Merge pull request #10251 from mitocw/fix/jf/enroll-coach-on-create-ccx 
Enroll the coach in the CCX on creation
 2015-10-27 12:44:15 -04:00
Jesse Zoldak
0b8e6bc0e4 Adjust circleCI config for parallelism 2015-10-27 11:57:45 -04:00
Nimisha Asthagiri
22c2e7e54c Reusable Graph Traversals 2015-10-27 10:54:28 -04:00
Michael Frey
e69bc6c4e1 Merge pull request #10332 from edx/rc/2015-10-27 
Rc/2015 10 27
 2015-10-27 10:41:00 -04:00
Matt Drayer
d39d0cf55b Merge pull request #10370 from edx/asadiqbal08/SOL-1312-text-update 
SOL-1312 nit clean
 2015-10-27 10:07:31 -04:00
Jim Abramson
edf09d84e9 Merge pull request #10350 from edx/jsa/ecom-2657 
Programs: added platform support package and configuration model.
 2015-10-27 09:10:23 -04:00
asadiqbal
b2497a5112 nit 2015-10-27 16:14:30 +05:00
Nimisha Asthagiri
b1ae462ab7 Merge pull request #10361 from edx/mobile/refactor-has-access 
Refactor has_access for re-usability.
 2015-10-26 18:15:09 -04:00
Sarina Canelake
54394cf7b2 Merge pull request #10325 from stvstnfrd/debt/wiki-image 
Remove disabled wiki plugin
 2015-10-26 17:48:59 -04:00
Sarina Canelake
6bbc37de9a Merge pull request #10287 from open-craft/validate-utils-gettext-extraction 
Extract translatable strings from edx.utils.validate.js.
 2015-10-26 17:45:21 -04:00
Arbab Nazar
cabe396a46 Merge pull request #10368 from edx/arbab/change-author-file 
added name to the AUTHORS file
 2015-10-26 17:38:25 -04:00
Nimisha Asthagiri
95fdbd981c Refactor has_access for re-usability. 2015-10-26 16:26:41 -04:00
Sarina Canelake
f5e4c74e7b Merge pull request #10213 from mitocw/feature/skm/add_tests#95 
Adds more tests for get_student_grade_summary_data.
 2015-10-26 14:47:59 -04:00
arbabnazar
c3d5016c9d added name to the AUTHORS file 2015-10-26 13:51:47 -04:00
Christina Roberts
e05fa4b313 Merge pull request #10362 from edx/christina/revert-mathjax 
Revert to version 2.4 of MathJax.
 2015-10-26 13:49:49 -04:00
Clinton Blackburn
6a10861b20 Merge pull request #10346 from edx/clintonb/credit-api-update 
Updated CreditCourse update endpoint
 2015-10-26 13:29:00 -04:00
Nimisha Asthagiri
e726d01d46 Merge pull request #10360 from edx/mobile/start_date_reuse 
Reuse DEFAULT_START_DATE
 2015-10-26 12:28:21 -04:00
Jamie Folsom
a3a7ff2428 Enroll the coach in the CCX on creation 
Make the course URL pattern more generic.

Comment newly added functionality.

Fix quality issues.

Address two lint errors, with regex and variable naming.

Changed how we access course_key and course_id.

Replace another instance of self.course.id.to_deprecated_string()

Remove unused import, add missing one.

Improve how the ccx key is extracted from the URL

Use resolve() instead of os.path to get the course_id.

Remove the granting of staff access to coaches.
 2015-10-26 11:35:01 -04:00
cahrens
87f0df3501 Revert to version 2.4 of MathJax. 
TNL-3693
 2015-10-26 11:28:40 -04:00
Nimisha Asthagiri
cdab4266a1 Reuse DEFAULT_START_DATE definition. 2015-10-26 11:15:48 -04:00
Piotr Mitros
9edc5310e3 Merge pull request #10359 from edx/pmitros/rc-2015-10-27-ratexblock-patch 
Add RateXBlock
 2015-10-26 10:38:32 -04:00
Piotr Mitros
d3c6425af2 Add RateXBlock 2015-10-26 10:32:53 -04:00
Christine Lytwynec
03236cbfca Merge pull request #10116 from edx/clytwynec/custom-a11y-rules 
Update bok choy to v0.4.7
 2015-10-26 10:15:31 -04:00
chrisndodge
7157affadf Merge pull request #10356 from edx/cdodge/fix-orm-query 
be sure to add a all() to the ORM statement otherwise the select_subc…
 2015-10-26 10:08:05 -04:00
Piotr Mitros
da709bbcb6 Merge pull request #8597 from edx/pmitros/RateXBlock 
XBlock for rating course content
 2015-10-26 10:06:36 -04:00
Matt Drayer
a2fa59cd4b Merge pull request #10308 from edx/ziafazal/SOL-1332 
SOL-1332: use a generic function to check if entrance_exam feature is enabled or not
 2015-10-26 09:46:22 -04:00
Matt Drayer
487a894fd7 Merge pull request #10264 from edx/ziafazal/log-exception-in-custom-500-handling 
log exception in the logs to debug issue on production or sandbox environments
 2015-10-26 09:41:53 -04:00
Awais Qureshi
034f201588 Merge pull request #10136 from edx/aamir-khan/ECOM-2430-event-tracking 
ECOM-2430: Added the tracking GA events on dashboard
 2015-10-26 14:46:11 +05:00
jsa
1bb29289f2 Programs: added platform support package and configuration model. 
ECOM-2657
 2015-10-25 21:30:26 -04:00
Clinton Blackburn
98a39b922e Updated CreditCourse update endpoint 
The update (PUT) endpoint now supports creating new CreditCourse objects in addition to updating existing ones. This functionality greatly simplifies the logic needed by consumers (e.g. the Course Administration Tool) to create or update CreditCourse objects.

ECOM-2524
 2015-10-24 20:13:54 -04:00
Clinton Blackburn
4091bd1506 Merge pull request #10338 from edx/clintonb/private-settings-load 
Failing startup if private settings fail to load
 2015-10-24 19:34:18 -04:00
Clinton Blackburn
7c6a30f16d Failing startup if private settings fail to load 
Squashing private settings import errors leads to wasted developer time when developers expect settings to be in place, and they aren't. This change only loads private settings if the private.py file exists. If there is an error during the import of that file, the application will not start.

ECOM-2653
 2015-10-24 17:22:16 -04:00
Ben Patterson
89561d2f24 Merge pull request #10345 from edx/revert-8942-bdero/import-export-reprise 
Revert "Public Course Import/Export API (continued)"
 2015-10-23 20:52:47 -04:00
Ben Patterson
1032d37271 Revert "Public Course Import/Export API (continued)" 2015-10-23 20:02:34 -04:00
Bill DeRusha
cda5c52f0e Merge pull request #10330 from edx/bderusha/unenroll-certs 
Conditionally show unenroll action based on certificate status
 2015-10-23 17:51:00 -04:00
Peter Pinch
e7708e5a04 Merge pull request #8942 from mitocw/bdero/import-export-reprise 
Public Course Import/Export API (continued)
 2015-10-23 15:03:38 -04:00
Bill DeRusha
60fc3f5705 Conditionally show unenroll action based on certificat status 2015-10-23 14:59:17 -04:00
Matt Drayer
5c1789006d Merge pull request #10291 from edx/asadiqbal08/SOL-1312-solution 
SOL-1312 changes
 2015-10-23 12:00:35 -04:00
David Baumgold
ab8edc222c Merge pull request #10319 from edx/sarina/20151022-update-translations 
Update translations (autogenerated message)
 2015-10-23 11:47:01 -04:00
aamir-khan
2376bbb4be ECOM-2430: Added the tracking GA events on dashboard 2015-10-23 19:20:23 +05:00
frances botsford
f6a1a0df31 Merge pull request #10321 from edx/frances/teams-post-style-fix 
Teams Discussion Post Style Fixes
 2015-10-23 10:07:22 -04:00
Christina Roberts
e3369bebee Merge pull request #10323 from edx/christina/tnl-3679 
Mark as flaky.
 2015-10-23 09:32:21 -04:00
Christine Lytwynec
7d24e5186b update bokchoy version 2015-10-23 09:17:20 -04:00
Feanil Patel
61241ae976 Merge pull request #10300 from edx/feanil/circle_ci 
Feanil/circle ci
 2015-10-23 08:24:12 -04:00
stv
d57f6ab628 Remove disabled wiki plugin 
So apparently, "Image Embedding Extension for Python-Markdown" was never
actually enabled. When it was introduced [1], it was already commented
out!?

[1] 93d15d15d0
 2015-10-22 18:08:31 -07:00
Braden MacDonald
2d084f7610 Merge pull request #10320 from open-craft/pb-version-bump 
Bump problem builder XBlock version to include PR 80
 2015-10-22 16:08:20 -07:00
cahrens
bdd30162ed Mark as flaky. 
TNL-3679
 2015-10-22 17:08:06 -04:00