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

296 Commits

Author SHA1 Message Date
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
Adam Palay
e515842395 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-07-22 08:10:26 -04:00
Syed Hassan Raza
7b1bcc3250 start-date-reset-to-DEFAULT_START_DATE 2015-07-22 13:17:48 +05:00
utkjad
274e6de22b PLAT-734 Fix slow transaction due to multiple calls to unpickling 2015-07-21 13:56:38 +00:00
Max Rothman
80cf4d6ecb Merge pull request #8969 from edx/release-merge-test 
Release merge test
 2015-07-20 10:38:37 -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
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
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
Zia Fazal
0793cc8b5c only ddx PM can activate/deactivate or delete certificate configuration 
fix for flaky test

fix for broken test

fixed quality violation
 2015-07-15 17:09:01 +05:00
Zia Fazal
57f1dc92b3 ziafazal/SOL-1021: Capture additional certificate configuration events 
* Changed certificate_id to configuration_id
* Fix for acceptance test faiiure
* Add waits to bok choy tests

fix for flaky test
 2015-07-14 11:12:09 +05:00
Adam Palay
213dc70d1e update to course import (TNL-2270) 2015-07-13 14:17:26 -04:00
zubair-arbi
db82cbdeb7 Merge pull request #8817 from edx/zub/story/ecom-1648-update-credit-eligibility-ui-text 
update credit eligibility ui text
 2015-07-09 12:03:06 +05:00
Brandon DeRosier
2bfbda3c1e Revert "edX Course/Library Import/Export API" 
This reverts commit c94abd2705.
 2015-07-08 16:55:38 -04:00
zubair-arbi
ab74f64e85 update credit eligibility ui text 
ECOM-1648
 2015-07-08 20:13:42 +05:00