Commit Graph

6923 Commits

Author SHA1 Message Date
Will Daly
ad9d9eb04e Support team UI for regenerating certificates
* Add new role for support staff.
* Move dashboard/support functionality into a new Django app called "support".
* Add support view for searching and regenerating certificates.
* Refactor certificates views into separate files.
2015-08-12 07:09:46 -07:00
Diana Huang
82eb1f6b74 Make status use ConfigurationModel instead. 2015-08-11 17:51:39 -04:00
Sarina Canelake
71d5180ba1 Add more context to translation strings 2015-08-11 13:11:32 -04:00
Brandon DeRosier
34526ddf6a Revert "Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment""
This reverts commit 42e78463a7.
2015-08-11 13:03:58 -04:00
Peter Fogg
344ff8c1bc Merge pull request #9267 from edx/release
2015-08-11 release
2015-08-11 12:07:21 -04:00
asadiqbal
8269bf5f1f SOL-1118 2015-08-11 19:25:23 +05:00
Chris Rodriguez
b757225c4b Fixing remaining contrast issue 2015-08-11 08:34:05 -04:00
David Baumgold
026c7edf32 Merge pull request #9252 from edx/no-studio-short-name-in-lms
settings.STUDIO_SHORT_NAME doesn't exist in LMS
2015-08-10 15:39:53 -04:00
David Baumgold
5953debee1 settings.STUDIO_SHORT_NAME doesn't exist in LMS 2015-08-10 10:45:09 -04:00
David Baumgold
8daf2a7854 settings.STUDIO_SHORT_NAME doesn't exist in LMS 2015-08-10 10:40:40 -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
Andy Armstrong
420696ba80 Separate out the Backbone image field 2015-08-08 09:43:20 -04:00
Peter Fogg
42e78463a7 Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment"
This reverts commit 53db053c18, reversing
changes made to 386a8a27dd.
2015-08-07 16:59:56 -04:00
cahrens
e95e23faf1 Allow discussion vendor files to be bundled.
Improve client-side performance.
2015-08-07 09:14:11 -04:00
Peter Fogg
2f7fa6fd8b Enforce discussions permissions in teams UI.
Adds a read-only mode to the discussion module which disables any
controls for updating the discussion (votes, follows, replies,
etc). This mode is enabled for users who are not a member of the team,
and are also not moderators, admins, or community TAs.
2015-08-06 11:15:56 -04:00
David Baumgold
668c7fdca3 Should never just link the word 'here' 2015-08-05 15:53:51 -04:00
muhammad-ammar
69450fce47 create a new team
TNL-1899
2015-08-05 17:55:26 +05:00
Peter Pinch
53db053c18 Merge pull request #8986 from jazkarta/remove-ccx-enrollment
Use the standard enrollment table instead of a custom CCX table for CCX enrollments
2015-08-03 13:18:41 -04:00
David Baumgold
386a8a27dd Merge pull request #8936 from edx/db/remove-unneeded-template-block
Remove unneeded block from courses.html template
2015-08-03 13:13:58 -04:00
John Eskew
ffc8a11789 Merge pull request #9092 from cpennington/user-state-client-tests
User state client tests
2015-08-03 12:25:05 -04:00
Peter Fogg
b47922cea0 Make team chat icon appear. 2015-08-03 10:09:40 -04:00
David Baumgold
7adaa22186 Remove unneeded block from courses.html template 2015-08-03 09:47:19 -04:00
Andy Armstrong
540e8464d9 Remove Mustache usage from discussions 2015-08-01 17:13:14 -04:00
Calen Pennington
aa374ca12a Make DjangoXBlockUserStateClient pass semantic tests
This required the following changes to the DjangoXBlockUserStateClient
semantics:

1) Changes get/get_many to return XBlockUserState tuples, rather
than state dictionaries or (block_key, state) tuples.
2) Raises DoesNotExist if get_history is called on an XBlock that has
had no data saved to it.
3) Returns XBlockUserState tuples as the results of get_history.
2015-08-01 08:13:25 -04:00
Carlos de la Guardia
458ed0a64e Use the standard enrollment table instead of a custom CCX table for CCX
enrollments.

The goal for this PR is to have a single mechanism for registering users and
reducing the number of places where special-casing for ccx courses is needed. The
migration at this point is purposefully limited to convert ccx memberships into
student enrollments when moving forward. No backward migration is in place at the
moment. The ccx membership tables are not removed at this time. It is possible to go
backwards and forwards multiple times with no errors or data loss.
2015-08-01 02:59:10 -05:00
Tim Krones
050b747b1d Display start date, end date, and number of sections (weeks) on "Course
Info" tab of instructor dashboard.
2015-07-31 09:38:09 +02:00
Davorin Šego
65eb26b7b4 Merge pull request #9004 from edx/dsego/discovery-ui-improvements
Improve course discovery filtering and empty search
2015-07-30 17:34:39 +02:00
Ahsan Ulhaq
ab69e0df1c Copy & Styling for Credit messages on Dashboard
ECOM-1917
2015-07-30 14:33:40 +05:00
aamir-khan
459ccae028 ECOM-1817: updated the course name and also styling for the provider 2015-07-29 15:12:07 +05:00
Andy Armstrong
601f160271 Merge pull request #6503 from edx/pull-out-lms-underscore-templates
Pull discussion underscore templates out into individual files
2015-07-28 22:33:34 -04:00
Will Daly
af4a569e89 Merge pull request #9093 from edx/will/ecom-1905
Allow users to submit initial verification at in-course checkpoints.
2015-07-28 11:13:32 -07:00
David Baumgold
c1a38a6dc7 Pull discussion underscore templates out into individual files
No need to go through Mako
2015-07-28 09:36:31 -04:00
aamir-khan
9f0f081a1f ECOM-1916: updated the dispaly 2015-07-28 14:59:48 +05:00
Davorin Sego
8d6df18357 Course discovery UI improvements 2015-07-28 11:59:44 +02:00
Will Daly
47b81c9274 Allow users to submit initial verification at in-course checkpoints.
* Combine verification and reverification photo submission end-points.
* Combine verification and reverification Backbone models.
* Allow deletion of verification status in Django admin.
* Initial verification from a checkpoint is associated with the checkpoint.
* Fix critical bug in which an invalid link was sent to Software Secure
  for the photo ID image of reverification attempts.
2015-07-27 19:32:18 -07:00
zubair-arbi
a2dd5d91f6 update caching for eligibility email content and edx-logo
ECOM-1525
2015-07-27 11:14:38 +05:00
Peter Fogg
c8ed59ac61 Redirect to dashboard from non-live courses.
TNL-2693
2015-07-24 13:05:47 -04:00
Matt Drayer
31b2be17d6 Merge pull request #9010 from edx/ziafazal/SOL-1045-hide-generate-certs-button
SOL-1045: hiding generated certificate button in case of self paced courses
2015-07-23 10:13:23 -04:00
Zia Fazal
5925edbfbc hiding generated certificate button in case of self paced courses 2015-07-23 17:02:34 +05:00
Daniel Friedman
d61d193dab Merge pull request #8859 from edx/dan-f/teams-list-view
Teams List View
2015-07-22 13:24:02 -04:00
Daniel Friedman
21b39ca467 Add teams-for-topic list view to Teams page.
TNL-1898

Also adds a generic paginated list view and Teams list view. The
common PaginatedView takes a collection and a view class for its items
and creates a header and footer with correct pagination. The topics
list view is refactored to use this generic view.

Authors:
  - Peter Fogg <pfogg@edx.org>
  - Daniel Friedman <dfriedman58@gmail.com>
2015-07-22 12:02:40 -04:00
Frances Botsford
6d6bfa7f35 added incontext option to system message styles for teams 2015-07-22 12:02:40 -04: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
Ahsan Ulhaq
06b085f8b4 credit eligibility and payment receipt email
ECOM-1796
ECOM-1525
2015-07-22 12:34:38 +05:00
Christina Roberts
e5928bacc2 Merge pull request #8894 from edx/andya/lms-requirejs
Implement RequireJS Optimizer in the LMS
2015-07-21 15:07:49 -04:00
Will Daly
81e677b713 Merge pull request #8959 from edx/will/separate-verification-and-upgrade-deadline
Separate verification deadline from upgrade deadline
2015-07-21 09:50:53 -07:00
Will Daly
25fa2ffc2d Separate verification deadline from upgrade deadline
* Add verification deadline model.
* Populate verification deadlines from course modes table.
* Update student dashboard to use verification deadlines.
* Update pay-and-verify view to use verification deadlines.
* Simplify Django admin for course modes and add validation.
* Add verification deadline to Django admin for course modes.
* Add UI for when the upgrade deadline is missed in the pay-and-verify flow.
2015-07-21 08:43:14 -07:00
cahrens
497d76fa54 Optimize edxnotes files. 2015-07-21 10:54:02 -04:00
Will Daly
d3f58b689f Credit progress page formatting bugfixes.
* Correctly format the student's full name on the progress page.
* Add tests for progress page credit requirements display.
* Display grade percentage for credit requirement on progress page
2015-07-20 13:08:13 -07:00
cahrens
ad16f9f968 Optimize search usages. 2015-07-20 14:24:30 -04:00