Commit Graph

6243 Commits

Author SHA1 Message Date
Braden MacDonald
7647fd9ff1 Fix add component buttons to be backward compatible 2015-09-11 13:18:19 -07:00
Bill DeRusha
4234ff5959 Merge pull request #9707 from edx/bderusha/edx-search-config
Add edx-search configuration to lms
2015-09-11 14:45:23 -04:00
Bill DeRusha
eec2bed0c7 Add edx-search configuration to lms
remove "defensive code" until we can figure out how to actually
catch the errors,
2015-09-11 13:55:39 -04:00
Zia Fazal
dd48bb0f4a missing is_active attribute fix 2015-09-11 11:46:32 -04:00
Andy Armstrong
55b2ea374f Merge pull request #9684 from edx/andya/fix-teams-i18n
Fix i18n for last activity date on team cards
2015-09-10 16:27:00 -04:00
Andy Armstrong
6817e89f4a Fix i18n for last activity date on team cards 2015-09-09 17:59:25 -04:00
Clinton Blackburn
b5d6b210fd Merge pull request #9681 from edx/release
Release 2015-09-09
2015-09-09 12:38:15 -04:00
Brian Beggs
bc685451ea Merge pull request #9568 from edx/bbeggs/lettuce-1.8-upgrade
Update lettuce to work with Django 1.4 - 1.8
2015-09-08 20:30:52 -04:00
Bill DeRusha
49807ab6a5 Add search specific feature flag in front of search features 2015-09-08 17:13:30 -04:00
Andy Armstrong
a08fe9fb06 Merge pull request #9059 from edx/andya/faster-update-assets
Don't package or optimize assets on devstack
2015-09-08 16:48:11 -04:00
Brian Beggs
b7006533a2 updating lettuce to work with Django 1.4 - 1.8 2015-09-08 15:42:11 -04:00
Matt Drayer
43da9f060e Merge pull request #9550 from edx/asadiqbal08/SOL-1157
SOL-1157 Certs: Additional Studio UI cleanup
2015-09-04 10:27:00 -04:00
Marko Jevtic
080a44b663 (SOL-1105) Requirement for enabling search in devstack 2015-09-04 10:50:40 +00:00
asadiqbal
725e186677 SOL-1128 further enhancement 2015-09-03 15:06:18 -04:00
Andy Armstrong
fb19d32815 Don't package or optimize assets on devstack 2015-09-03 13:28:26 -04:00
asadiqbal
3e4d4504ff SOL-1157 -- moving buttons from top to bottom and also using the standard save/cancel buttons in signatory edit view.
and update the bokchoy test
2015-09-03 15:32:52 +05:00
Christine Lytwynec
e807cbd589 Merge pull request #9402 from edx/clytwynec/TNL-2153
Change component types and template links to buttons
2015-09-01 12:48:46 -04:00
Christine Lytwynec
3470e180fc Change component types and template links to buttons 2015-09-01 10:31:35 -04:00
muhammad-ammar
5e67933175 fix flaky
TNL-3166
2015-09-01 10:56:25 +05:00
Kevin Falcone
e3c66f55e0 Optimize memory and CPU usage.
The print_out_all_courses() routine consumes a ton of memory (2G and
causes noticable mongo usage spikes).  This actually causes other
processes on production boxes to be memory starved and killed
(such as worker children on edge when this was run recently).

The behavior of this script on production is
* Print several hundred courses
* Ask if you want to delete the one you specified
* print several hundred courses minus one
On a sandbox with 5 courses, you could tell by eye that 1 is gone, but
not in production (or even in stage).

The original PLAT-619 ticket for this suggested printing a course
listing on error, but instead it always printed the course listing.
Even in the error case, hundreds of course ids is confusing and obscures
the error message saying that your course_id is invalid.

You should be getting the course id from the UI or from ./manage.py lms
dump_course_ids, not by searching a list.

Adjusted the test accordingly

Remove get_courses_keys
2015-08-31 11:28:26 -04:00
Jesse Zoldak
d3754af2f4 Skip flaky JS test TNL-3166 2015-08-28 14:51:59 -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
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
Ned Batchelder
b6626620fd Merge pull request #9477 from edx/ned/clarify-advanced-component-types
Add a comment explaining what ADVANCED_COMPONENT_TYPES should be.
2015-08-27 10:31:56 -04:00
Muhammad Ammar
d38da773ea Merge pull request #9265 from edx/ammar/use-studio-confirmation-dialog-in-lms
Confirm when leaving team
2015-08-27 17:26:07 +05:00
Ned Batchelder
65a317951c Add a comment explaining what ADVANCED_COMPONENT_TYPES should be.
While I'm in there, also fix the comment for ADVANCED_PROBLEM_TYPES.
2015-08-27 07:38:19 -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
d8b419c64f Review changes 2015-08-26 20:26:35 +05:00
muhammad-ammar
6134e8b5ed Move studio dialog code into common 2015-08-26 20:26:27 +05:00
asadiqbal
43316ea8fa SOL-1128 2015-08-26 15:11:46 +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