Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
37,555 Commits 1 Branch 0 Tags
11fa2f371111d6ea1eb382467b5d7f1dbbb1d6ff
Commit Graph

37555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Armstrong
11fa2f3711 Merge pull request #12782 from edx/ekolpakov/coffee_to_js_discussions 
Hackathon project: burn coffee
 2016-06-23 12:55:16 -04:00
Jesse Zoldak
2fab4938ea Merge pull request #12839 from edx/revert-12838-clee/update-oauth-provider 
Revert "Upgrade edx-oauth2-provider to v1.1.2"
 2016-06-23 12:49:51 -04:00
Jesse Zoldak
bbd0a82920 Revert "Upgrade edx-oauth2-provider to v1.1.2" 2016-06-23 12:46:45 -04:00
Christopher Lee
1bec9fd35d Merge pull request #12838 from edx/clee/update-oauth-provider 
Upgrade edx-oauth2-provider to v1.1.2
 2016-06-23 12:36:45 -04:00
christopher lee
76bdacdde8 Upgrade edx-oauth2-provider to v1.1.2 2016-06-23 12:34:20 -04:00
E. Kolpakov
2b8c02a759 Discussion coffee files to JS 2016-06-23 11:05:36 -04:00
Andy Armstrong
b1af59ad99 Move discussion .coffee files to .js 2016-06-23 11:05:36 -04:00
Christina Roberts
5b187d6f05 Merge pull request #12726 from edx/christina/deserialize_config_models 
ConfigurationModel deserializer and management command
 2016-06-23 08:45:14 -04:00
cahrens
0a6406e863 Add ConfigurationModel deserializer and management command. 
TNL-4781, TNL-4782
 2016-06-22 20:37:02 -04:00
Andy Armstrong
caedc92d67 Merge pull request #12796 from eduNEXT/fmo/coffee_to_js_module_edit 
Converting cms module_edit.coffee to js
 2016-06-22 18:20:41 -04:00
Felipe Montoya
82db66d945 Converting the module_edit coffee file to a js file 
Converting to js and fixing references

Linting the generated code
 2016-06-22 15:49:48 -05:00
Kevin Falcone
2c41d79c6d Merge pull request #12827 from edx/release 
Release -> Master after revert
 2016-06-22 15:37:27 -04:00
Clinton Blackburn
d7c570aacd Corrected name of static file (#12817) 
ECOM-4610
 2016-06-22 15:07:40 -04:00
Kevin Falcone
a5a235bd70 Merge pull request #12826 from edx/jibsheet/revert-pr-12573 
Revert "[PERF-325] Add versioned course asset URLs when canonicalizin…
 2016-06-22 13:38:45 -04:00
Kevin Falcone
9967b6fd58 Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths." 
We're seeing errors in NR from objects read out of the cache lacking the
'StaticContent' object has no attribute 'content_digest'
File "/edx/app/edxapp/edx-platform/common/djangoapps/contentserver/middleware.py",
    line 70, in process_request

This reverts commit 849ebc5f22.
 2016-06-22 12:11:35 -04:00
Sofiya Semenova
1d09f78742 Merge pull request #12756 from edx/ssemenova/flakeytest 
Fix flakey TextbooksTest
 2016-06-22 11:36:25 -04:00
mdinino
0a7c534d56 Merge pull request #12824 from edx/release 
Release
 2016-06-22 11:31:34 -04:00
ssemenova
9545c90a58 fixed flakiness 
TNL-4806
 2016-06-22 10:28:29 -04:00
Sofiya Semenova
08aeb27d94 Merge pull request #12803 from edx/ssemenova/disabledstates 
Got rid of aria-disabled states
 2016-06-22 09:47:25 -04:00
Ned Batchelder
0d8cf05d17 Merge pull request #12788 from edx/ned/update-transifex-client 
Use the latest version of the transifex client
 2016-06-22 09:36:54 -04:00
Michael Frey
48b80b519f Merge pull request #12811 from edx/mjfrey/micro-settings-merge 
mjfrey/micro-settings-merge: Override base dictionary keys with microsite configuration keys
 2016-06-22 08:31:50 -04:00
Muddasser
d336e246b6 Merge pull request #12801 from edx/muddasser/bok-choy-to-lettuce/component 
Conversion of cms/component.feature into bokchoy tests
 2016-06-22 17:07:16 +05:00
Muddasser
ce665e3b4c Conversion of cms/component.feature into bokchoy tests 2016-06-22 11:20:48 +00:00
Syed Hasan raza
01c8b3499c Merge pull request #12790 from edx/shr/bug/ECOM-4645-Certificate-exception-whitelisted-users 
exception_handling_for_unverified_cert_status
 2016-06-22 15:46:49 +05:00
Syed Hassan Raza
5f7cdcd30a exception_handling_for_unverified_cert_status 2016-06-22 13:33:40 +05:00
Michael Frey
6efc461fb6 mjfrey/micro-settings-merge: Override base dictionary keys with microsite configuration keys 
* mattdrayer: Add helpers.get_value test
* mattdrayer: Change to simpler implementation, per @douglashall
* mattdrayer: Address quality violations and test failures
 2016-06-21 23:28:36 -04:00
mdinino
8f69f62c64 Merge pull request #12808 from edx/rc/2016-06-21 
Rc/2016 06 21
 2016-06-21 22:04:58 -04:00
Renzo Lucioni
a240780b85 Merge pull request #12768 from edx/alasdair/ECOM-4224-certificate-messaging-for-program-course-cards 
Front End for certificates
 2016-06-21 16:58:15 -04:00
Douglas Hall
f8ac8c1aaa Merge pull request #12815 from edx/douglashall/SOL-1844 
SOL-1844 Upgrade edx-proctoring to 0.12.20
 2016-06-21 15:24:26 -04:00
Eric Fischer
49add6c963 edx-submissions version bump (#12812) 2016-06-21 14:44:34 -04:00
Clinton Blackburn
03095643c6 Exposed admin for LogoutViewConfiguration 
ECOM-4610
 2016-06-21 14:13:16 -04:00
ssemenova
ea81090293 fixed aria-disabled states 
TNL-4805
 2016-06-21 14:07:20 -04:00
AlasdairSwan
619829d5b5 Program details front end for certificates 
Part of ECOM-4224.
 2016-06-21 13:20:40 -04:00
Diana Huang
7c647e5e55 Merge pull request #12767 from edx/diana/topic-truncation 
Change topic name truncation.
 2016-06-21 11:21:01 -04:00
Andy Armstrong
037e27b268 Merge pull request #12208 from edx/andya/use-ui-toolkit-helpers 
Use the UI Toolkit's spec helpers
 2016-06-21 10:55:26 -04:00
Douglas Hall
697821e570 Upgrade edx-proctoring to 0.12.20 2016-06-21 10:47:46 -04:00
Andy Armstrong
d462c73fd8 Use the UI Toolkit's spec helpers. 2016-06-21 10:16:00 -04:00
Diana Huang
d75e633508 Change topic name truncation. 2016-06-21 09:59:25 -04:00
Renzo Lucioni
10ad29f33c Merge pull request #12757 from edx/renzo/link-to-detail 
Link program listing cards to detail pages
 2016-06-21 09:37:02 -04:00
Awais Qureshi
38a25446e9 Merge pull request #12773 from edx/tasawer/story/ecom-4199/inconsistancy-of-invalidate-certs 
Mark the invalidation entry as inactive If support user re-generates the cert.
 2016-06-21 15:06:57 +05:00
Douglas Hall
132d576e97 Merge pull request #12799 from edx/ibrahimahmed443/override-language-selector 
allow SHOW_LANGUAGE_SELECTOR to be overridden by MICROSITE_CONFIGURATION
 2016-06-21 05:36:33 -04:00
Awais
7ae64b4fb6 If support user re-generates the cert. Removes the invalidation entry if exists. 
ECOM-4199
 2016-06-21 14:08:56 +05:00
Brian Jacobel
949ddb11c6 Merge pull request #12809 from edx/bjacobel/dsc-image-overflow 
Add a third fixed case where images could overflow (refs #12735)
 2016-06-20 17:47:15 -04:00
Renzo Lucioni
9cd7c93223 Link program listing cards to detail pages 
When program detail pages are enabled, cards on the listing page will link to their respective detail pages. Includes extensive cleanup of program listing tests. ECOM-4227.
 2016-06-20 16:34:57 -04:00
Brian Jacobel
6aba6219c3 Add a third fixed case where images could overflow (refs #12735) 2016-06-20 16:32:52 -04:00
Andy Armstrong
cae69f9600 Merge pull request #12810 from edx/andya/no-karma-firefox-modals 
Don't auto-update during Karma test runs
 2016-06-20 16:21:28 -04:00
Andy Armstrong
f713308984 Don't auto-update during Karma test runs 2016-06-20 14:42:21 -04:00
kylecrawshaw
5e4ce786fd Merge pull request #12804 from edx/kylecrawshaw/unusable-password-option 
Added 'unusable_password' argument to 'manage_user' management command
 2016-06-20 14:07:53 -04:00
Kyle Crawshaw
47401742a9 Added 'unusable_password' argument to 'manage_user' management command 2016-06-20 11:30:56 -04:00
Andy Armstrong
519ebed615 Merge pull request #12780 from edx/andya/remove-coffeescript 
Convert XBlock runtime code from CoffeeScript
 2016-06-20 10:39:45 -04:00