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

34546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zia Fazal
7cdeb3300a load db_fixures when run with --testsonly 
revert shell script change
 2015-12-31 15:39:08 +05:00
Nimisha Asthagiri
5df15fcf03 Merge pull request #11077 from edx/course-api/field-name-change 
Course API: Change field name from course_id to id
 2015-12-28 17:17:39 -05:00
Nimisha Asthagiri
a00c2a7c47 Course API: Change field name from course_id to id 2015-12-28 16:24:54 -05:00
Nimisha Asthagiri
6bbc46b1b5 Merge pull request #11049 from edx/mobile/catalog-api-overview-field 
Update Course Catalog API to support About Overview field
 2015-12-28 16:09:15 -05:00
Nimisha Asthagiri
3d84e29218 Update Course Catalog API to include About Overview field. 2015-12-28 15:03:22 -05:00
Douglas Hall
1b3e73023d Merge pull request #11012 from edx/cdodge/edx-proctoring-0.12 
use edx-proctoring version 0.12.x
 2015-12-28 14:05:16 -05:00
Ben Patterson
d460eb62a9 Merge pull request #11075 from edx/benp/fix-flaky-hello 
Fix flaky condition.
 2015-12-28 13:34:58 -05:00
Ben Patterson
1599ae2f26 Merge pull request #11065 from edx/benp/fix-flaky-course-import 
Fix flaky condition. TNL-3937.
 2015-12-28 13:33:48 -05:00
Douglas Hall
88e21c3610 Merge pull request #11067 from edx/cdodge/allow-nested-templates 
Replace https://github.com/edx/edx-platform/pull/10780 with this PR
 2015-12-28 12:27:28 -05:00
Chris Dodge
45ce28961c use edx-proctoring version 0.12.x 2015-12-28 11:49:53 -05:00
Ben Patterson
056158d72b Fix flaky condition in lettuce test. 2015-12-28 10:50:45 -05:00
Peter Fogg
d9b181e83f Merge pull request #11053 from edx/peter-fogg/enrollment-api-slashes 
Add optional trailing slashes to the Enrollment API.
 2015-12-28 10:29:40 -05:00
Chris Dodge
0b4f3599b3 Apply patch from hasnain-naveed/HOL-4-navigation-template-change in order to get a Jenkins build running 2015-12-27 19:18:07 -05:00
Nimisha Asthagiri
76df0f06db Merge pull request #11057 from edx/course_api/has_access_performance 
Performance enhancement in see_exists: reverse order of checks
 2015-12-27 17:02:39 -05:00
Ben Patterson
d522068265 Fix flaky condition. TNL-3937. 2015-12-26 19:42:59 -05:00
Nimisha Asthagiri
44abf7a9a2 Performance enhancement in see_exists: reverse order of checks 2015-12-23 16:40:38 -05:00
Nimisha Asthagiri
765f5285a0 Merge pull request #11047 from edx/mobile/course-api-filter 
Update Course Catalog API to support filters
 2015-12-23 13:54:15 -05:00
raeeschachar
365191d6d5 Merge pull request #11056 from edx/raees/chrome-bokchoy-test-cannot-upload-sjson-translation 
Fixed test cannot upload json translation failing on Chrome
 2015-12-23 23:21:40 +05:00
Nimisha Asthagiri
8e3f4e058d Update Course Catalog API to support filters 2015-12-23 12:31:31 -05:00
raeeschachar
e5cbb1c92e Fixed test cannot upload json translation failing on Chrome 2015-12-23 18:15:09 +05:00
Usman Khalid
766c3dca71 Merge pull request #11051 from Ayub-Khan/ayubkhan/TNL-3822 
Fix escaping in studio editor
 2015-12-23 14:57:50 +05:00
Peter Fogg
3149aaa319 Add options trailing slashes to the Enrollment API. 
This allows the edX REST API Client to perform a sucessful GET against
this API, since Slumber (which our client is based off of) appends the
trailing slash by default.
 2015-12-22 14:52:27 -05:00
Robert Raposa
f5a63b1e36 Merge pull request #10962 from edx/robrap/TNL-3425 
Deprecate escaping in display_name_with_default
 2015-12-22 14:49:32 -05:00
raeeschachar
62597a17fd Merge pull request #11036 from edx/raees/chrome-bokchoy-test-cohort-by-csv-unicode 
Fixed test cohort by csv unicode failing on Chrome
 2015-12-22 22:36:55 +05:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default 
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
 2015-12-22 11:52:04 -05:00
Christine Lytwynec
590e0481ac Merge pull request #11052 from edx/clytwynec/a11y-tests 
Fix exit status of A11y tests
 2015-12-22 11:47:31 -05:00
Robert Raposa
424d26c972 Update pylintrc_tweaks 
Add changes for longer names.  This will get backed out once it
makes it in to edx-pylint.

TNL-3425
 2015-12-22 11:43:49 -05:00
Ben Patterson
82ca667db4 Merge pull request #11044 from edx/revert-10994-mushtaq/improve_get_item 
Revert "Append block item only if it has path to root"
 2015-12-22 10:13:26 -05:00
Christine Lytwynec
51766a73d8 Fix exit status of A11y tests 2015-12-22 10:02:30 -05:00
Peter Fogg
72ed155c8a Merge pull request #11046 from edx/merge-release-into-master 
Merge release into master
 2015-12-22 09:11:43 -05:00
Peter Desjardins
2bf25b2f51 Merge pull request #11043 from edx/pdesjardins/DOC-2543-b 
Edit text strings in default template for web certificates to make them more generally applicable
 2015-12-22 08:56:57 -05:00
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking 
Bookmarking
 2015-12-22 18:25:48 +05:00
Matt Drayer
ca2b8c2749 Merge pull request #10988 from edx/saleem-latif/SOL-1493 
SOL-1493: Web Certificates: Platform Branding integration
 2015-12-22 07:57:57 -05:00
raeeschachar
05b96f8c93 Merge pull request #11038 from edx/raees/chrome-bokchoy-test-search-flaky 
Fixed test search flaky on Firefox and Chrome
 2015-12-22 12:35:35 +05:00
Usman Khalid
a93ef10f8c Merge pull request #11016 from edx/ekafeel/bookmarks-limit 
Limit the number of bookmarks a learner can add in a course
 2015-12-22 11:52:17 +05:00
Saleem Latif
3967d8093d Move get_logo_url from branding/__init__.py to branding/api.py for consistency. 2015-12-22 11:50:16 +05:00
Saleem Latif
475429c0a6 Web Certificates: Platform Branding integration 2015-12-22 11:50:15 +05:00
Peter Desjardins
451ae3b2e7 Edited text strings in the default template for web certificates to remove wording specific to edx.org. Addresses DOC-2543. 2015-12-21 16:31:17 -05:00
Piotr Mitros
411957612b Merge pull request #11032 from edx/pmitros/external-xblock-tests 
Allow us to run tests from external XBlock repositories
 2015-12-21 15:36:29 -05:00
Peter Fogg
39de6e828f Merge remote-tracking branch 'origin/release' into merge-release-into-master 2015-12-21 15:22:02 -05:00
Peter Fogg
bc121bfb3e Merge pull request #11026 from edx/patch/2015-12-21 
Patch 2015-12-21
 2015-12-21 14:49:09 -05:00
Piotr Mitros
ea27d19cb3 Allow us to run tests from external XBlock repositories 2015-12-21 14:44:25 -05:00
Ben Patterson
92f4d41fac Revert "Append block item only if it has path to root" 2015-12-21 14:33:32 -05:00
clrux
ddc6b5ac6f Merge pull request #11041 from edx/clrux/ac-295 
LMS: Adding missing third topic state
 2015-12-21 13:11:43 -05:00
Saleem Latif
484e6ef74d skip 'filtering students' only when students are given and statuses to regenerate are not 2015-12-21 12:57:39 -05:00
Saleem Latif
268db9080a Disable 'Generate Exception Certificates' button when there are no certificate exceptions. 2015-12-21 12:56:42 -05:00
Saleem Latif
5ccc520bb3 Remove unused imports 2015-12-21 12:56:35 -05:00
Saleem Latif
76696aeba9 Add i18n to strings 2015-12-21 12:56:28 -05:00
Saleem Latif
33bbc8d77e display certificate generate history in reverse chronological order 2015-12-21 12:56:20 -05:00
Ben Patterson
e6a5ef811e Merge pull request #11039 from edx/benp/skip-flaky-test-TNL-3943 
Skip test; it has become too flaky to be reliable.
 2015-12-21 12:54:18 -05:00