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

36358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edward Zarecor
9db6b04f2c Merge pull request #11983 from edx/e0d/cookie-updates 
Updating cookies settings
 2016-04-22 07:25:09 -04:00
M. Rehan
d659dd9f6d Merge pull request #12068 from edx/mrehan/sust-40-reduce-peroblem-get-ajax 
SUST-40 – Eliminate unwanted problem_get ajax requests flooding the LMS.
 2016-04-22 14:59:22 +05:00
Qubad786
dd8ab6eede Keep track of updated problem states. 
An event is being fired on actions (Check/Save/Reset) to keep track of updated problems. On coming back to already visited sequence position, while putting sequence contents in container, only those problems that are found outdated, are going to be updated from earlier tracked problems.

[SUST-40]
 2016-04-22 11:35:21 +05:00
Ben Patterson
76d3f5d8cb Merge pull request #12196 from edx/muddasser/updated_ff/sel_253/test_edit_raw_html 
Use type_in_codemirror instead of ActionChain to set content.
 2016-04-21 20:17:47 -04:00
Giovanni Di Milia
090cefcf44 Added REST API for certificates in LMS (#12055) 2016-04-21 17:15:06 -04:00
Renzo Lucioni
0d27b5ed87 Merge pull request #12215 from edx/renzo/program-factory 
Retrofit programs data mixin with factories
 2016-04-21 15:59:21 -04:00
Renzo Lucioni
1ffa81f746 Retrofit programs data mixin with factories 
This should make it easier to test programs-related features. Preface to ECOM-3200.
 2016-04-21 15:03:38 -04:00
Andy Armstrong
f8f5e70346 Merge pull request #12217 from edx/revert-12074-derf/clear_existing_assets_before_copying_new_assets 
Revert "clear existing assets before copying new assets"
 2016-04-21 12:36:17 -04:00
Clinton Blackburn
8f82192abf Merge pull request #12162 from edx/clintonb/jwt-updates 
JWT authentication updates
 2016-04-21 12:24:16 -04:00
Muddasser
5aaa045919 Use type_in_codemirror instead of actionchain to set contents in editor 2016-04-21 20:48:36 +05:00
Kevin Falcone
f9637ec135 Revert "clear existing assets before copying new assets" 2016-04-21 11:38:30 -04:00
Diana Huang
67c055e23f Merge pull request #12206 from CredoReference/impossible-to-click-check-without-answer 
Make it impossible to click "final check" without selecting a choice
 2016-04-21 11:00:44 -04:00
attiyaIshaque
fb83cd71f1 Merge pull request #12051 from edx/attiya/safe-templates 
Safe Templates
 2016-04-21 19:06:53 +05:00
Robert Raposa
74346430ba Merge pull request #12176 from edx/robrap/linter-javascript 
TNL-4325: Linter Enhancements for JavaScript files
 2016-04-21 09:25:49 -04:00
Ned Batchelder
c669daa917 Merge pull request #12211 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-04-21 09:11:07 -04:00
attiyaishaque
002ad84d4d Safe Templates 2016-04-21 17:55:29 +05:00
Mushtaq Ali
2291e2139f Merge pull request #12209 from edx/mushtaq/ora2_release 
ORA2 Version 1.1.4 Release
 2016-04-21 17:50:32 +05:00
Ned Batchelder
2248bc6c9c Update translations (autogenerated message) 2016-04-21 10:30:10 +00:00
Awais Qureshi
a3fcc93374 Merge pull request #12192 from edx/revert-12191-revert-12106-awais786/ECOM-3199-xseries-certs-view 
Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel""
 2016-04-21 11:56:49 +05:00
Mushtaq Ali
8e93c69e6d edx-ora2 release version 1.1.4 update 2016-04-21 11:29:58 +05:00
Robert Raposa
d1bda204e4 Enhance Mako linting 
- Lint JavaScript context for JavaScript violations
- Lint for Mako specific JavaScript rules
- Skip commented lines
- Change unicode to decode.utf8
- Count lint violations
 2016-04-21 01:23:50 -04:00
Dmitry Viskov
61127b613b Make it impossible to click "final check" without selecting a choice 2016-04-21 00:15:20 +03:00
Robert Raposa
11982461aa Add JavaScript linting rules 
- check proper use of JQuery functions
- check for concatenation with HTML strings
- add sort for output
- lint CoffeeScript
 2016-04-20 16:29:55 -04:00
Clinton Blackburn
5a7bc01986 JWT authentication updates 
- Using jwt_decode_handler from edx-drf-extensions
- Updated djangorestframework-jwt
- Removed feature flag around JWT auth

ECOM-4221
 2016-04-20 16:25:25 -04:00
Kevin Falcone
b6d5c614dd Merge pull request #12074 from edx/derf/clear_existing_assets_before_copying_new_assets 
clear existing assets before copying new assets
 2016-04-20 16:18:54 -04:00
Cliff Dyer
f1c4a44928 Merge pull request #12152 from edx/cdyer/oauth-toolkit-allow-inactive 
Fix django-oauth-toolkit email and inactive user issues
 2016-04-20 14:13:55 -04:00
Muddasser
72c058f2a9 Merge pull request #12146 from edx/muddasser/updated_ff/sel_253/test_youtube_id_w_different_local_server_sub 
fixed button click issue while repacing subtitles.
 2016-04-20 22:45:33 +05:00
Adam
96cbc7c50f Merge pull request #12202 from edx/adam/fix-pre-1900-course-setting-date 
fix issue with pre-1900 course setting dates (TNL-4397)
 2016-04-20 11:38:41 -04:00
Calen Pennington
498f38779a Merge pull request #11810 from CredoReference/making-asides-values-db-driven 
Dynamic values for the selectboxes with tags (tags are stored in the database tables)
 2016-04-20 11:08:41 -04:00
Adam
49173191f8 Merge pull request #12140 from edx/fix-certificate-query 
Fix certificate query
 2016-04-20 10:45:29 -04:00
Adam Palay
26377a5732 fix issue with pre-1900 course setting dates (TNL-4397) 2016-04-20 10:44:13 -04:00
Adam
88192fd444 Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel"" 2016-04-20 19:21:14 +05:00
Dmitry Viskov
1836065754 Dynamic values for the selectboxes with tags (tags are stored in the database tables) 2016-04-20 16:07:32 +03:00
Adam Palay
9a4f80e5c0 update query for whitelisted users who haven't yet had certs run for them 
remove CertificateStatuses.regenerating
 2016-04-20 09:01:49 -04:00
Adam
bb5874d5a1 truncate email from addresses if >320 chars when encoded (TNL-4264) (#12171) 
* truncate email from addresses if >320 chars when encoded (TNL-4264)

* use exact lengths
 2016-04-20 08:43:26 -04:00
Ben Patterson
85453fb059 Merge pull request #12175 from edx/benp/sel-253-ff42-fix-edit-test 
fix flaky condition in education dropdown.
 2016-04-20 08:39:57 -04:00
Adam
95ae255719 fix flaky test for oauth redirects (TNL-4190) (#12187) 2016-04-20 08:39:06 -04:00
Eric Fischer
47e4804b52 Merge pull request #11941 from CredoReference/invalid-order-in-problem-grade-report-csv 
EdX problem grade report doesn't order problems as shown in course
 2016-04-19 18:38:01 -04:00
Jesse Zoldak
15229ce96b Merge pull request #12191 from edx/revert-12106-awais786/ECOM-3199-xseries-certs-view 
Revert "Adding background image for xseries certificates on dashboard side bar panel"
 2016-04-19 11:46:23 -07:00
Jesse Zoldak
270814102f Revert "Adding background image for xseries certificates on dashboard side bar panel" 2016-04-19 13:52:19 -04:00
sanfordstudent
adcf4a98c7 Merge pull request #12038 from edx/sstudent/seq_item_title_ 
Displaying title of item in course sequence tooltip instead of list of item's children
 2016-04-19 13:32:34 -04:00
Calen Pennington
b2dace8069 Merge pull request #11808 from CredoReference/adapt-asides-to-be-exported-to-xml 
Adaptation asides to be exported to the XML
 2016-04-19 11:31:41 -04:00
Renzo Lucioni
c643bdf719 Merge pull request #12173 from edx/renzo/upgrade-management-commands 
Upgrade edx-management-commands to 0.1.1
 2016-04-19 11:05:49 -04:00
Sanford Student
bbcec0cf40 displaying title of sequence item in tooltip instead of children 2016-04-19 10:28:47 -04:00
Ayub khan
0becea942f Merge pull request #12144 from Ayub-Khan/SUST-35-course_key_from_string_or_404 
SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404
 2016-04-19 18:44:13 +05:00
Adam
e896359846 fix flaky oauth test (#12168) 2016-04-19 09:09:35 -04:00
Ayub-khan
66f52ba6e9 -fixed Tests. 2016-04-19 16:04:39 +05:00
Awais Qureshi
298770e51b Merge pull request #12106 from edx/awais786/ECOM-3199-xseries-certs-view 
Adding background image for xseries certificates on dashboard side bar panel
 2016-04-18 16:22:11 +05:00
tasawernawaz
75c0ec6149 Merge pull request #12178 from edx/tasawer/story/ecom-3201-handle-empty-list-of-courses-and-programs 
Updated dashboard UI for empty list of courses and programs
 2016-04-18 15:55:30 +05:00
tasawernawaz
b4e1e97185 ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-18 08:48:21 +00:00