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

29906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ned Batchelder
f38977371b Merge pull request #7745 from schoolyourself/schoolyourself-xblock-update 
Update schoolyourself-xblock to the latest version
 2015-04-24 15:49:02 -04:00
Sarina Canelake
1504abe292 Only pull languages we want from Transifex 2015-04-24 15:15:17 -04:00
Sarina Canelake
da036307a0 Update translations (autogenerated message) 2015-04-24 15:15:16 -04:00
Kelketek
c7805f39a7 Merge pull request #7801 from edx/problem-builder-bump 
Bump version of problem builder
 2015-04-24 14:09:12 -05:00
Kelketek
a2c65baa59 Bump version of problem builder 
+1s available in https://github.com/open-craft/problem-builder/pull/19
 2015-04-24 13:12:23 -05:00
Chris
2465ceac3d Merge pull request #7765 from edx/clrux/UX-1632-due-icon-rtl-placement 
RTL-ifying the due icon
 2015-04-24 13:52:42 -04:00
Braden MacDonald
81a582243a Merge pull request #7796 from open-craft/fix-mentoring-answers-conflict 
Fix for DB table conflict preventing DB update on fresh installs
 2015-04-24 09:57:28 -07:00
David Ormsbee
e0122c0537 Merge pull request #7624 from mcgachey/mcgachey-courseware-flags 
[LTI Provider] Adding options to suppress chrome for embedding courseware
 2015-04-24 12:48:20 -04:00
Braden MacDonald
8dc4ecb4f7 Bump problem_builder version to fix DB table conflict 2015-04-24 08:59:55 -07:00
Waqas Khalid
53c12d5146 Merge pull request #7587 from edx/waqas/tnl1844-wrong-tab-problem 
Tab number in url doesn't take to correct tab
 2015-04-24 19:52:24 +05:00
Davorin Sego
71feb068e3 Dashboard search feature 2015-04-24 09:45:12 -04:00
Mark Hoeber
39cd5cec60 Merge pull request #7791 from edx/markhoeber-doc1904 
Updated enrollment api doc for new response fields
 2015-04-24 09:23:00 -04:00
Waqas Khalid
97e6091bd7 Tab number in url doesn't take to correct tab 
When there is multiple units in a particular subsection
then there will be tabs in courseware. When url have
tab number at the end of the url the code was not
considering it and showing the wrong tab. I have changed
such that it will always check the value of position.

TNL-1844
 2015-04-24 17:50:32 +05:00