Christina Roberts
|
e9e5b5bd6e
|
Merge pull request #8765 from edx/christina/lms-requirejs/notes
Optimize edxnotes files.
|
2015-07-21 11:47:50 -04:00 |
|
cahrens
|
497d76fa54
|
Optimize edxnotes files.
|
2015-07-21 10:54:02 -04:00 |
|
cahrens
|
ad16f9f968
|
Optimize search usages.
|
2015-07-20 14:24:30 -04:00 |
|
Diana Huang
|
eff80baed2
|
Convert cohort JS to use RequireJS.
|
2015-07-20 13:59:55 -04:00 |
|
Peter Fogg
|
1ceb8a0d66
|
Optimize finish_auth_factory.
TNL-2602
|
2015-07-20 13:59:55 -04:00 |
|
cahrens
|
4f0ab6f9c8
|
Optimize account settings and learner profile.
Also remove RequireJS dependency on mustache, and delete extra copy.
|
2015-07-20 13:59:55 -04:00 |
|
Andy Armstrong
|
7b5f9b8009
|
Implement RequireJS Optimizer in the LMS
TNL-2487
|
2015-07-20 13:59:54 -04:00 |
|
Max Rothman
|
80cf4d6ecb
|
Merge pull request #8969 from edx/release-merge-test
Release merge test
|
2015-07-20 10:38:37 -04:00 |
|
Matt Drayer
|
4c0b00f45e
|
Merge pull request #8952 from edx/ziafazal/SOL-1045
SOL-1045: Enable certificate generation by students for self-paced courses
|
2015-07-20 10:22:02 -04:00 |
|
Max Rothman
|
babf2420b3
|
Fix test failure due to missing settings import
|
2015-07-20 09:54:00 -04:00 |
|
tlindaliu
|
4fc3ee4773
|
Merge pull request #8838 from edx/lliu/has-access-rebased
Changes to has_access
|
2015-07-19 22:41:19 -04:00 |
|
tlindaliu
|
0c837adfce
|
Refactor auth.has_access to auth.user_has_role
Change name of method to clear up confusion with the access.has_access method.
|
2015-07-19 20:42:29 -04:00 |
|
tlindaliu
|
e0840d2d43
|
MA-849: Change has_access return type
New classes for the return type, and changes to the has_access function and tests to make them compatible.
|
2015-07-19 20:42:29 -04:00 |
|
Renzo Lucioni
|
4b4ce5f122
|
Merge pull request #8965 from edx/renzo/update-edx-oauth2-provider
Update edx-oauth2-provider to 0.5.4
|
2015-07-18 12:13:23 -04:00 |
|
Renzo Lucioni
|
45ff29653b
|
Update edx-oauth2-provider to 0.5.4
|
2015-07-18 09:35:58 -04:00 |
|
Max Rothman
|
c97314413b
|
Merge branch 'release' into release-merge-test
Conflicts:
lms/djangoapps/commerce/urls.py
lms/djangoapps/commerce/views.py
|
2015-07-17 17:42:03 -04:00 |
|
Max Rothman
|
72ab1fbc8d
|
Merge pull request #8967 from edx/max/release-merge-conflicts
Max/release merge conflicts
|
2015-07-17 17:23:47 -04:00 |
|
Adam
|
54b97c6065
|
Merge pull request #8966 from edx/revert-7404-waheed/plat407-decorate-instructor-dashboard-with-sudo-required
Revert "Decorated instructor dashboard with sudo_required."
|
2015-07-17 16:59:51 -04:00 |
|
Max Rothman
|
9d344f6753
|
Merge branch 'rc/2015-07-14' into release
Conflicts:
cms/djangoapps/contentstore/views/tests/test_import_export.py
lms/djangoapps/commerce/urls.py
lms/templates/courseware/progress.html
|
2015-07-17 16:29:55 -04:00 |
|
srpearce
|
b12d3f6303
|
Merge pull request #8773 from edx/sylvia/docs/DOC-2102
Sylvia/docs/doc 2102
|
2015-07-17 15:42:59 -04:00 |
|
Max Rothman
|
2d216fc610
|
Merge pull request #8960 from edx/release-2015-07-08-conflict
Release 2015-07-08 conflict
|
2015-07-17 14:42:47 -04:00 |
|
Jesse Zoldak
|
626d3fb02d
|
Merge pull request #8964 from edx/zoldak/MA-1038
Skip test that had a hardcoded date expectation MA-1038
|
2015-07-17 13:57:39 -04:00 |
|
Jesse Zoldak
|
c2b4cf210f
|
Skip test that had a hardcoded date expectation MA-1038
|
2015-07-17 13:05:58 -04:00 |
|
Jesse Zoldak
|
913a5dfe29
|
Merge pull request #8943 from edx/zoldak/more-flaky-js
Disable potentially flaky jasmine tests
|
2015-07-17 12:13:38 -04:00 |
|
Sylvia Pearce
|
eea3b31105
|
Delete white spaces that are causing test failures
|
2015-07-17 16:12:53 +00:00 |
|
Jesse Zoldak
|
41350002ba
|
Merge pull request #8940 from edx/zoldak/SOL-1053-skip
Mark too-flaky test for skipping
|
2015-07-17 12:12:34 -04:00 |
|
Adam
|
2735b2b5bb
|
Revert "Decorated instructor dashboard with sudo_required."
|
2015-07-17 12:11:38 -04:00 |
|
Ben McMorran
|
2cf3390ba8
|
Merge pull request #8837 from edx/benmcmorran/discussion-caching-3
TNL-2389 Use discussion id map cache for thread creation and update
|
2015-07-17 11:33:02 -04:00 |
|
Max Rothman
|
d7b57309da
|
Merge branch 'release' into release-2015-07-08-conflict
Conflicts:
lms/djangoapps/commerce/urls.py
lms/templates/courseware/progress.html
openedx/core/djangoapps/credit/tests/test_api.py
|
2015-07-17 11:32:01 -04:00 |
|
Jesse Zoldak
|
ec6258a7ec
|
Mark too-flaky test for skipping
|
2015-07-17 11:01:45 -04:00 |
|
Jesse Zoldak
|
da68af5c04
|
Disable potentially flaky jasmine tests SOL-1065
|
2015-07-17 10:40:08 -04:00 |
|
Vedran Karačić
|
c0de94295a
|
Merge pull request #8953 from edx/vkaracic/TNL-394-additional-testing
TNL-394: Additional testing
|
2015-07-17 16:20:46 +02:00 |
|
vkaracic
|
f5234b1a9b
|
TNL-394: Additional testing
This is an additional test for:
https://openedx.atlassian.net/browse/TNL-394
to test if the get_user function escapes values correctly.
|
2015-07-17 07:28:25 +00:00 |
|
Jesse Zoldak
|
e89d8e14d4
|
Merge pull request #8955 from edx/zoldak/cleanup-js-includes
Remove unused includes
|
2015-07-16 19:56:04 -04:00 |
|
Renzo Lucioni
|
035aa4976f
|
Merge pull request #8947 from edx/renzo/resolve-failures
Import missing settings module in tests of commerce views
|
2015-07-16 16:52:06 -04:00 |
|
Awais Jibran
|
2d19eafa7c
|
Merge pull request #7404 from edx/waheed/plat407-decorate-instructor-dashboard-with-sudo-required
Decorated instructor dashboard with sudo_required.
|
2015-07-16 21:12:43 +05:00 |
|
Awais Qureshi
|
937ca38fb5
|
Merge pull request #8867 from edx/aamir-khan/ECOM-1816-credit-info-recept-page
ECOM-1816: added the provider detail on the receipt page.
|
2015-07-16 19:47:15 +05:00 |
|
aamir-khan
|
d5dda6470e
|
ECOM-1816: added the provider detail on the receipt page.
|
2015-07-16 18:25:03 +05:00 |
|
tasawernawaz
|
ba06ab1939
|
Merge pull request #8932 from edx/tasawer/story/ecom-1858-provider-and-eligibility-details
ECOM-1858
|
2015-07-16 13:57:06 +05:00 |
|
Zia Fazal
|
bed7d80777
|
enable certificate generation for html certificates
Enable Student-Generated Certificates for HTML certs flow
|
2015-07-16 13:32:14 +05:00 |
|
Tasawer
|
1ded8b546c
|
Update code of get_eligibility api.
ECOM-1858
|
2015-07-16 12:52:16 +05:00 |
|
Waheed Ahmed
|
bc052db1ee
|
Added DjangoSudo functionality for instructor dashboard and course team page
|
2015-07-16 11:14:11 +05:00 |
|
Sarina Canelake
|
ae0e21b32a
|
Merge pull request #8945 from ubc/wmono/update-authors
Update AUTHORS
|
2015-07-15 21:13:17 -04:00 |
|
Renzo Lucioni
|
60c818f030
|
Import missing settings module in tests of commerce views
|
2015-07-15 19:03:26 -04:00 |
|
Sylvia Pearce
|
c2420b0940
|
Final tweaks to API documentation updates
|
2015-07-15 21:46:11 +00:00 |
|
Renzo Lucioni
|
7f6e61b189
|
Merge pull request #8938 from edx/renzo/update-edx-oauth2-provider
Update edx-oauth2-provider to 0.5.3
|
2015-07-15 17:22:45 -04:00 |
|
William Ono
|
3c489c857a
|
Update AUTHORS
|
2015-07-15 21:21:58 +00:00 |
|
Jesse Zoldak
|
7aebf0684a
|
Remove unused includes
|
2015-07-15 17:17:55 -04:00 |
|
Max Rothman
|
7673bde898
|
Merge pull request #8941 from edx/jsa/commerce-api-rc
Jsa/commerce api rc
|
2015-07-15 16:49:12 -04:00 |
|
Sarina Canelake
|
bb7ba752bd
|
Merge pull request #7322 from edx/sarina/remove-old-analytics-dashboard
Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag AN-4583
|
2015-07-15 16:36:28 -04:00 |
|