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

6211 Commits

Author SHA1 Message Date
asadiqbal
9f34720d56 SOL-1152 2015-08-27 11:27:43 +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
Mark Hoeber
68414a1345 Merge pull request #9352 from edx/markhoeber-doc2219 
Updated Certificate's config page help
 2015-08-21 14:40:38 -04:00
Alison Hodges
1e374f4d4e Merge pull request #9382 from edx/ahodges/comments_on_roles 
Adds a comment to reduce confusion over remaining role name differences
 2015-08-20 20:18:04 -04:00
Alison Hodges
3547821b1a Adds a comment to reduce confusion over remaining role name differences 2015-08-20 16:09:35 -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
Mark Hoeber
5c33f144d0 Updated Certificate's config page help 2015-08-20 11:04:22 -04: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
Tasawer
58b088e109 Fixing minimum grade value error 
ECOM-2109
 2015-08-17 10:20:40 +00: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
Andy Armstrong
01065b6ae5 Merge pull request #9217 from edx/andya/land-teams 
Enable teams and deprecate the advanced setting
 2015-08-13 17:47:15 -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
Kevin Falcone
891dab621f Merge pull request #9141 from Stanford-Online/aliang8/devstack-https 
Deactivate HTTPS on devstack
 2015-08-10 17:29:05 -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
Mushtaq Ali
f4aa92f0aa Merge pull request #9229 from edx/mushtaq/tnl-2882-fix-ie10-group-config-bug 
Fix IE10 issue with delete button.
 2015-08-10 17:48:59 +05:00
tasawernawaz
96779dfe52 Merge pull request #9214 from edx/tasawer/bugfix/ecom-1987-fixing-validation-error-in-minimum-grade 
Fixing course settings page for change in minimum grade
 2015-08-10 12:41:18 +05:00
Andy Armstrong
e845dda8b0 Enable teams and deprecate the advanced setting 2015-08-07 10:35:19 -04:00
Mushtaq Ali
c7aefd4b21 Fix IE10 issue with delete button. 
Delete button should not be clickable if in use by a unit.
 2015-08-07 18:31:10 +05: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
Zia Fazal
97c3bd1cfd on clicking Edit of certificate config show prompt 2015-08-06 13:48:28 -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
Tasawer
80b0edf082 Fixing course settings page for change in minimum grade 
ECOM-1987
 2015-08-06 14:07:03 +00: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
Matt Drayer
70d4d885e7 Merge pull request #9185 from edx/asadiqbal08/SOL-1035 
asadiqbal08/SOL-1035: Signatory fields should use placeholders and not text values
 2015-08-05 08:31:30 -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
Awais Jibran
99cd48c858 Merge pull request #9179 from edx/aj/tnl2855-depricated-blocks-in-edge 
Fixed ORA1 deprecated warning message
 2015-08-04 23:09:00 +05:00
Ned Batchelder
8476baf4dd We should only add the DjDT urls if it is enabled. 2015-08-04 11:01:45 -04:00
asadiqbal
10d4d0ba06 SOL-1035 2015-08-04 18:23:21 +05:00
Awais Jibran
1ac90573ae Fixed ORA1 deprecated warning message when a component does not have a display_name 
TNL-2855
 2015-08-04 18:18:18 +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
614baab35a Merge pull request #9111 from edx/ziafazal/SOL-1077 
SOL-1077: hide certificate configuration activate/deactivate and delete buttons if user is not global staff
 2015-07-31 11:12:24 +05:00
Albert Liang
46434582c8 Deactivate HTTPS on dev and devstack 
When running locally, XBlocks which access third-party software no longer
cause server errors.

Because devstack inherits from aws, the HTTPS flag was implicitly set to 'on'.
This meant that XBlocks attempted to use SSL when dealing with third-party
components like LTI.  Since SSL is not enabled on devstack, this caused server
errors whenever these features ran.
 2015-07-30 13:22:33 -07:00
Zia Fazal
3a6b2c30b5 hide certificate configuration activate/deactivate and delete buttons 
added line break
 2015-07-30 11:20:04 +05:00
Ned Batchelder
7a7a867e6a Fix Django Debug Toolbar circular imports 
There's an "explicit" way to configure Django Debug Toolbar that isn't
prone to circular import errors:

http://django-debug-toolbar.readthedocs.org/en/1.0/installation.html#explicit-setup

Do that.
 2015-07-29 16:18:38 -04:00
clrux
4e8aee7e85 Merge pull request #9067 from edx/clrux/ac-121-cms-modal-focus 
Sending focus to modal in CMS
 2015-07-29 12:47:51 -04:00
Chris Rodriguez
2bea68fc58 Sending focus to modal in CMS 2015-07-29 09:19:36 -04:00
Christina Roberts
f384400bdf Merge pull request #9026 from edx/christina/tnl1653-incorrect-textbook-link 
Fix View Live link on Textbooks page in Studio.
 2015-07-28 10:04:03 -04:00
cahrens
44b1971a7c Fix View Live link on Textbooks page in Studio. 
TNL-1653
 2015-07-27 16:58:18 -04:00
Jesse Zoldak
4f9dec8b36 Merge pull request #9060 from edx/zoldak/fix-library-index-test 
Fix library index test
 2015-07-27 14:25:38 -04:00
Dongwook
e7aa8fc176 allows platform version formatting as a part of static url served by djpyfs 2015-07-24 20:05:20 +00:00
Jesse Zoldak
51f058ad45 Fix library index test 2015-07-24 13:57:52 -04:00
Muzaffar yousaf
35503ebda2 Merge pull request #8636 from edx/muzaffar/youtube-api-v3 
Using youtube api v3.0 instead of v2.0 to get the video's metadata.
 2015-07-24 20:02:48 +05:00
Christina Roberts
f4e386268b Merge pull request #9029 from edx/christina/tnl-296 
Make active menu highlight in blue.
 2015-07-24 09:33:55 -04:00
muzaffaryousaf
38ef22b8a2 Using youtube api (v3) instead of v2 to get the video duration . 
TNL-2413
 2015-07-24 17:03:46 +05:00