Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,439 Commits 1 Branch 0 Tags
9ff0a16251bfefc7d7a657ff0720d75c616ae1fc
Commit Graph

2921 Commits

Author SHA1 Message Date
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
Matt Drayer
5140be7d5d Merge pull request #9479 from edx/asadiqbal08/SOL-1152 
asadiqbal08/SOL-1152- Getting error on editing the certificate in deactivated mode.
 2015-08-27 16:40:16 -04:00
Peter Fogg
5d26938158 Merge pull request #9366 from edx/peter-fogg/team-signals 
Add signals for user's discussion activity.
 2015-08-27 14:07:29 -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
Peter Fogg
38fb6eaede Add signals for user's discussion activity. 
These signals are caught by the Teams app and used to update
`last_activity_at` on both teams and individual users.

TNL-2497
 2015-08-26 12:07:54 -04:00
muhammad-ammar
6134e8b5ed Move studio dialog code into common 2015-08-26 20:26:27 +05:00
Bill DeRusha
973314de7b Add basic elasticsearch search for teams 
TNL-3014

Add tests for search

Add text_search to TeamsListView

Add reindex command line tool for course teams

Add Search Pagination and update comments

Move paginate_search_results to common library
 2015-08-24 09:22:06 -04: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
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release 
Release
 2015-08-17 13:17:55 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration 
Integration of Proctoring into the LMS
 2015-08-14 07:18:14 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04: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
Awais Jibran
7bf81195ad Strip aways slashes from the asset 'displayname' as they cause export to fail. 
TNL-2669
 2015-08-07 18:10:26 +05: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
Ned Batchelder
ee0f4b2594 Remove 'pylint: disable=no-value-for-parameter' that we no longer need. 2015-08-03 15:44:29 -04:00
Zia Fazal
a169b47c48 remove certificates menu if html certs not enabled 
fixed quality violation
 2015-07-31 17:40:40 +05:00
Zia Fazal
3a6b2c30b5 hide certificate configuration activate/deactivate and delete buttons 
added line break
 2015-07-30 11:20:04 +05:00
Jesse Zoldak
51f058ad45 Fix library index test 2015-07-24 13:57:52 -04:00
John Eskew
b4b23575dd Merge pull request #8185 from AkA84/PLAT-295-reset-advertised-date-on-rerun 
PLAT-295: Reset advertised date on course rerun

Thanks @AkA84 !
 2015-07-23 17:33:39 -04: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
Alessandro
e9d50b051d Reset advertised_start field course rerun 
PLAT-295
 2015-07-23 21:15:56 +02: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
Davorin Sego
a43cf589e0 Update edx-search, fix lms filter generator and courseware index tests 2015-07-22 16:44:01 +02: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
Matt Drayer
66e1b11a58 Merge pull request #8931 from edx/ziafazal/fix-SOL-1008 
SOL-1008: only edx PM can activate/deactivate or delete certificate configuration
 2015-07-15 10:03:17 -04:00
Vedran Karačić
4eb4a82ea5 Merge pull request #8851 from edx/vkaracic/PLAT-619-2 
PLAT-619: Custom error messages for delete course command
 2015-07-15 14:59:25 +02: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
Dino Cikatic
862262bd2d SOL-974 make index and remove calls use ES bulk API 2015-07-14 11:47:08 -04:00
vkaracic
ff6afaf483 Custom error messages for delete course command 
This is a fix for
https://openedx.atlassian.net/browse/PLAT-619
added custom CommandError messages for invalid syntax and
invalid course keys.
 2015-07-14 15:28:01 +00:00
Matt Drayer
d57fd0e47c Merge pull request #8847 from edx/ziafazal/SOL-1021 
ziafazal/SOL-1021: Create Analytics events for certificate actions
 2015-07-14 07:58:55 -04:00
Vedran Karačić
f9cb092488 Merge pull request #8852 from edx/vkaracic/PLAT-324 
PLAT-324: Custom error message for export course command
 2015-07-14 09:15:53 +02: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
Sarina Canelake
8283c07e32 Remove superfluous-parens pylint violations 
Skipped 'print' statement violations, as print() is Py3k syntax.
 2015-07-13 17:33:28 -04:00
Sarina Canelake
ba8fd1c21d Eliminate instances of unused-import Pylint violation 2015-07-13 17:33:25 -04:00