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

11117 Commits

Author SHA1 Message Date
Zia Fazal
e21ff20375 backend changes based on feedback 
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset

Quality improvements 1/16

added rescore, delete state and task history functionality

added unit tests for entrance exam reset attempts

added unit tests for re scoring of entrance exam and task history

improved test coverage

Got rid of pep violation

feedback changes and added jasmine test

added more jasmine tests for Javascript changes

added bok-choy tests for UI changes

replaced input containing <p> tags with <label>

Removed ee element assertions to avoid js error

Added call to super.setUp()

changes based on feedback on 2/18

Writing tests in JS instead of coffee script

commit related to skip entrance exam 2/13

fixed bad-continuation quality error

fixed broken bok-choy test

changes based on feedback on 2/18

added js tests and removed coffee script tests

fixed broken bok-choy and unit tests

changes left while rebasing

rephrase test titles

do not need these libs

changes based on feedback on 2/24

changes text which was left

Changes based on feedback on 3/3
 2015-03-04 15:32:56 +05:00
cahrens
167bd05ac8 Add bok choy coverage for correctly displayed name and email address. 2015-03-03 17:16:47 -05:00
Will Daly
7bad603978 Merge pull request #7076 from edx/will/deprecate-embargo 
Deprecate old embargo implementation.
 2015-03-03 15:54:41 -05:00
Ben Patterson
375a996dc7 Merge pull request #7200 from edx/benp/flaky-SettingsMilestoneTest-bokchoy 
Flag test as flaky. SOL-449.
 2015-03-03 11:14:10 -05:00
Diana Huang
95387be93b Merge pull request #7193 from edx/diana/enrollment-api-permissions 
Allow the enrollment API to be accessed via API keys.
 2015-03-03 09:19:53 -05:00
Ben Patterson
bda0c06213 Flag test as flaky. SOL-449. 2015-03-03 08:28:57 -05:00
Ben Patterson
3539bac160 Event-testing pattern should be supported by a mixin. 2015-03-03 08:02:29 -05:00
Andy Armstrong
dfe0057b79 Implement profile API 
TNL-1491

See the API design here:

https://openedx.atlassian.net/wiki/display/TNL/User+API
 2015-03-02 16:28:52 -05:00
Diana Huang
1e4f1b5889 Allow the enrollment API to be accessed via API keys. 
XCOM-107
 2015-03-02 16:07:27 -05:00
Alison Hodges
5acc13269a Merge pull request #7133 from edx/ahodges/hackathon 
Alison's Hackathon9 changes
 2015-03-02 09:38:30 -05:00
Waqas Khalid
a9b83a5ae9 Merge pull request #7096 from edx/jeskew/PLAT_454_import_500_error 
PLAT-454: Fix import error when exported course edited.
 2015-03-02 19:01:51 +05:00
Waqas Khalid
4b9dc74cad Add tests for rename import error 2015-03-02 16:09:34 +05:00
Andy Armstrong
d42adcf46b Merge pull request #7123 from edx/christina/account-api 
Add name and email change requests to accounts API.
 2015-02-27 17:21:17 -05:00
cahrens
3ed31c2b1b Add name change and email change support to accounts API. 
Name change is immediate, email change is multi-step.
 2015-02-27 16:35:05 -05:00
Alison Hodges
4666caa63d Fixes DOC-1472, DOC-1713, DOC-1613, DOC-1714, DOC-1715 2015-02-27 16:22:01 -05:00
Sarina Canelake
a11f287769 Merge pull request #6998 from stvstnfrd/quality/pep8 
Extend PEP8 coverage
 2015-02-27 15:53:45 -05:00
Christina Roberts
99e85556ea Merge pull request #7140 from edx/christina/delete-enable-new-dashboard 
Delete ENABLE_NEW_DASHBOARD code.
 2015-02-27 15:37:41 -05:00
Calen Pennington
820b0118f4 Merge pull request #7155 from edx/django-upgrade/unicode-csrf-tokens 
Teach edx-mako to force csrf_tokens to unicode (from smart_strings)
 2015-02-27 15:33:43 -05:00
stv
4131898180 Remove "nopep" pragma 2015-02-27 11:49:51 -08:00
Calen Pennington
cbcb0ee8ab Teach edx-mako to force csrf_tokens to unicode (from smart_strings) 2015-02-27 13:38:16 -05:00
cahrens
61a108d377 Delete unused code for changing email. 2015-02-27 13:20:57 -05:00
Diana Huang
eb5e7d89ef Merge pull request #7094 from edx/diana/add-sku-to-coursemode 
Add SKU to Course Modes
 2015-02-27 10:54:44 -05:00
Diana Huang
3b0bb11218 Add SKU to Course Modes 
XCOM-94
 2015-02-27 10:04:36 -05:00
John Eskew
80b5f38239 Upon import, only raise when none of multiple parents are found for a 
block.
 2015-02-27 18:01:09 +05:00
cahrens
7dc0598b25 Delete ENABLE_NEW_DASHBOARD code. 2015-02-26 16:41:40 -05:00
Calen Pennington
bbab3a393c Merge pull request #7127 from edx/django-upgrade/reload-user-session-in-test 
Reload the user to get the cached profile attribute
 2015-02-26 13:55:05 -05:00
Nimisha Asthagiri
052dd52ae4 minor fixes found from the django-upgrade work. 2015-02-26 12:26:13 -05:00
Calen Pennington
3d8e1d092c Reload the user to get the cached profile attribute 2015-02-26 12:23:31 -05:00
Jim Abramson
353b8ea45e Merge pull request #5460 from Kelketek/forum-tracking 
Do event tracking for major forum events.
 2015-02-26 10:14:04 -05:00
Jonathan Piacenti
be02613aac Do event tracking for major forum events. 2015-02-25 23:30:30 +00:00
Christine Lytwynec
8bdd90a5b1 Merge pull request #7037 from edx/clytwynec/flaky_test_decorator 
Clytwynec/flaky test decorator
 2015-02-25 16:35:01 -05:00
Ben Patterson
c877c604ef Merge pull request #7099 from edx/benp/disable-sol-430 
Disable flaky test.
 2015-02-25 14:18:33 -05:00
Ned Batchelder
bcec664329 Merge pull request #7109 from edx/ned/add-spaces 
Fix sentences jammed together.
 2015-02-25 14:16:03 -05:00
Ned Batchelder
dd436ed8f9 Fix sentences jammed together. 2015-02-25 12:22:32 -05:00
Daniel Friedman
c8434ef9c8 Check access for discussion modules in forums 
TNL-650
 2015-02-25 11:31:18 -05:00
Ben Patterson
c7042bcc81 Disable flaky test. 2015-02-25 07:14:23 -05:00
Awais
1e53a79705 ECOM-985 fixing the 'NoneType' object has no attribute 'profile'. 2015-02-25 10:10:16 +00:00
Christine Lytwynec
ac03f87442 add flaky decorator to StudioLibraryContainerTest.test_out_of_date_message 
Relates to: TE-745
 2015-02-24 17:32:30 -05:00
Martyn James
8acdf532fc Merge pull request #7066 from edx/dcikatic/SOL-259 
SOL-259 Change HTML content listed type in index from HTML Content to Te...
 2015-02-24 16:06:48 -05:00
Ben Patterson
954d8ed9a0 Merge pull request #7070 from edx/benp/fix-tnl1479 
Wait for DOM to reflect the selected option.
 2015-02-24 10:49:47 -05:00
Nimisha Asthagiri
b280e44fe1 Merge pull request #7025 from edx/mobile/oauth2-allow-inactive-user 
MA-291 Allow API access without email activation.
 2015-02-24 09:12:30 -05:00
Ben Patterson
8e7c17d50f Wait for DOM to reflect the selected option. 
TNL-1479
 2015-02-24 08:24:39 -05:00
Nimisha Asthagiri
83a3adb97b MA-291 Allow API access without email activation 2015-02-24 06:05:18 -05:00
Will Daly
ae8ddc8aee Deprecate old embargo implementation. 
The new "country access" implementation replaces the old
implementation.  Middleware and tests have been updated
accordingly, but deprecated models are preserved
for backwards compatibility.
 2015-02-23 15:48:04 -05:00
Zia Fazal
b3f85e1d4a Instructor Dashboard management tools for Entrance Exams 
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset
added rescore, delete state and task history functionality
 2015-02-23 15:04:05 -05:00
Will Daly
f854726efc Add tracking code to LinkedIn URL. 
Add client-side analytics event for LinkedIn Add to Profile button click.

Add management command for generating certs for testing.

Update styling of the certificate messages.
 2015-02-23 11:52:47 -05:00
Will Daly
368554754b Make the linked in configuration migration backwards compatible 2015-02-23 11:40:41 -05:00
John Eskew
d3e2cb0fac Merge pull request #7027 from edx/jeskew/defn_loading_perf_problems 
Rollback override of lazy definition loading for large courses.
 2015-02-23 11:15:44 -05:00
Akiva Leffert
906f3474bb Merge pull request #7057 from edx/aleffert/existing-enrollment-success 
Convert enrollment already exists errors to success.
 2015-02-23 11:08:33 -05:00
John Eskew
4e7ed93b3e Rollback eager definition loading. 
Pass 'lazy' parameter down properly into low-level definition caching.
Adjust mongo call numbers in tests and add missing bulk_op wrapper.
Avoids the loading of all definitions in a large course when only
specific, filtered definitions are needed to be loaded for an endpoint.
 2015-02-23 10:33:43 -05:00