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

14331 Commits

Author SHA1 Message Date
Clinton Blackburn
1189867dd2 Removed references to ECOMMERCE_API_SIGNING_KEY 
We should not be using custom signing keys for each service at this time. We may want to return to this strategy in the future; but, this is not the direction any of our other services are going in.

ECOM-6541
 2017-02-01 01:51:21 -05:00
cahrens
0f3eb6e94c Fix safe template warning. 2017-01-31 13:43:36 -05:00
Christina Roberts
feb1c82d4d Merge pull request #14415 from edx/christina/tnl-6357 
Show checkmarks when "Show Answer" is clicked.
 2017-01-31 10:57:18 -05:00
cahrens
55712d1148 Show checkmarks when "Show Answer" is clicked. 
TNL-6357
 2017-01-31 09:55:08 -05:00
Vedran Karacic
7fe8e47554 [SOL-2133] Add user deactivation endpoint. 2017-01-31 11:34:26 +00:00
Saleem Latif
ab88da952b Update settings for edx-enterprise (v0.19.1) configurations. 2017-01-31 14:19:51 +05:00
Renzo Lucioni
1e929897f0 Merge pull request #14411 from edx/renzo/86-program-editor 
Remove the program admin tool from Studio
 2017-01-28 00:51:38 -05:00
Renzo Lucioni
31f5c8ddcb Remove the program admin tool from Studio 
All programs are now managed using the Django admin on the catalog service. This is the first in a series of commits removing use of the old programs service from edx-platform.

ECOM-4422
 2017-01-27 19:33:06 -05:00
Brian Jacobel
c407127db9 Use a capital letter where 'Required' is a separate sentence 2017-01-27 12:23:52 -05:00
Brian Jacobel
c67b8aa0bb Visually indicate fields in new post form are required 2017-01-26 15:48:35 -05:00
Ned Batchelder
8d791b5823 Use latest pyparsing 2.0.x to avoid setuptools entanglement 
With 2.0.1, and setuptools 34.0.2, errors happen like:

File "/edx/app/edxapp/venvs/edxapp-sandbox/local/lib/python2.7/site-packages/packaging/requirements.py", line 59, in <module>
    MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
TypeError: __call__() takes exactly 2 arguments (1 given)

(cherry picked from commit 73519b3547359a0b791e39d4665f51ac66449a17)
 2017-01-25 15:10:02 -05:00
asadiqbal
8f5ba0115c WL-606 2017-01-25 15:05:57 +05:00
John Eskew
ab190a8507 Merge pull request #14284 from open-craft/haikuginger/filter-by-block-name 
Restrict block ID comparison slightly to avoid false positives
 2017-01-24 19:32:14 -05:00
noraiz-anwar
44efc5aaf0 Merge pull request #14365 from edx/na/TNL-6333 
TNL-6333 Log play_video event after seek_video event
 2017-01-24 20:26:19 +05:00
Renzo Lucioni
4c9066cf4e Use switch to pull programs from the catalog for the student dashboard 
ECOM-4422
 2017-01-23 15:57:59 -05:00
noraiz-anwar
4679766655 Emit play_video event after seek_video event 2017-01-23 17:36:43 +05:00
alisan617
bcaeaffa7b Merge pull request #14338 from edx/alisan/inline-discussion-sort-TNL-6117 
Inline discussion sorting TNL-6117
 2017-01-20 10:48:35 -05:00
alisan617
f12dfae2d1 inline discussion component filtering and sorting 
TNL-6117
 2017-01-20 09:52:44 -05:00
Eric Fischer
f84f3c09d3 Merge pull request #14343 from edx/efischer/hide_after_end 
Revert "Merge pull request #14324 from edx/efischer/revertins"
 2017-01-18 13:51:04 -05:00
Jeff LaJoie
43c5cb2af8 Merge pull request #14307 from edx/jlajoie/TNL-5619 
Fixes submit button enablement on save/reset
 2017-01-18 11:40:28 -05:00
Eric Fischer
507e621ccc Revert "Merge pull request #14324 from edx/efischer/revertins" 
This reverts commit c7d2d601b8, reversing
changes made to fb2173f43e.
 2017-01-18 10:56:13 -05:00
Jeff LaJoie
139f91ebed TNL-5619: removes enable/disable all button methods to save button state and disable active, modifies tests for new functions 2017-01-18 10:48:32 -05:00
Ari Rizzitano
54a48a3227 [courseware] generate sequence-specific titles server-side (AC-695) 
[courseware] generate sequence-specific titles server-side (AC-695)

[courseware] generate sequence-specific titles server-side (AC-695)

case for empty subsections [AC-695]

move title logic into courseware context method [AC-695]

pep8

coffeescript -> js

js mistake

jslint

refactor sequence title generation slightly

missed a line

line too long

python is not javascript

ugh js

ugh js part 2
 2017-01-14 17:55:09 -05:00
alisan617
88e10e0ee8 sequence navs keyboard support and test update 2017-01-13 14:07:10 -05:00
Eric Fischer
4b794372cd Add registration tracks as valid bulk_email targets 
Hackathon XV project
 2017-01-12 15:05:49 -05:00
Eric Fischer
0b620ebbc1 Revert "Merge pull request #14225 from edx/efischer/tnl-6108" 
This reverts commit 8b8cf5f9e0, reversing
changes made to 2716ffbf8e.
 2017-01-12 13:50:05 -05:00
Gregory Martin
eea2518452 Merge pull request #14299 from edx/yro_change-display-helptext 
change help strings
 2017-01-12 12:15:20 -05:00
Eric Fischer
6845c64977 Hide after course end 
Hijacks the existing hide_after_due field to be repected as "hide after course
end" for self-paced courses. Includes tests.

TNL-6108
 2017-01-12 09:12:54 -05:00
Gregory Martin
e1e47793df change help strings 2017-01-12 09:02:28 -05:00
Jeff LaJoie
62d129fdab Merge pull request #14298 from edx/jlajoie/TNL-6095 
Adds trailing_text id to input describedby
 2017-01-10 15:21:44 -05:00
Anthony Mangano
2d85fe4ab2 Merge pull request #14279 from edx/ECOM-5936-send-course-id-and-enrollment-track-to-zendesk-custom-fields 
Ecom 5936 enable users to select course when making support requests
 2017-01-10 10:55:51 -05:00
Jeff LaJoie
1c0a60ebc4 TNL-6095: adds trailing_text id and adds to describedby_html, updates tests 2017-01-10 10:27:59 -05:00
Brian Jacobel
f58076e726 Don't hijack existing context to do this 2017-01-10 10:00:23 -05:00
Brian Jacobel
30f62203e2 Hide read state on profile pages. Add tests for read state generally 2017-01-10 10:00:23 -05:00
Jesse Zoldak
deb9e53942 Merge pull request #14295 from edx/zoldak/TE-1927 
Skip the youtube acceptance tests  TE-1927
 2017-01-10 09:27:48 -05:00
Clinton Blackburn
b14a8d6403 Updated factory-boy to 2.8.1 
ECOM-4422
 2017-01-10 09:20:05 -05:00
Jesse Zoldak
d87c9c412e Skip the youtube acceptance tests TE-1927 2017-01-10 08:21:15 -05:00
noraiz-anwar
b967538fee Merge pull request #14275 from edx/revert-14216-noraiz/TNL-6197 
Revert "Error while exporting course with too long filename"
 2017-01-10 16:01:55 +05:00
Anthony Mangano
38d8017db4 more pylint fixes 2017-01-09 12:38:18 -05:00
Anthony Mangano
8e1eafd1d4 test fix 2017-01-09 11:34:05 -05:00
Anthony Mangano
4de65abbaa pylint fixes 2017-01-09 11:33:04 -05:00
Anthony Mangano
6296b0c968 clean up tests for feedback form view 2017-01-06 21:44:59 -05:00
Jesse Shapiro
4bf05c02df Update comment; update tests 2017-01-06 21:02:07 -05:00
Anthony Mangano
d3afb3c1c2 dont send blank course_ids to Zendesk or Datadog 2017-01-06 18:15:19 -05:00
Jesse Shapiro
8f5d949d87 Restrict block ID comparison slightly to avoid false positives 2017-01-06 16:47:35 -05:00
Anthony Mangano
69ae314dd8 enable users to select course when making support requests 
ECOM-5936
 2017-01-06 13:34:13 -05:00
Christina Roberts
adc3c8f89c Merge pull request #14134 from edx/christina/jsinput-newtemplate 
New jsinput example problem
 2017-01-06 10:29:59 -05:00
Christina Roberts
7c7b4da79a Merge pull request #14269 from edx/christina/tnl-6041 
Remove flaky decorator from test_capa_module
 2017-01-06 09:47:31 -05:00
Anthony Mangano
00b0eefe2c Merge pull request #14217 from edx/ECOM-5936-add-display-name-to-enrollment-api-response 
Add course_name to enrollment api responses
 2017-01-05 16:30:38 -05:00
cahrens
ed614448e4 Cleanup of status. 
Also remove unused empty jsinput_css.css.
 2017-01-05 16:09:23 -05:00