Commit Graph

660 Commits

Author SHA1 Message Date
M. Rehan
9d5a4a244b Merge pull request #11336 from edx/mrehan/wrong-units-in-group-tnl-3727
Fix - skip orphans from content group usage information for split
2016-02-04 14:13:05 +05:00
Muhammad Rehan
50c7b7ceb8 TNL-3727 Skip orphans from content group usage information for split 2016-02-04 12:18:18 +05:00
Robert Raposa
f555ffd585 Refactor and improve js_utils helpers
- Rename escape_json_dumps to dump_js_escaped_json
- Rename escape_js_string to js_escaped_string
- Update js_escaped_string to output empty string for None
- Introduce dump_html_escaped_json
- Move dump_js_escaped_json after the pipe as new best practice
- Introduce additional uses of helpers
- Introduce new djangolib directory and move js_utils
2016-02-03 17:13:21 -05:00
Bill DeRusha
e75f7950d4 Updates XBlock renders its own template. Adds expand and collapse JS + jasmine tests.
ECOM-2809
2016-02-03 13:58:23 -05:00
Douglas Hall
7c923355b2 Remove gating api import from course xmodule to avoid importing django related code into non-django related code 2016-01-29 18:42:04 -05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
Ahsan Ulhaq
70eaf18936 caching for requests to credentials service
ECOM-3278
2016-01-28 13:05:50 +05:00
Ahsan Ulhaq
5181513629 Show message for earned programs credentials
ECOM-3015
2016-01-28 13:05:50 +05:00
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1"
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
2016-01-25 12:46:57 -05:00
Ahsan Ulhaq
46df454536 Merge pull request #11241 from edx/feature/credentials-phase-1
Feature/credentials phase 1
2016-01-22 18:39:53 +05:00
Ahsan Ulhaq
8fb998fee7 caching for requests to credentials service
ECOM-3278
2016-01-20 12:51:28 +05:00
Ahsan Ulhaq
4ce58a6f67 Show message for earned programs credentials
ECOM-3015
2016-01-20 12:50:30 +05:00
Piotr Mitros
6b6248b44a Minor cleanup of Studio settings: removing extra indirection, and advanced components list 2016-01-15 11:21:52 -05:00
M. Rehan
0b685d8983 fix for course number display string as none 2016-01-12 09:49:18 -05:00
Bill DeRusha
e63f0f922c Merge pull request #10984 from edx/bderusha/studio-audit-cert
Disable certificate template creation for audit only courses
2015-12-17 14:53:40 -05:00
Sarina Canelake
2bc7b954ab Remove the graphical slider tool 2015-12-17 13:24:00 -05:00
Bill DeRusha
08d1268c28 Disable cert generation for audit only courses 2015-12-17 13:23:38 -05:00
Sarina Canelake
27cb3080c2 Remove final CMS references to 'peergrading' and 'combinedopenended' 2015-12-11 15:07:10 -05:00
Sarina Canelake
c450145f7b Update CMS Contentstore tests to not use ORA1 examples 2015-12-11 15:05:01 -05:00
Sarina Canelake
ade863e994 Remove CMS Course Checklists feature 2015-12-11 10:32: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
jsa
2fbfcfd2ff Implement an endpoint to get id_tokens for programs.
ECOM-2440
2015-12-07 12:52:00 -05:00
Renzo Lucioni
e2833d8fc6 Add a Studio view and template to host the Programs authoring app
The Programs authoring app is a Backbone SPA maintained in a separate repository. The app handles its own routing and provides a UI which can be used to create and publish new Programs (e.g, XSeries). ECOM-2598.
2015-12-03 10:47:12 -05:00
Zia Fazal
aa529fe0b6 remove audit course mode
removed print statement
2015-11-25 17:58:30 +05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -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
Robert Raposa
3682fac832 Add json escaping to Studio
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates

TNL-2646: Escape json.dumps
2015-11-04 13:34:42 -05:00
Qubad786
36fe97c6c8 Bug fix: Added test cases and updated course info and index view with exception handling
TNL-3643
2015-11-03 12:43:47 +05:00
Matt Drayer
b900221ca4 Merge pull request #10394 from edx/asadiqbal08/SOL-1292
asadiqbal08/SOL-1292 Entrance Exam is not imported with an imported course
2015-11-02 10:14:47 -05:00
asadiqbal
bf0affc25d SOL-1292 2015-11-02 14:33:12 +05:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams
Timed Exams
2015-10-30 11:03:59 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -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
dd48bb0f4a missing is_active attribute fix 2015-09-11 11:46:32 -04:00
Ned Batchelder
741f06864a Merge pull request #9502 from edx/ned/import-path-differently
Change imports from path to use the stablest name.
2015-08-28 11:12:10 -04:00
Ned Batchelder
2a0259095d Change imports from path to use the stablest name.
The old line:

    from path import path

produced pylint errors because of the baroque way that path.py defined
"path".  We tried to get them to change how they defined it, but they
deleted the name instead: https://github.com/jaraco/path.py/issues/102

(Jason then changed his mind, but this is a better way to use path.py,
it avoids the pylint error at least.)
2015-08-27 12:59:25 -04:00
asadiqbal
9f34720d56 SOL-1152 2015-08-27 11:27:43 +05:00
zubair-arbi
ec28a75f14 In-course reverification access control
* Automatically create user partitions on course publish for each ICRV checkpoint.
* Disable partitions for ICRV checkpoints that have been deleted.
* Skip partitions that have been disabled when checking access.
* Add verification access control UI to visibility settings.
* Add verification access control UI to sequential and vertical settings.
* Add partition scheme for verification partition groups.
* Cache information used by verification partition scheme and invalidate the cache on update.
* Add location parameter to UserPartition so the partition scheme can find the associated checkpoint.
* Refactor GroupConfiguration to allow multiple user partitions.
* Add special messaging to ICRV for students in the honor track.

Authors: Zubair Arbi, Awais Qureshi, Aamir Khan, Will Daly
2015-08-20 08:43:55 -07:00
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release
Release
2015-08-12 13:06:39 -04:00
Waheed Ahmed
aff849281d Revert "Test library failed to export after import"
This reverts commit 4c1c4619f0.
2015-08-12 02:06:09 +05: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
Matt Drayer
3570d08856 Merge pull request #9197 from edx/ziafazal/SOL-1077-fix
SOL-1077: certificate config edit/delete is only allowed if user is edX PM or for those certificate configs not active
2015-08-06 11:36:03 -04:00
Syed Hassan Raza
4c1c4619f0 Test library failed to export after import 2015-08-05 12:47:27 -07:00
Matt Drayer
f7594ecdcb Merge pull request #9149 from edx/ziafazal/SOL-1088
ziafazal/SOL-1088: Show Certificate function only when advanced setting is true
2015-08-05 12:38:37 -04:00
Zia Fazal
e11c1d120c certificate edit/delete is only allowed if user is edX PM or certificate is not active
removed org helper
2015-08-05 13:45:43 +05:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
Zia Fazal
a169b47c48 remove certificates menu if html certs not enabled
fixed quality violation
2015-07-31 17:40:40 +05:00
chrisndodge
5e195c8eeb Merge pull request #8962 from edx/cdodge/proctoring-studio
Integrate timed and proctored exam authoring into Studio
2015-07-23 15:53:17 -04:00
Chris Dodge
3748119961 Integrate timed and proctored exam authoring into Studio 2015-07-23 14:43:17 -04:00
Syed Hasan raza
a347db40b1 Merge pull request #8819 from edx/shr/bug/TNL-2592-old-mongo-xblock-dates
start-date-reset-to-DEFAULT_START_DATE
2015-07-23 00:34:44 -07:00