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

30507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Piacenti
2aa85a72f0 Fix for flaky library users studio test, SOL-618 2015-06-02 19:52:46 +00:00
swdanielli
53c35ae55f Merge pull request #8290 from edx/danielli/recommender_img_preview 
handle more exceptions for file uploading
 2015-06-01 12:30:09 -04:00
swdanielli
49f378b2af handle more exceptions for file uploading 2015-06-01 11:44:51 -04:00
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
Marko Jevtić
0fc3c14dec Merge pull request #8187 from edx/mjevtic/SOL-883 
(SOL-883) (SOL-893) RTL support for Registration Code redemption page
 2015-06-01 15:00:47 +02: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
Davorin Šego
8a7193e42a Merge pull request #8024 from edx/feature/SOL-276 
Feature/sol 276 WIP
 2015-06-01 11:46:15 +02:00
Davorin Sego
176b1c8962 Course Discovery - Language Filtering 
Filter by Language:
Designation for course language(s) in Studio
allows for filtering of courses based on their language in the sidebar
Reuses active filter view UI/IA from find courses page on edx.org
view for clearing individual or all filters, as with edx.org filtering
 2015-06-01 10:45:51 +02:00
Martyn James
7f633fc045 Course Discovery feature using edx-search 2015-06-01 10:33:45 +02:00
Sarina Canelake
de3cccdbe4 Merge pull request #8291 from edx/sarina/fix-help-string 
Add correct_or_past_due option for showanswer help text
 2015-05-31 18:48:19 -04:00
Sarina Canelake
be8eed65c8 Internationalize help text 2015-05-31 17:22:52 -04:00
Sarina Canelake
1237ee6b37 Add correct_or_past_due option for showanswer help text (ref bbeb79cb) 2015-05-31 17:22:51 -04:00
Sarina Canelake
a00ee2750a Merge pull request #8268 from edx/sarina/i18n-issues 
Use platform name, not edX, in all strings
 2015-05-31 17:15:39 -04:00
Sarina Canelake
e4fa06138a Use platform name, not edX, in all strings 2015-05-31 16:05:50 -04:00
Adam
93faba006c Merge pull request #8284 from edx/merge-release-to-master 
Merge release to master
 2015-05-30 05:38:20 -04:00
Adam Palay
683d2b3dbe fix quality violation 2015-05-29 21:46:02 -04:00
Adam Palay
e3976f7e98 Merge remote-tracking branch 'origin/release' into merge-release-to-master 2015-05-29 19:47:12 -04:00
Adam
cc74701113 Merge pull request #8283 from edx/hotfix/2015-05-29 
Hotfix/2015 05 29
 2015-05-29 19:43:24 -04:00
Adam Palay
0aba5874e6 Revert "Fieldset and legend solution is lost when edit Problem" 
This reverts commit 16a248b997.
 2015-05-29 18:50:34 -04:00
Adam Palay
509f27f02c Revert "changes for failing label test" 
This reverts commit c75526ea5e.
 2015-05-29 18:50:23 -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
John Eskew
3d878240a5 Merge pull request #8276 from edx/hotfix/2015-05-29 
Hotfix/2015 05 29
 2015-05-29 17:40:45 -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
Sarina Canelake
acbc2113a2 Merge pull request #8278 from edx/sarina/20150529-translations-update 
Update translations (autogenerated message)
 2015-05-29 15:26:51 -04:00
Sarina Canelake
fe789d6c43 Update translations (autogenerated message) 2015-05-29 15:26:13 -04:00
Calen Pennington
6d7944fa34 Allow specification of ReadPreference via DOC_STORE_CONFIG. 
Use a MongoReplicaSetClient for Split modulestore, but only
if replicaSet config is set.
 2015-05-29 14:58:20 -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
Sarina Canelake
69e274151d Merge pull request #8251 from edx/sarina/dummy-rtl-lang 
Add fake Arabic testing language
 2015-05-29 13:02:47 -04:00
Will Daly
1a844a006e Merge pull request #8265 from edx/will/fix-credit-requirement-migration 
Fix credit requirement "criteria" name
 2015-05-29 11:55:50 -04:00
Renzo Lucioni
3b2d067e79 Resolve merge conflict between master and release 2015-05-29 11:17:49 -04:00
Renzo Lucioni
b5c6eb787c Merge pull request #8255 from edx/patch/2015-05-29 
patch/2015-05-29
 2015-05-29 11:12:18 -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
Will Daly
05ea62fb78 Fix credit requirement "criteria" name 
The CreditRequirement "configuration" field was renamed in Django
code without updating the migration.  This commit adds a second
migration to delete the incorrect field and add a new field.
The credit feature is currently disabled in production, so
the model isn't currently used by application code.
 2015-05-29 08:22:45 -04:00
Dino Cikatic
077ea49b58 SOL-839 confirmation and receipt page internationalization 2015-05-29 13:49:19 +02:00
David Baumgold
097f3fca8b Merge pull request #8112 from crispweed/master 
Scroll to new textbook and make input active, on textbook create
 2015-05-29 10:51:23 +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
Ned Batchelder
9b0588dbfe Merge pull request #8221 from edx/ned/tnl-2269 
Compute RTL every time it is needed.
 2015-05-28 17:31:45 -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
Sarina Canelake
4eaa12d9a7 Merge pull request #8237 from edx/revert-i18n-lon-capa-problem-explanation-title 
Revert "i18n lon-capa problem explanation title"
 2015-05-28 14:03:57 -04:00