Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,377 Commits 1 Branch 0 Tags
10b33c8a8d8a91faec721fde2579dcc88d37fa96
Commit Graph

14131 Commits

Author SHA1 Message Date
Douglas Hall
062e0506ef Merge pull request #13977 from edx/afzaledx/wl-693-contact-us-form-in-email 
submit_feedback function now conditionally sends emails.
 2016-11-17 10:11:08 -05:00
Albert (AJ) St. Aubin
863aa78bdf Merge pull request #13933 from edx/aj/TNL-1955_save_ui 
Initial set of changes for ui correctness state when saving a problem
 2016-11-16 14:57:27 -05:00
Albert St. Aubin
866399ba05 Changes for ui correctness state when saving a problem 
TNL-1955
 2016-11-16 12:30:04 -05:00
Afzal Wali
131ca13a50 Added the templates for email subject, email body and the changes in submit_feedback function that now conditionally sends emails. 
Suggestions.
 2016-11-16 12:12:00 -05:00
Ahsan Ulhaq
2157202aaf Add log info for course enrollment 
ECOM-4763
 2016-11-16 12:00:28 +05:00
Christina Roberts
9fc0138225 Merge pull request #13836 from eduNEXT/fmo/unicode_username_fixes 
Quick fixes for users with unicode usernames.
 2016-11-15 14:27:03 -05:00
Jesse Shapiro
c8135adf12 Merge pull request #13910 from open-craft/haikuginger/sol-2071 
Increase polling rate to wait for mini-notification
 2016-11-10 21:23:13 -05:00
Jesse Shapiro
dffe3e0780 Update wait for mini-notification in testing to be more fine-grained; remove flaky test decorator 2016-11-10 15:08:08 -05:00
Awais Jibran
e26849891d Merge pull request #13939 from edx/aj/fix-discussion-user-roles 
Fix discussion user roles
 2016-11-10 18:41:12 +05:00
Awais Jibran
92b99c7dc3 Fix discussion user roles 2016-11-10 17:11:52 +05:00
Muhammad Ammar
71cc602d93 Merge pull request #13863 from edx/ammar/tnl-4163-reduce-annotatorjs-search-calls 
Single search request to fetch notes per unit
 2016-11-10 16:23:59 +05:00
Douglas Hall
3224c027e3 Merge pull request #13955 from edx/ibrahimahmed443/WL-669-education-dropdown-capitalization 
fix inconsistent capitalization in education drop down
 2016-11-10 05:46:00 -05:00
Douglas Hall
92995b42ec Merge pull request #13935 from edx/douglashall/WL-798 
WL-798 Allow for hiding course mode banners on student dashboard
 2016-11-09 14:36:04 -05:00
attiyaishaque
76e1d4a75c TNL-5621 Fix discussion topics in MIT course. 2016-11-09 22:26:48 +05:00
M. Rehan
c873be0f55 Merge pull request #13868 from edx/mrehan/tnl-5721-nonetype-no-attr-course-id 
TNL-5721 – Fix check source module access before appending it to required modules
 2016-11-09 22:19:59 +05:00
Douglas Hall
ec7245537a Allow for not showing course modes on student dashboard 2016-11-09 11:39:29 -05:00
Qubad786
c7364a06a4 handle if required module(s) for conditional module are staff only 2016-11-09 20:11:33 +05:00
Ibrahim
122f718ce5 fix inconsistent capitalization in education drop down 2016-11-09 14:58:15 +05:00
Mushtaq Ali
237ef00a2b edxnotes stub server to support multiple usage id search - TNL-5605 2016-11-09 11:13:15 +05:00
alisan617
371c5a244e Merge pull request #13843 from edx/alisan/testing-discussion 
Refactor discussion tab UI code into parts to be reusable for inline discussions TNL-5669
 2016-11-08 15:30:39 -05:00
John Eskew
cd522358f2 Merge pull request #13706 from edx/jeskew/move_embargo_out_of_common 
Move embargo from common to openedx/core/djangoapps.
 2016-11-08 14:38:24 -05:00
alisan617
e80d9b5792 Refactor discussion tab UI code into parts to be reusable for inline discussions 
TNL-5669
 2016-11-08 14:17:01 -05:00
Gregory Martin
08c5a35899 Merge pull request #13923 from edx/yro_fix-PR-13794 
Yro fix PR 13794
 2016-11-08 10:06:16 -05:00
Toby Lawrence
f29a508d4f Merge pull request #13928 from edx/bugfix/forums-enable-data-migration 
Provide a default configuration for forums if none already exists.
 2016-11-08 09:16:56 -05:00
Muzaffar yousaf
6f44bbedbc Merge pull request #13912 from edx/mzfr/rmv-form-tnl5402 
Changing form to div for CAPA problem types.
 2016-11-08 17:54:16 +05:00
muzaffaryousaf
6b954efabd Changing form to div for CAPA problem types. 
TNL-5402
 2016-11-08 14:47:30 +05:00
Noraiz
bc3cbf57b5 Video download button does not appear in course (TNL-5769) 2016-11-08 12:39:03 +05:00
Gregory Martin
e05cb31b87 fix leading zero bok choy 2016-11-07 18:43:16 -05:00
Andy Armstrong
0c5b7ab32d Merge pull request #13883 from edx/andya/long-error-messages 
Introduce a new AcceptanceTest base class
 2016-11-07 18:35:38 -05:00
Gregory Martin
f0cd29f02a Revert "Merge pull request #13915 from edx/revert-13794-yro_implement-dateutil" 
This reverts commit d59ab18b27, reversing
changes made to 0ebab35e89.
 2016-11-07 17:04:13 -05:00
sanfordstudent
8ffc9197e8 Merge pull request #13881 from edx/efischer/tnl-5314 
Dashboard Final Grade Updates
 2016-11-07 16:08:06 -05:00
Toby Lawrence
3969f0cad9 Provide a default configuration for forums if none already exists. 2016-11-07 14:02:17 -05:00
Sanford Student
54df702630 Dashboard final grade display uses PersistedCourseGrade 
Will fall back to stored certificate grade if needed as we've discussed.

TNL-5314
 2016-11-07 14:00:27 -05:00
John Eskew
e3cb462d18 Move embargo from common to openedx/core/djangoapps. 2016-11-07 08:47:36 -05:00
attiyaishaque
0ffde1a620 ECOM-5281 Adding retries and celery task for sending activation email. 2016-11-07 11:23:43 +05:00
Ben Patterson
d59ab18b27 Merge pull request #13915 from edx/revert-13794-yro_implement-dateutil 
Revert "Implement DateUtils in LMS"
 2016-11-04 10:44:59 -04:00
Albert (AJ) St. Aubin
0ebab35e89 Merge pull request #13901 from edx/TNL-5281_labelUpdate 
Updates to correct a11y issues with CodeMirror
 2016-11-04 10:33:54 -04:00
Eugeny Kolpakov
4c4c5a4db1 Merge pull request #13900 from open-craft/ekolpakov/SOL-2070 
Library creation test is not flaky anymore
 2016-11-04 17:25:51 +03:00
Albert St. Aubin
be0e0b8eec Updates to correct a11y issues with CodeMirror 
TNL-5281
 2016-11-04 09:25:15 -04:00
Jesse Zoldak
ec880138d2 Revert "Implement DateUtils in LMS" 2016-11-04 07:50:26 -04:00
E. Kolpakov
f6d69560f9 Library creation test is not flaky anymore 2016-11-04 12:18:36 +03:00
Gregory Martin
f21dbc797a Merge pull request #13794 from edx/yro_implement-dateutil 
Implement DateUtils in LMS
 2016-11-03 13:51:46 -04:00
Toby Lawrence
800daa9c1d Merge pull request #13844 from edx/PERF-386 
[PERF-386] Utilize ForumsConfig to enable and disable forums.
 2016-11-03 13:14:20 -04:00
Troy Sankey
adfb02532b Merge pull request #13809 from edx/pwnage101/PERF-354-NR-user-state-client 
* Implement the newrelic_custom_metrics middleware
* Instrument DjangoXBlockUserStateClient with New Relic
 2016-11-03 10:42:25 -04:00
Troy Sankey
ece785ff92 Implement the newrelic_custom_metrics middleware 
Use this middleware and its helpers to accumulate custom New Relic
metrics on a per-request basis.  If, while handling a request, the app
does not accumulate any metrics, this middleware is a very lightweight
no-op.

This commit also enables the middleware!

PERF-354
 2016-11-03 10:30:25 -04:00
Toby Lawrence
2acb4a6cad [PERF-386] Utilize ForumsConfig to enable and disable forums. 
This specifically enables/disables the underlying comment service client
used to make calls to the service.  When disabled, this client will now
throw an exception which can be propagated upwards so that callers can
make the right decision about how to notify users of the error, or
handle retry, etc etc.
 2016-11-03 10:20:19 -04:00
Gregory Martin
3fd16eb6be Implement DateUtils in LMS 2016-11-03 10:06:10 -04:00
Mushtaq Ali
d337da7458 Remove pretty print from markdown xml - TNL-5768 
Revert commit bf9d467
 2016-11-03 12:15:48 +05:00
Mushtaq Ali
0e8dacc72a Revert "format xml before displaying" 2016-11-03 12:01:30 +05:00
Andy Armstrong
2bf8254efd Merge pull request #11491 from edx/andya/use-pattern-library-fonts 
Use fonts from the Pattern Library
 2016-11-02 15:34:58 -04:00