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

35023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
dcfb95e76b Merge pull request #11387 from edx/benp/fix-test-tooltip 
Correct flaky condition on tooltip.
 2016-02-02 10:44:53 -05:00
Peter Desjardins
d6a76125c9 Merge pull request #11401 from edx/pdesjardins/PHX-248 
Edited wording of UI labels for configuring subsection prerequisites …
 2016-02-02 10:05:47 -05:00
Ben Patterson
902126d55c Clarify method intent. Use BrokenPromise rather than assert. 2016-02-02 06:48:30 -05:00
Peter Desjardins
2a5b6c9aa3 Edited wording of UI labels for configuring subsection prerequisites (gating) 2016-02-01 17:32:48 -05:00
Diana Huang
4b1a37ef02 Merge pull request #11370 from edx/diana/static-i18n-compiled-files 
Complete static i18n PR
 2016-02-01 17:13:43 -05:00
Diana Huang
1e1f5abe10 Check in new static i18n JS files. 2016-02-01 15:54:14 -05:00
Diana Huang
cd0bb4c7e0 Add ability to generate static i18n files. 2016-02-01 15:54:10 -05:00
Diana Huang
6723b89649 Merge pull request #10731 from doganov/TNL-3664-AUTHORS 
Add Kaloian Doganov to AUTHORS
 2016-02-01 15:43:08 -05:00
Ned Batchelder
5a8b3d0256 Merge pull request #11392 from edx/ned/find-good-email-for-committer 
Automatically find a better email for a committer than x@users.noreply.github.com
 2016-02-01 10:48:15 -05:00
Douglas Hall
c325fc6326 Merge pull request #11384 from edx/douglashall/PHX-246/gating_multi_problem_prereq 
PHX-246 Multiple problems in a prerequisite sequence causes grading to fail
 2016-02-01 09:13:39 -05:00
Ned Batchelder
367a90bb95 Automatically find a better email for a committer than x@users.noreply.github.com 2016-02-01 07:39:00 -05:00
Douglas Hall
97cf6dd485 Merge pull request #11385 from edx/douglashall/fix_xmodule_import 
Remove gating api import from course xmodule
 2016-01-31 22:10:32 -05:00
Ben Patterson
07f8b8e9c3 Correct flaky condition on tooltip. 2016-01-30 16:56:12 -05:00
Douglas Hall
907d3e9f08 Merge pull request #11379 from edx/hasnain-naveed/HOL-44-extented 
HOL-44 / Added check for duplication of email
 2016-01-30 07:19:07 -05:00
Kaloian Doganov
fe3299227a Add self to AUTHORS 2016-01-30 13:43:18 +02:00
Ben Patterson
bea3663e3e Merge pull request #11317 from edx/benp/test-edit-raw-old 
[firefox upgrade] Wait for code mirror editor to be active
 2016-01-29 21:54:07 -05:00
Douglas Hall
263c71a6d7 Fix PHX-246 2016-01-29 20:45:07 -05:00
Ben Patterson
d7be722ce7 [firefox upgrade] Wait for code mirror editor to be active 
Not an issue for our tests on firefox 28; however, once we upgrade to
Firefox 42 (or later), a new wait condition is needed here. Otherwise,
the content is not set because selenium's action chain is starting too
early.
 2016-01-29 20:42:17 -05:00
Douglas Hall
7c923355b2 Remove gating api import from course xmodule to avoid importing django related code into non-django related code 2016-01-29 18:42:04 -05:00
Andy Armstrong
30b5cebccd Merge pull request #11110 from edx/ormsbee/libsass 
Speed up Sass compilation with libsass
 2016-01-29 14:26:15 -05:00
Douglas Hall
7ebffe2ddd Merge pull request #11382 from edx/douglashall/update_milestones_dependency 
Updating edx-milestones dependency to fix edx-opaque-keys install
 2016-01-29 14:01:43 -05:00
Douglas Hall
a075ad86e1 Updating edx-milestones dependency to fix edx-opaque-keys install 2016-01-29 13:05:04 -05:00
Andy Armstrong
99c90a64dd Support compiling SASS for only one system 2016-01-29 12:43:15 -05:00
David Ormsbee
c13e623067 Speed up SASS compilation with libsass 2016-01-29 12:30:55 -05:00
Douglas Hall
dce3d9ca81 Merge pull request #11014 from edx/douglashall/PHX-219/subsection_gating 
PHX-219 Subsection Gating
 2016-01-29 11:05:39 -05:00
Zubair Afzal
a54107e559 Merge pull request #11376 from edx/zub/add-edx-organizations-api-urls 
add edx-organizations api urls in lms
 2016-01-29 20:07:21 +05:00
Hasnain
0971e3715a Added check for duplication of email 2016-01-29 14:01:07 +00:00
zubair-arbi
da8a2d9b4c add edx-organizations api urls in lms 
ECOM-3558
 2016-01-29 18:29:07 +05:00
Zia Fazal
6e861f266b Merge pull request #11352 from edx/ziafazal/WL-209 
ziafazal/WL-209:Cert Social Sharing customization
 2016-01-29 16:50:17 +05:00
Zia Fazal
bae91014c7 Merge pull request #11334 from edx/ziafazal/WL-210 
ziafazal/WL-210: added branding to 404 and 500 error pages
 2016-01-29 16:49:31 +05:00
Zia Fazal
06e38e1c24 added branding to 404 and 500 error pages 
changes based on feedback

renamed a definition and added test coverage

fixed broken tests
 2016-01-29 15:46:51 +05:00
Asad Iqbal
87d9a07931 Merge pull request #11242 from edx/asadiqbal08/WL-243-manual-lang 
WL-243 LMS Language Selection
 2016-01-29 14:07:46 +05:00
M. Rehan
b427da7185 Merge pull request #11350 from edx/mrehan/unwanted-discussion-modules 
Fix - skip orphans while getting discussion modules
 2016-01-29 12:46:02 +05:00
Matjaz Gregoric
3259df5412 Merge pull request #11315 from open-craft/comprehensive-theme-on-django-templates 
Make comprehensive theme work with django templates.
 2016-01-29 08:17:23 +01:00
Saleem Latif
4f342dac2b Merge pull request #11348 from edx/saleem-latif/WL-294 
Going ahead with the merge.
 2016-01-29 11:41:14 +05:00
M. Rehan
31b180beb3 Skip orphans while getting discussion modules 2016-01-29 11:09:00 +05:00
Douglas Hall
22eda46e5f Merge pull request #11368 from edx/hotfix/2016-01-28_release_into_master 
Merging release into master
 2016-01-28 14:12:29 -05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
Peter Fogg
1603a1ab4d Merge pull request #11366 from edx/peter-fogg/reenable-course-home-checks 
Reenable course home improvements check.
 2016-01-28 13:08:41 -05:00
Ned Batchelder
5ec74b7cb7 Merge pull request #11365 from edx/ned/add-note-to-edx-private 
Add a note to the top of edx-private.txt
 2016-01-28 13:04:28 -05:00
Douglas Hall
22430f610b Merge branch 'release' into hotfix/2016-01-28_release_into_master 2016-01-28 12:40:00 -05:00
Douglas Hall
cc01391ac5 Merge pull request #11362 from edx/hotfix/2016-01-28 
HOTFIX for PHX-245 Updated proctored/timed exam text
 2016-01-28 12:28:41 -05:00
Peter Fogg
6e6c397776 Reenable course home improvements check. 
This was disabled some time ago due to PLAT-900, which caused cached
objects to be unpickled and used in new code which could expect to
find new fields that didn't exist on the old objects. That issue is
now fixed.

ECOM-2853
 2016-01-28 11:33:45 -05:00
Ned Batchelder
a193fd0f5e Add a note to the top of edx-private.txt 2016-01-28 11:30:13 -05:00
asadiqbal
99b883b7be WL-243 LMS Language Selection 2016-01-28 20:07:26 +05:00
Douglas Hall
2447540d5f Updated proctored/timed exam header bar text; Upgraded edx-proctoring to pull in additional text changes 2016-01-28 09:40:14 -05:00
Christine Lytwynec
092eae9ff3 Merge pull request #11130 from edx/clytwynec/ac-75 
AC-75 and AC-73
 2016-01-28 08:52:40 -05:00
Ahsan Ulhaq
0c55f17d81 Merge pull request #11347 from edx/ahsan/credentials-feature-changes 
Credentials Feature changes reverted in release
 2016-01-28 15:28:49 +05:00
Awais Jibran
fc3511d7e4 Merge pull request #11335 from edx/aj/tnl4049-studio-dashbord-update-2 
Render CMS course listing Using CourseSummary for user with org access role
 2016-01-28 14:35:23 +05:00
Zia Fazal
463e8c82cf Cert Social Sharing customization 
changes after feedback from matte
 2016-01-28 14:26:48 +05:00