Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,440 Commits 1 Branch 0 Tags
fcbe595c8aece45dec75c1ccf5599c1ea15fc23d
Commit Graph

13044 Commits

Author SHA1 Message Date
muhammad-ammar
fcbe595c8a Bookmarks List Pagination 
TNL-2490
 2015-12-17 22:07:34 +05:00
Usman Khalid
4304c66c54 Performance optimizations and cache to keep the bookmarks info updated. 
The cache uses the bookmarks.XBlockCache model.

TNL-1945
 2015-12-17 22:07:34 +05:00
muzaffaryousaf
50a6b3b684 Resolving the jsHint warnings. 2015-12-17 22:07:34 +05:00
muzaffaryousaf
7413484b8d Resolving the moment.js issues 
TNL-1958
 2015-12-17 22:07:33 +05:00
Muhammad Ammar
1e9907a8c8 Bookmark Events 
TNL-1944
 2015-12-17 22:07:33 +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
Usman Khalid
cfd1fabb67 Added type field to bookmark resource. 2015-12-17 22:07:31 +05:00
muzaffaryousaf
1616de5051 Bookmarks API. 
TNL-2180
 2015-12-17 22:07:30 +05:00
Peter Fogg
283623ab35 Merge pull request #11019 from edx/peter-fogg/add-ungenerated-migrations 
Add autogenerated migrations due to field default changes.
 2015-12-17 11:55:55 -05:00
Bill DeRusha
d9f6f90c3d Merge pull request #11010 from edx/bderusha/auto-deadlines 
Fix auto set deadlines on publish
 2015-12-17 11:28:46 -05:00
Peter Fogg
24edef8998 Add ungenerated migrations due to field default changes. 2015-12-17 10:18:51 -05:00
Matt Drayer
63d0c74439 Merge pull request #11018 from edx/saleem-latif/SOL-1528 
SOL-1528: Generate Certificates for whitelisted students even if they have existing (notpassing, error etc.) certificates
 2015-12-17 09:43:48 -05:00
wajeeha-khalid
e37f8ff767 Merge pull request #10905 from edx/jia/MA-1051 
MA-1051 - DiscussionAPI: Remove http errors from api.py
 2015-12-17 15:42:40 +05:00
Saleem Latif
fb0fbbbaa4 skip 'filtering students' only when students are given and statuses to regenerate are not 2015-12-17 12:25:42 +05:00
Matt Drayer
abb8484ec2 Merge pull request #10974 from edx/saleem-latif/SOL-1418-review-changes 
SOL-1418: display certificate generate history in reverse chronological order
 2015-12-17 00:02:13 -05: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
Bill DeRusha
1846353a1f Fix auto set deadlines on publish 2015-12-16 13:58:13 -05:00
Frances Botsford
e18a6e28ca make pagination pattern sass globally available in LMS 2015-12-16 12:58:16 -05:00
Diana Huang
ba526f4f39 Merge pull request #11008 from edx/release 
Release
 2015-12-16 12:05:20 -05:00
wajeeha-khalid
588833ff43 MA-1051: DiscussionAPI - Removed http errors from api.py and refactored to more specific errors 2015-12-16 21:23:51 +05:00
wajeeha-khalid
6bc6b3f001 Merge pull request #10989 from edx/jia/MA-1046 
MA-1046 added valid form field test
 2015-12-16 21:22:26 +05:00
Chris Rodriguez
8de5529ca4 LMS: addressing contrast issues on the Progress page 2015-12-16 11:09:27 -05:00
Renzo Lucioni
a8a88390eb Merge pull request #11000 from edx/renzo/kill-it-with-fire 
Delete dead SUBDOMAIN_BRANDING setting.
 2015-12-16 11:09:12 -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
wajeeha-khalid
0847183458 MA-1046 added valid form field test 2015-12-16 19:06:35 +05:00
Saleem Latif
22653b18d9 Disable 'Generate Exception Certificates' button when there are no certificate exceptions. 2015-12-16 10:30:02 +05:00
Saleem Latif
300825efc2 Remove unused imports 2015-12-16 10:27:24 +05:00
Saleem Latif
da0664c5fe Add i18n to strings 2015-12-16 10:26:23 +05:00
Saleem Latif
8b2c4994fa display certificate generate history in reverse chronological order 2015-12-16 10:22:56 +05:00
Renzo Lucioni
23c582d01d Delete dead SUBDOMAIN_BRANDING setting. 2015-12-15 14:42:09 -05:00
David Ormsbee
e15907c76f Revert "Remove staff debug category type whitelist." 
This reverts commit bb25473a7c.

Reason for revert: Was breaking display on Course About and Info
pages.
 2015-12-15 10:06:40 -05:00
Renzo Lucioni
da16b3da22 Remove dead code 
Deletes unused code from an old implementation of microsites.
 2015-12-14 16:38:14 -05:00
Renzo Lucioni
bdea61c848 Merge pull request #10960 from edx/renzo/run-org-filtering 
Modify Course API to filter visible courses by org
 2015-12-14 16:35:18 -05:00
Renzo Lucioni
2cee39d535 Modify Course API to filter visible courses by org 
Org to filter by is provided to the Course API list view using a querystring argument. Filtering ultimately occurs at the database layer. ECOM-2761.
 2015-12-14 15:32:46 -05:00
Sarina Canelake
4385cc507e Merge pull request #10942 from edx/kill-legacy-dash 
Remove Legacy Instructor Dashboard
 2015-12-14 15:27:50 -05:00
clrux
a6e8383489 Merge pull request #10706 from edx/clrux/ac-188-no-draggabilly 
Video: Adding closed captioning to the video player (not draggable)
 2015-12-14 11:07:12 -05:00
chrisndodge
ac1ee17e44 Merge pull request #10555 from edx/cdodge/microsites-id-verification-status 
Add support for microsite overrides (template & configuration) for th…
 2015-12-14 10:34:21 -05:00
Chris Rodriguez
b883d52722 Adding closed captions (not draggable) 2015-12-14 10:19:11 -05:00
Sarina Canelake
a9fc7aca69 Remove Legacy Instructor Dashboard 2015-12-14 10:12:38 -05:00
Nimisha Asthagiri
160f391408 Merge pull request #10959 from edx/course_overview/manual_seeding 
Course Overview - require manual seeding of the table
 2015-12-14 08:39:03 -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
Nimisha Asthagiri
d6364312f4 Course Overview - require manual seeding of the table. 2015-12-13 23:35:46 -05:00
Matt Drayer
115b169259 mattdrayer/SOL-1519: Include course-level configuration in feature check 2015-12-13 09:57:29 -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
27f853d605 Followup to Credit Patch 
- Removed unused variable
- Updated message class and text
- HTML-escaping relevant fields

ECOM-2893
 2015-12-11 15:53:18 -05:00