Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,921 Commits 1 Branch 0 Tags
372e52bf08dade77f4e376aec1872eab08051e57
Commit Graph

29921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
372e52bf08 Merge pull request #7792 from edx/commit-hash-for-django-settings-context-processor 
Set explicit git commit hash for django-settings-context-processor
 2015-04-30 09:33:21 -04:00
zubair-arbi
4d9781aaa7 Merge pull request #7813 from edx/zub/story/ecom-1477-verfication-model-add-itemid 
add location_id field for the Reverification XBlock in VerificationStatu...
 2015-04-30 11:27:22 +05:00
David Baumgold
6eaeddc347 Merge pull request #6712 from edx/update-pytz 
Update pytz to 2015.2
 2015-04-29 13:17:40 -04:00
David Baumgold
22804e4199 Use pytz-compatible versions of ora2 and ease 2015-04-29 12:17:29 -04:00
David Baumgold
3684c083f2 Update pytz to 2015.2 
pytz changed their versioning scheme from using letters to using
numbers. The old scheme is screwing up new versions of pip.
 2015-04-29 12:17:29 -04:00
Daniel Friedman
a19872a8ff Merge pull request #7863 from edx/dan-f/fix-typo 
Correct "shure" to "sure" in a comment
 2015-04-29 16:09:51 +00:00
Daniel Friedman
9e90ec5c0a Correct "shure" to "sure" in a comment 2015-04-29 16:05:43 +00:00
David Baumgold
b8bf9b927f Merge pull request #7861 from edx/db/fix-spelling 
Correct spelling in a comment
 2015-04-29 11:30:32 -04:00
David Baumgold
28c898c395 Correct spelling in a comment 2015-04-29 11:27:07 -04:00
Adam
bc499e3bdc Merge pull request #7725 from edx/adam/add-script-for-hotfix 
add script for generating commands needed for hotfix
 2015-04-29 11:24:57 -04:00
Will Daly
50e9b43512 Merge pull request #7826 from edx/will/update-reverification-flow-copy 
Update copy on reverification flow.
 2015-04-29 10:38:54 -04:00
Sarina Canelake
aed9ba8a38 Merge pull request #7818 from mcgachey/mcgachey-lti-render 
[LTI Provider] Wiring up LTI views to the courseware template
 2015-04-29 10:34:09 -04:00
Sarina Canelake
cd9ce147d0 Merge pull request #7831 from amir-qayyum-arbisoft/icon_in_set_date 
Fixed cross icon issue on set date dialog inside schedule tab
 2015-04-29 09:47:33 -04:00
zubair-arbi
da94aca522 add location_id field for the Reverification XBlock in VerificationStatus model 
ECOM-1477
 2015-04-29 18:41:30 +05:00
amir-qayyum-arbisoft
3e5e6065e4 fixed cross icon issue on set date dialog inside schedule tab 2015-04-29 15:28:21 +05:00
Ahsan Ulhaq
5a1d180f14 Merge pull request #7790 from edx/ahsan/AC-34-visually-hidden-contents-accessible-via-keyboard 
Visually hidden content accessible through keyboard
 2015-04-29 06:19:41 -04:00
Aamir
dc308d4f28 Merge pull request #7772 from edx/awais786/ECOM-1441-additional-methods 
ECOM-1441 additional methods for skip re-verification links.
 2015-04-29 14:13:10 +05:00
Awais
860467e7d2 ECOM-1441 additional methods for skip re-verification links. 2015-04-29 12:17:15 +05:00
Matt Drayer
7b3bcef155 Merge pull request #7820 from edx/mattdrayer/SOL-475 
Fix for SOL-475 (double exam grader bug)
 2015-04-28 16:24:07 -04:00
Akiva Leffert
d7d60bc563 Merge pull request #7837 from edx/aleffert/structure-indentation 
Fix indentation for course structure API example
 2015-04-28 15:24:43 -04:00
Chris
d9e13d22b8 Merge pull request #7763 from edx/clrux/sequence-nav-button-icons 
Changing sequence nav buttons from images to icon fonts
 2015-04-28 14:05:38 -04:00
Akiva Leffert
f6401c1640 Fix indentation for course structure API example 2015-04-28 13:56:40 -04:00
Matt Drayer
c6ecf2551e Fix for SOL-475 (double exam grader bug) 
- Remove grader(s) upon deletion of existing entrance exam
- Remove grader(s) upon addition of new entrance exam
 2015-04-28 12:49:03 -04:00
Sarina Canelake
6eda3ef758 Merge pull request #7672 from edx/feanil/new_mailchimp_sync 
Update Mailchimp sync scripts to be within platform
 2015-04-28 11:55:23 -04:00
Chris Rodriguez
74ce5cbb87 Changing sequence nav buttons from images to icon fonts 2015-04-28 11:04:16 -04:00
Phil McGachey
854c9637f1 [LTI Provider] Addressing review comments 2015-04-28 10:35:44 -04:00
Sarina Canelake
b2d9d339d1 Docstrings for mailchimp scripts 2015-04-28 10:23:10 -04:00
Sarina Canelake
2d3dab9936 Remove 'batches' function, since == to 'chunk' 2015-04-28 10:23:10 -04:00
Sarina Canelake
f93073401c Quality fixups for Mailchimp scripts 2015-04-28 10:23:09 -04:00
Feanil Patel
d71433e223 Address comments. 2015-04-28 10:23:09 -04:00
Feanil Patel
934207bf03 Fixes to get it working with master. 2015-04-28 10:23:08 -04:00
Feanil Patel
5c0adf04ad Move mailchimp to a newer version of the edxapp. 2015-04-28 10:23:08 -04:00
Ben Patterson
1bed97e952 Merge pull request #7821 from edx/benp/flaky-TNL-2083 
Flag test as flaky. TNL-2083.
 2015-04-28 09:34:51 -04:00
Will Daly
d9ed2c024b Update copy on reverifcation flow. 
* Remove course ID and checkpoint name debugging information.
* Update page title.
 2015-04-28 08:10:24 -04:00
Awais Jibran
3bd45358ab Merge pull request #7753 from edx/aj/tnl1745-change-email-on-dashboard 
Fixed change email address error from student dashboard
 2015-04-28 11:29:15 +05:00
Jim Abramson
70d837ab62 Merge pull request #7777 from edx/jsa/baskets 
use commerce api v2.
 2015-04-27 22:30:37 -04:00
Mark Hoeber
323e466e21 Merge pull request #7579 from edx/sylvia/docs/templateupdates 
Update component templates, round 1
 2015-04-27 20:43:29 -04:00
jsa
efde11d552 Use ecommerce api v2. 
XCOM-213 XCOM-214
 2015-04-27 16:57:17 -04:00
Ben Patterson
c2fd2739b8 Flag test as flaky. TNL-2083. 2015-04-27 16:55:01 -04:00
Nimisha Asthagiri
4b6a171614 Merge pull request #7805 from edx/mobile/push-notification-ios 
MA-668 Mobile Push Notification payload update
 2015-04-27 16:04:31 -04:00
Mark Hoeber
356b10c271 Update component templates for accessibility and content 2015-04-27 14:45:36 -04:00
Phil McGachey
31790ab415 [LTI Provider] Wiring up LTI views to the courseware template 2015-04-27 11:52:26 -04:00
Ben Patterson
4a4c3c56de Merge pull request #7806 from edx/benp/skip-test-TNL-2035 
Skip unreliable test. TNL-2035
 2015-04-27 11:33:54 -04:00
Martyn James
1eeca4d81f Merge pull request #7522 from edx/feature/dashboard-search 
Feature/dashboard search
 2015-04-27 09:46:35 -04:00
Will Daly
960ec06fb4 Merge pull request #7775 from edx/will/verification-logging 
Add logging for verification and reverification.
 2015-04-27 08:56:17 -04:00
Will Daly
643fc0e0b3 Add logging for verification and reverification. 
Adds additional logging for the initial/re-verification flows.
This should make it easier to understand the behavior of
the production system and provide a way to identify issues early.
 2015-04-27 08:04:41 -04:00
Ben Patterson
9b7972bfbd Skip unreliable test. TNL-2035 2015-04-26 15:55:10 -04:00
Jim Abramson
b5f58ccfcf Merge pull request #7781 from edx/jsa/bokchoy-firefox-instrux 
tweak firefox upgrade instructions
 2015-04-26 15:31:01 -04:00
Nimisha Asthagiri
c8e0095fbb MA-668 Mobile Push Notification payload update 
Support iOS receiving the update even when in the background.
Support Android detecting duplicates.
 2015-04-24 17:23:22 -04:00
Sarina Canelake
abff47e587 Merge pull request #7800 from edx/sarina/20150424-update-translations 
Update translations & how translations are pulled
 2015-04-24 16:13:55 -04:00