Commit Graph

2004 Commits

Author SHA1 Message Date
Matt Drayer
2c1680a9cb Merge pull request #11080 from edx/saleem-latif/SOL-1529
SOL-1529: Allow PMs to Invalidate Certificates
2016-01-04 10:46:27 -05:00
Saleem Latif
9aa0a01cae Allow PMs to Invalidate Certificates 2016-01-04 14:28:32 +05:00
Peter Fogg
72ed155c8a Merge pull request #11046 from edx/merge-release-into-master
Merge release into master
2015-12-22 09:11:43 -05:00
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking
Bookmarking
2015-12-22 18:25:48 +05:00
Peter Fogg
39de6e828f Merge remote-tracking branch 'origin/release' into merge-release-into-master 2015-12-21 15:22:02 -05:00
clrux
ddc6b5ac6f Merge pull request #11041 from edx/clrux/ac-295
LMS: Adding missing third topic state
2015-12-21 13:11:43 -05:00
Chris Rodriguez
c603380a0b LMS: Adding missing third topic state 2015-12-21 12:13:47 -05:00
Matt Drayer
cf9468eaf0 Merge pull request #11007 from edx/asadiqbal08/SOL-1492
asadiqbal08/SOL-1492 - WebCerts: Generate Cert from Support Tool
2015-12-21 09:50:41 -05:00
Frances Botsford
7338f4bf31 adjust empty courseware search spacing 2015-12-21 09:26:32 -05:00
Usman Khalid
839b9484d7 Layout fixes required due to styling changes. 2015-12-21 15:42:29 +05:00
asadiqbal
37aebaa73b SOL-1492 2015-12-18 18:19:17 +05:00
umar-nawaz
132068eafb Merge pull request #10998 from edx/unawaz/swat-97-align
[SWAT-97] Logistration alignment and padding.
2015-12-18 15:58:53 +05:00
Peter Fogg
30f25105e9 Support tool for changing enrollments.
Allows support staff or global staff to view a list of a learner's
enrollments, and change enrollment modes. We generate a
ManualEnrollmentAudit record for these enrollment changes in order to
track updates. Additionally, enrollment changes are handled through
the enrollment API, which handles bookkeeping such as granting refunds
where appropriate.

ECOM-2825
2015-12-17 16:03:58 -05:00
Frances Botsford
0b9da334e2 adjusted styles for bookmarking 2015-12-17 12:25:09 -05:00
Frances Botsford
53eb9e605b layout fixes 2015-12-17 22:10:22 +05:00
muhammad-ammar
fcbe595c8a Bookmarks List Pagination
TNL-2490
2015-12-17 22:07:34 +05:00
muzaffaryousaf
3cbbb8f3b1 Add/Remove Bookmark button to each unit in LMS courseware.
TNL-1957
2015-12-17 22:07:32 +05:00
muhammad-ammar
c9b87aa099 Unit Bookmarks List View
TNL-1958
2015-12-17 22:07:31 +05:00
unawaz
a585fc7935 [SWAT-97] Logistration alignment and padding. 2015-12-17 16:07:42 +00:00
frances botsford
7c017969ca Merge pull request #10997 from edx/frances/lms-pagination-sass
Make pagination pattern sass globally available in LMS
2015-12-16 15:47:36 -05:00
clrux
3275b9d605 Merge pull request #10913 from edx/clrux/ac-177
LMS: addressing contrast issues on the Progress page
2015-12-16 15:12:42 -05:00
Peter Fogg
cb1aa0617d Merge pull request #10966 from edx/peter-fogg/fa-support-tool
WIP for financial support tool.
2015-12-16 15:08:59 -05:00
Peter Fogg
a680919e8c Support tool for changing enrollments.
Allows support staff or global staff to view a list of a learner's
enrollments, and change enrollment modes. We generate a
ManualEnrollmentAudit record for these enrollment changes in order to
track updates. Additionally, enrollment changes are handled through
the enrollment API, which handles bookkeeping such as granting refunds
where appropriate.

ECOM-2825
2015-12-16 14:17:19 -05:00
Frances Botsford
e18a6e28ca make pagination pattern sass globally available in LMS 2015-12-16 12:58:16 -05:00
Chris Rodriguez
8de5529ca4 LMS: addressing contrast issues on the Progress page 2015-12-16 11:09:27 -05:00
clrux
d8423a9018 Merge pull request #10914 from edx/clrux/ac-178
LMS: addressing contrast on the Instructor dashboard
2015-12-16 11:08:49 -05:00
Sarina Canelake
a9fc7aca69 Remove Legacy Instructor Dashboard 2015-12-14 10:12:38 -05:00
Bill DeRusha
67c322e77e Merge pull request #10946 from edx/bderusha/fa-require-country
Validate country on FA form
2015-12-14 08:36:40 -05:00
Sarina Canelake
5386d0a4ca Merge pull request #10845 from edx/kill-ora1
Remove ORA1: Main Pull Request
2015-12-11 17:31:41 -05:00
Bill DeRusha
5504050abd Validate country on FA form 2015-12-11 17:16:21 -05:00
Clinton Blackburn
2f131fafed Merge pull request #10961 from edx/release
Merging patch/2015-12-11
2015-12-11 15:16:52 -05:00
stv
daf359097d Remove ORA1 static assets from LMS 2015-12-11 15:07:07 -05:00
Clinton Blackburn
8fcf574029 Corrected Dashboard Display
- Simplified logic determiningg credit messaging on dashboard
- Fixed bug preventing users from initiating credit request

ECOM-2893
2015-12-11 13:02:28 -05:00
asadiqbal
9a01078088 SOL-1455 enhancement 2015-12-11 14:56:43 +05:00
Kevin Falcone
8b3ea56d93 Merge pull request #10945 from edx/release
Merge down patch-2015-12-10
2015-12-10 21:34:45 -05:00
David Baumgold
10fd56e86e Save necessary deprecated Sass variables 2015-12-10 14:36:45 -05:00
David Baumgold
b7b1c63b85 Remove unused edge Sass 2015-12-10 14:36:44 -05:00
Peter Pinch
259de40788 Merge pull request #10353 from mitocw/enhancement/aq/disbale_due_dates_section_unit
Made CCX schedule configuration sync with studio (Date time management).
2015-12-10 14:21:20 -05:00
Matt Drayer
1e96c81dba Merge pull request #10901 from edx/saleem-latif/SOL-1418
saleem-latif/SOL-1418: Revised Generate Certificates Section and added Certificate Generation UI
2015-12-10 12:52:58 -05:00
Amir Qayyum Khan
53b22cbf1f Made dates configuration for CCX schedule same as in studio (Course) 2015-12-10 18:45:00 +05:00
Saleem Latif
3134a76118 Revised Generate Certificates Section and added Certificate Generation history UI. 2015-12-10 16:26:19 +05:00
Chris Rodriguez
2cdd0a98a1 Fixing contrast issues in the forums 2015-12-09 15:40:17 -05:00
Chris Rodriguez
3eab4482e1 LMS: addressing contrast on the Instructor dashboard 2015-12-09 13:17:15 -05:00
Matt Drayer
1f2f3de4a2 Merge pull request #10809 from edx/asadiqbal08/SOL-1455
asadiqbal08/SOL-1455 Certs: Revise Exceptions UI
2015-12-09 00:14:26 -05:00
chrisndodge
4334eb9bd1 Merge pull request #10885 from edx/release
Release
2015-12-08 15:21:48 -05:00
asadiqbal
dfd9b463f0 SOL-1455 2015-12-08 17:51:46 +05:00
clrux
33928c502c Merge pull request #10797 from edx/clrux/ac-255
LMS: darkening footer copyright text for WCAG
2015-12-07 11:16:37 -05:00
Sarina Canelake
337eabbb00 Merge pull request #10836 from edx/kill-foldit
Remove 'FoldIt' XModule
2015-12-07 10:18:40 -05:00
Awais Qureshi
7b21674852 Merge pull request #10751 from edx/awais786/ECOM-2866-new-checkout-page-for-testing
Awais786/ecom 2866 new checkout page for testing
2015-12-07 14:12:08 +05:00
Sarina Canelake
84a96e40c4 Remove 'Fold It' XModule 2015-12-06 11:38:05 -05:00