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

205 Commits

Author SHA1 Message Date
Diana Huang
fab7a071e3 Add new helper methods. 2015-12-15 16:21:14 -05:00
Zia Fazal
2cb2233dde initial change set. add org autocomplete 
added unit tests and fixed JS tests

added bok choy tests

fixed broken botchoy tests

fixed course discovery broken test

removed monkey patch at class level

changes after feedback from matte
 2015-12-11 18:39:55 +05:00
Peter Fogg
2d40c66361 Fix spurious Zendesk warnings. 
We were logging warnings about group names when no group names were
requested. This will clean up Splunk a little bit.
 2015-12-09 10:01:14 -05:00
Peter Fogg
5ecb9af294 Merge pull request #10896 from edx/release 
Release 2015-12-08
 2015-12-08 18:58:14 -05:00
Peter Fogg
a609e074c7 Fix Unicode errors in financial assistance. 2015-12-08 16:35:38 -05:00
chrisndodge
4334eb9bd1 Merge pull request #10885 from edx/release 
Release
 2015-12-08 15:21:48 -05:00
Bill DeRusha
692e5d777a Update copy for HCFA 
Update Zendesk ticket to correctly add group.

Add logic to hide new audit certs
 2015-12-07 14:18:55 -05:00
Nimisha Asthagiri
d170c92f3b Refactor course_image_url 2015-12-04 11:25:40 -05:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations 
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
 2015-11-23 15:32:54 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
muhammad-ammar
29acc3acfc resolve merge conflicts 
test fixes
 2015-11-18 19:13:54 +05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
wajeeha-khalid
4ea70aeb19 MA-862; accept application/merge-patch+json for comment/thread update 2015-11-13 12:52:21 +05:00
Saleem Latif
c068bc95cf Custom 500 error message should only be seen for Preview 2015-11-12 11:31:25 +05:00
Ned Batchelder
e7fcc743c0 More-correct data migrations 
We need to be sure the migrations will work even in the presence of data
from the future.  get_or_create is a problem, because if the data
already exists, there could be more than one record, even if this
migration only creates one.
 2015-11-11 09:03:21 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Clinton Blackburn
bb0effb75c Updated Zendesk error handling 
Properly logging exceptions so we have the complete stacktrace.

ECOM-2792
 2015-11-05 11:52:53 -05: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
Zia Fazal
9bb6f6e88d use a generic function check if entrance_exam is enabled or not 2015-10-22 16:45:19 +05:00
Zia Fazal
b9dfcb2253 log exception in the logs to debug issue 2015-10-20 14:22:26 +05:00
Matt Drayer
c30960cc85 Merge pull request #10215 from edx/ziafazal/SOL-1317 
SOL-1317: check MILESTONES_APP also when checking prerequisite courses enabled
 2015-10-19 09:47:20 -04:00
Matt Drayer
b4ff9f882b Merge pull request #10146 from edx/saleem-latif/SOL-1257 
saleem-latif/SOL-1257: Resetting student history for Entrance Exam on instructor dashboard
 2015-10-19 09:45:20 -04:00
Saleem Latif
12b245a386 Remove milestones when instructor clears a student's entry exam data 2015-10-19 12:39:22 +05:00
Zia Fazal
0f637fdc95 check MILESTONES_APP when checking prerequisite courses enabled 2015-10-16 12:53:55 +05:00
Saleem Latif
466abcdce4 updated message for 500 error on certificate preview 2015-10-15 10:46:11 +05:00
Saleem Latif
05a72486f3 date format "Monday at 3pm UTC" added for courses starting with-in 5 days 2015-09-23 12:17:08 +05:00
Diana Huang
8c1bf2cd3a Add events for tracking when teams are edited. 
TNL-3190
 2015-09-04 15:27:40 -04:00
cahrens
41ac90fa7a Use team name prefix and UUID for team_id. 
TNL-3107
 2015-08-27 11:22:35 -04:00
Clinton Blackburn
207ce4eda5 Resolved decompression errors during tests 
Note that this change will require deleting all CourseStructure data. This data should be regenerated using the generate_course_structure management command.

XCOM-513
 2015-08-18 10:25:09 -04:00
Zia Fazal
2467d6971f ziafazal/SOL-1044: Database-Driven Certificate Templates 
* added certificate template model
* added certificate template asset model
* added django admin configs and migration
* initial LMS template matching logic
* improved LMS template matching
* improved LMS template matching and rendering logic
* address Django admin form/model load order incongruence
* add missing unique constraint migration.
 2015-08-13 08:01:34 -04:00
Matt Drayer
e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application 
* asadiqbal08/SOL-1058: Add edx-organizations to certificate web view
  * Support organization logo asset management
  * Remove organization fields from Studio certificate configuration model

* SOL-981 pull request feedback fixes
 2015-08-10 10:29:45 -04:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Kyle McCormick
5b630a7704 MA-779 Make has_access work on CourseOverview objects 2015-07-08 12:05:38 -04:00
Will Daly
da982341e7 Accept string-encoded timestamps 2015-06-25 13:18:30 -07:00
Will Daly
cea06e1217 Update the format of the credit provider timestamp. 
Use the number of seconds since the epoch (Jan 1 1970 UTC)
instead of an ISO-formatted datetime string.  This is easier
for credit providers to parse.
 2015-06-22 10:03:31 -07:00
Nimisha Asthagiri
4921ec48c8 MA-792 Course Blocks and Navigation API (user-specific) 2015-06-12 09:27:20 -04:00
Nimisha Asthagiri
d240785b17 MA-722 Render xBlock API Support 2015-06-05 11:18:48 -04:00
Ben McMorran
9d336c33eb TNL-1897 Implement Course Team API 2015-06-03 18:04:17 +00:00
Ned Batchelder
cc5c1001d1 Fix simplifiable-range pylint warnings. 2015-06-02 09:47:13 -04:00
Ned Batchelder
e97b94bde2 Merge pull request #8060 from edx/ned/add-supers 
Add super() calls to setUp/tearDown that are missing them
 2015-05-15 12:29:14 -04:00
christopher lee
5cef287c5d MA-635 Block Mobile Content for unfulfilled milestones 
Previously, the mobile api did not check for pre-requisite courses
or entrance exams. This change checks for these milestones and then
returns course content accordingly.
 2015-05-15 09:39:54 -04:00
Ned Batchelder
78e9445aa1 Add super() calls to setUp/tearDown that are missing them 
Also, I replaced a number of tearDown methods with addCleanup instead.
And also remove some unneeded patch.stopall() calls.
 2015-05-14 18:14:21 -04:00
Andy Armstrong
2fafaec053 Implement grade report analytics 
TNL-1988
 2015-05-12 16:32:01 -04:00
Kevin Luo
5c36bd1052 Clean up keyword_substitution.py 
Update docstring and remove unused import
This is cleanup after edx/edx-platform#7605
 2015-05-06 14:22:21 -07:00
Carson Gee
681b9a5ea7 Remove anonymous caching when SSL is enabled 2015-04-30 10:50:19 -04:00
Andy Armstrong
17392ef3bf Code review feedback and test cleanup. 2015-04-17 17:23:19 -04:00
Andy Armstrong
7742735fb0 Event on user preference updates 
TNL-1851
 2015-04-17 17:23:19 -04:00