Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,507 Commits 1 Branch 0 Tags
2aa85a72f0c3b8db1c33b331a19adfd78f0df157
Commit Graph

11147 Commits

Author SHA1 Message Date
zubair-arbi
c6439b53d0 Merge pull request #8231 from edx/zub/story/ecom-1612-change-icrv-block-fields 
use reverification xblock location as an identifier of reverification…
 2015-06-01 20:41:47 +05:00
zubair-arbi
803bc5532d use reverification xblock location as an identifier of reverification checkpoint 
ECOM-1612
 2015-06-01 19:33:04 +05:00
Ben McMorran
f425027134 Merge pull request #8048 from edx/benmcmorran/search-tags 
Enable HTML in note tags and support highlighting
 2015-06-01 09:37:23 -04:00
marjev
3fe8768d93 (SOL-883) RTL support for Registration Code redemption page 2015-06-01 13:59:33 +02:00
dino-cikatic
62797a3f2e Merge pull request #7697 from edx/feature/course-discovery 
Feature/course discovery
 2015-06-01 11:46:44 +02:00
Martyn James
7f633fc045 Course Discovery feature using edx-search 2015-06-01 10:33:45 +02:00
Sarina Canelake
e4fa06138a Use platform name, not edX, in all strings 2015-05-31 16:05:50 -04:00
John Eskew
a0675a16d0 Merge pull request #8281 from edx/release 
Merging hotfix-2015-05-29 from release to master
 2015-05-29 18:32:46 -04:00
Ben McMorran
6d2464a3ea fixup! Enable HTML in note tags and support highlighting 2015-05-29 21:00:56 +00:00
John Eskew
c33c782fcb Wrap _invoke_xblock_handler in a bulk_op. 2015-05-29 15:57:19 -04:00
Renzo Lucioni
2ca4acb4e3 Merge pull request #8272 from edx/renzo/merge-release-into-master 
Merge release into master
 2015-05-29 14:07:27 -04:00
Renzo Lucioni
3b2d067e79 Resolve merge conflict between master and release 2015-05-29 11:17:49 -04:00
Sarina Canelake
e72d5d542b Add fake Arabic testing language 2015-05-29 10:16:30 -04:00
AlasdairSwan
cc93dcab32 Merge pull request #8247 from edx/alasdair/ECOM-1547-footer-v3-style-update 
ECOM-1339 minor CSS tweaks for the footer. It now extends the full wi…
 2015-05-29 09:10:30 -04:00
dino-cikatic
0d975674c2 Merge pull request #8186 from edx/dcikatic/SOL-839 
SOL-839 label cursor and receipt internationalization
 2015-05-29 14:43:22 +02:00
Dino Cikatic
077ea49b58 SOL-839 confirmation and receipt page internationalization 2015-05-29 13:49:19 +02:00
Ahsan Ulhaq
361d82adbb Merge pull request #8021 from edx/ahsan/AC-107-calculator-incompatible-aria-role-attribute 
calculator incompatible aria role attribute
 2015-05-29 02:11:37 -04:00
Christina Roberts
eb3d3a99a5 Merge pull request #8246 from edx/christina/TNL-2251 
Fix bug when student scoring error occurs with no message.
 2015-05-28 21:05:00 -04:00
jsa
18cbc0a557 Suppress email for refunds unless mode is verified. 
XCOM-375
 2015-05-28 17:26:36 -04:00
Renzo Lucioni
0b173946ee Use publicly-accessible ecommerce URL root when constructing refund email 
Parsing the ECOMMERCE_API_URL yields a URL root only accessible from within the VPC.
 2015-05-28 17:26:26 -04:00
cahrens
4d4e260964 Fix bug when student scoring error occurs with no message. 
TNL-2251
 2015-05-28 16:49:02 -04:00
Ned Batchelder
eb3b8c5ce4 TNL-2269 Compute language direction every time. 
The old code would compute the language direction once when the template
was loaded.

TNL-2269
 2015-05-28 16:13:59 -04:00
AlasdairSwan
0c7abfbe72 ECOM-1339 minor CSS tweaks for the footer. It now extends the full width of the browser and fixes issues with link hover states. 2015-05-28 15:16:03 -04:00
Renzo Lucioni
81578791ed Merge pull request #8219 from edx/renzo/external-ecommerce-url 
Use publicly-accessible ecommerce URL root when constructing refund email
 2015-05-28 12:13:25 -04:00
Will Daly
78ea4d55f4 Merge pull request #8175 from edx/will/footer-api-redux 
ECOM-1339 Branding API footer
 2015-05-28 11:03:06 -04:00
Sarina Canelake
a3b4a2516e Merge pull request #8220 from edx/sarina/ignore-migrations-for-coverage 
Ignore migrations in coverage reports
 2015-05-28 10:21:21 -04:00
Renzo Lucioni
8dfd250171 Use publicly-accessible ecommerce URL root when constructing refund email 
Parsing the ECOMMERCE_API_URL yields a URL root only accessible from within the VPC.
 2015-05-28 09:45:08 -04:00
Will Daly
6af5fc1452 ECOM-1339 Branding API footer 
Serve branded footer JSON/HTML/CSS/JS from an API endpoint
in the branding app.  Refactor OpenEdX and EdX.org footer templates
to use the Python version of the API, ensuring that the API
values are consistent with the footer included in main.html.

Detailed changes:

* Added footer API end-point to the branding app.
* Footer API allows the language to be set with querystring parameters.
* Footer API allows showing/hiding of the OpenEdX logo using querystring parameters.
* Deprecate ENABLE_FOOTER_V3 in favor of the branding API configuration flag.
* Move no referrer script into main.html from the edx footer template.
* Rename rwd_header_footer.js to rwd_header.js
* Cache API responses.

Authors:
Awais Qureshi, Aamir Khan, Will Daly
 2015-05-28 08:30:45 -04:00
Aamir
4a14ec694f Merge pull request #8122 from edx/aamir-khan/ECOM-1590-populate-requirements-table-new 
ECOM-1590: added the min_grade as a requirements
 2015-05-28 15:04:31 +05:00
Ahsan Ulhaq
9044e48cad Calculator a11y issues 
AC-107
 2015-05-28 13:23:22 +05:00
aamir-khan
97b5ff7e8b ECOM-1590: added the min_grade as a requirements 2015-05-28 12:28:38 +05:00
Awais Qureshi
5c5ec5c471 Merge pull request #8157 from edx/awais786/ECOM-1494-deprecate-midcourse-code 
Awais786/ecom 1494 deprecate midcourse code
 2015-05-28 12:25:48 +05:00
Sarina Canelake
359e6134af Ignore migrations in coverage reports 2015-05-27 21:07:49 -04:00
David Ormsbee
ba4be3cdea Merge pull request #8117 from mcgachey/mcgachey-lti-migrations 
[LTI Provider] Refactoring and clean-up
 2015-05-27 16:52:03 -04:00
Phil McGachey
a7b8b3f503 [LTI Provider] Documentation fix 2015-05-27 15:37:30 -04:00
Nimisha Asthagiri
83866943bb Merge pull request #8212 from edx/mobile/API_decorators 
Move generic mobile API view decorators.
 2015-05-27 15:36:48 -04:00
Nimisha Asthagiri
a7fabd5927 Move generic mobile API view decorators. 2015-05-27 14:35:27 -04:00
Phil McGachey
1ea4b8a026 Logging invalid key errors 2015-05-27 13:56:10 -04:00
Nimisha Asthagiri
5bf6009975 Merge pull request #8211 from edx/mobile/update_video_outline 
Minor update to video_outline API.
 2015-05-27 13:27:59 -04:00
Greg Price
f3911c44c0 Merge pull request #8198 from edx/gprice/discussion-api-create-thread-following 
Add "following" parameter to thread creation
 2015-05-27 13:14:47 -04:00
Phil McGachey
577438d085 Addressing review comments 2015-05-27 12:22:34 -04:00
Nimisha Asthagiri
5aa15954f7 Minor update to video_outline API. 2015-05-27 12:00:18 -04:00
Greg Price
df3e6535dc Add "following" parameter to thread creation 
This allows authors to follow the thread immediately upon creation.
 2015-05-27 10:58:14 -04:00
Nimisha Asthagiri
8aae4023f9 MA-738 OAuth2 token exchange for session cookie. 2015-05-27 07:35:31 -04:00
Awais
d0df626685 ECOM-1494 removing code from models. 2015-05-27 16:32:26 +05:00
Ahsan Ulhaq
0a43ebf191 Merge pull request #8113 from edx/ahsan/ECOM-1302-Continue-Payment-button-not-accessible 
Continue to Payment button is not accessible
 2015-05-27 02:02:36 -04:00
chrisndodge
99de1c8f48 Merge pull request #7992 from edx/muhhshoaib/SOL-794-generate-detailed-enrollment-report 
Muhhshoaib/sol 794 generate detailed enrollment report
 2015-05-26 15:57:22 -04:00
Greg Price
93178bc395 Merge pull request #8170 from edx/gprice/discussion-api-create-thread 
Add thread creation to discussion API
 2015-05-26 14:22:00 -04:00
frances botsford
c8c83b5c69 Merge pull request #8193 from edx/frances/fix/dashboard-verified-status 
fix verification widget layout on dashboard
 2015-05-26 14:16:44 -04:00
Jesse Zoldak
e424ce8a1d Merge pull request #8196 from edx/release 
Merge hotfix from release to master
 2015-05-26 14:15:09 -04:00