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

36556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Muddasser
c283afccbc Merge pull request #12268 from edx/muddasser/bokchoy/chrome/test_badge_share_modal 
Fixed close button click issue
 2016-04-30 00:42:24 +05:00
clrux
b69fea7233 Merge pull request #12306 from edx/clrux/tnl-4444 
TNL-4444 correcting fullscreen transcript skip links
 2016-04-29 14:16:15 -04:00
Peter Desjardins
61f48de382 Merge pull request #12298 from edx/pdesjardins/DOC-2854 
Mocking some modules that were missing during platform API doc builds.
 2016-04-29 14:00:26 -04:00
Christina Roberts
2497f0a0eb WIP: xblock pipeline work (#10176) 
[PERF-303] Integer XBlocks/XModules into the static asset pipeline.

This PR, based on hackathon work from Christina/Andy, implements a way to discover all installed XBlocks and XModules and to enumerate their public assets, then pulling them in during the collectstatic phase and hashing them.  In turn, the methods for generating URLs to resources will then returned the hashed name for assets, allowing them to be served from nginx/CDNs, and cached heavily.
 2016-04-29 10:52:42 -04:00
Renzo Lucioni
a77e6ea247 Merge pull request #12304 from edx/alasdair/ECOM-3968-program-card-link-alt-text-update 
ECOM-3968 updated program card link alt text
 2016-04-29 10:47:54 -04:00
Chris Rodriguez
b20414bdbc TNL-4444 correcting fullscreen transcript skip links 2016-04-29 10:04:54 -04:00
Eric Fischer
955282f9c7 Merge pull request #12165 from edx/efischer/hide_timed_exams 
TNL-4366 Hide Timed Exams
 2016-04-29 09:28:16 -04:00
M. Rehan
bc28df903a Merge pull request #12261 from edx/jibsheet/html-escape-email-settings-edx-dashboard 
TNL-4396 Apply same fix to edx dashboard
 2016-04-29 18:10:53 +05:00
Usman Khalid
09594d6305 Merge pull request #12243 from edx/usman/tnl4416-spec-nesting 
When using RequireJS load spec files one by one.
 2016-04-29 17:09:57 +05:00
AlasdairSwan
294e1782f6 ECOM-3968 updated program card link alt text 2016-04-29 08:03:40 -04:00
Ehtesham Kafeel
8cf89d3a8e Merge pull request #12289 from edx/mzfr/backbone-cleanup 
Replace backbone-min.js to backbone.js
 2016-04-29 16:53:02 +05:00
Usman Khalid
6c26715a14 Make hashes unique so that they do not conflict with hashes from module_edit_spec.coffee. 2016-04-29 15:54:48 +05:00
Usman Khalid
8f79d8013f Turn off global ajaxError handler in afterEach in teams tab factory specs. 2016-04-29 15:54:48 +05:00
Usman Khalid
4d228199d1 When using RequireJS load spec files one by one. 
Jasmine has a global stack for creating a tree of specs. We need to load
spec files one by one, otherwise some end up getting nested under others.
 2016-04-29 15:54:47 +05:00
Kevin Falcone
ea522a1797 Merge pull request #12288 from edx/jibsheet/paver-migrate-multiple-dbs 
Switch to using the standard edxapp-migrate-(lms|cms) tools
 2016-04-28 21:50:41 -04:00
Robert Raposa
1dfe0e8a4e Merge pull request #12254 from edx/robrap/linter-javascript-context 
TNL-4427: Add additional JavaScript context tags
 2016-04-28 18:00:20 -04:00
Robert Raposa
17a920b3a6 Merge pull request #12246 from edx/robrap/safe-commit 
TNL-4317: Add helper for checking git commit is safe
 2016-04-28 16:54:38 -04:00
Qubad786
a3adaa96c4 add imports and fix html 2016-04-29 01:14:55 +05:00
Kevin Falcone
b61d9b9d09 TNL-4396 Apply same fix to edx dashboard 
This was fixed on the openedx dashboard, but missed on the edx.org theme
for the dashboard.
 2016-04-29 01:14:54 +05:00
Peter Desjardins
09aae6e72c Mocking some modules that were missing during platform API doc builds. 2016-04-28 13:54:14 -04:00
Eric Fischer
ea77c3ec42 Hide After Due setting for Timed Exams 
TNL-4366
Changes in studio to allow the hide_after_due setting to be utilized.

Includes:
    -python changes to contentstore, where the data is stored.
    -refactoring of timed-examination-preference-editor.underscore, to add this
        setting and make the editor more accessible.
    -javascript changes to link the new setting to the correct data model.
    -sass updates to fix a11y issues on the editor modal.
    -addition of post-due visibility information to course outline in studio.
    -new tests: python, js, acceptance, and a11y
 2016-04-28 13:27:19 -04:00
Eric Fischer
ecfd953e80 Updated edx-proctoring requirement 
Contains latest release, changes for TNL-4366
 2016-04-28 13:27:18 -04:00
Ned Batchelder
4cc4e6559c Merge pull request #12295 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-04-28 12:22:33 -04:00
Robert Raposa
b67c133910 Add additional JavaScript context tags 2016-04-28 12:16:10 -04:00
Ben Patterson
a61707b8e6 Merge pull request #12272 from edx/benp/shard4-lms 
Create a 4th shard for lms unit tests
 2016-04-28 11:18:43 -04:00
AlasdairSwan
265f2490a1 Merge pull request #12294 from edx/alasdair/ECOM-3200-resolve-id-issue 
Renamed 'programId' to use 'id'
 2016-04-28 11:04:33 -04:00
Ned Batchelder
861e8a0e9e Update translations (autogenerated message) 2016-04-28 14:55:52 +00:00
Robert Raposa
ac935e02a6 Add script for checking git commit is safe 2016-04-28 10:52:43 -04:00
Kevin Falcone
b7e070e0b9 Switch to using the edxapp-migrate-(lms|cms) tools 
edxapp-migrate-lms figures out at system build time what databases
it needs to migrate (just default, or default + student_module_history).
This avoids paver needing to be clever about figuring out if a user has
enabled the split CSMHE databases flag and permits this to merge early
and safely.

We can turn the CSMHE flag on from configuration at the same time we
enable all of the database config and ensure that the new database is
created.  Until a devstack is provisioned using that version of
configuration, it'll continue to have 1 DB and migrate 1 DB.  This
allows us to better control deployment.
 2016-04-28 10:48:06 -04:00
Muddasser
048f73be6d Fixed close button click issue 2016-04-28 19:37:37 +05:00
Kevin Falcone
01e0806334 Merge pull request #12282 from edx/jibsheet/upgrade-new-relic 
Come up to a newer New Relic version.
 2016-04-28 10:23:45 -04:00
Ben Patterson
1db84e79df Additional shard balancing changes for unit tests. 2016-04-28 10:09:32 -04:00
Ben Patterson
ddbd7f9174 Designate 4th shard. 2016-04-28 10:09:32 -04:00
Ben Patterson
b9558a90f1 Create a 3rd explicit shard for unit tests. 
More accurately, this creates a 4th shard because the
last shard is always the default.
 2016-04-28 10:09:32 -04:00
AlasdairSwan
61a5cd4d8f Renamed 'programId' to use 'id' 2016-04-28 09:44:08 -04:00
Ayub khan
9376c67360 Merge pull request #12293 from edx/revert-12144-SUST-35-course_key_from_string_or_404 
Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404"
 2016-04-28 18:38:16 +05:00
Robert Raposa
271f8233fb Merge pull request #12236 from edx/robrap/linter-python 
TNL-4326: Add Python linting
 2016-04-28 09:07:36 -04:00
clrux
1aab751609 Merge pull request #12284 from edx/clrux/removing-outline-from-main 
Removing the focus outline for the main container in LMS
 2016-04-28 07:19:49 -04:00
Ayub khan
986209669d Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404" 2016-04-28 15:50:17 +05:00
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +05:00
Waheed Ahmed
91d3b0bd24 Merge pull request #12271 from edx/waheed/ecom-4292-add-kosovo-to-country-list 
Added Kosovo in django country list.
 2016-04-28 11:59:24 +05:00
Robert Raposa
374dcb3264 Add Python linting 2016-04-27 17:40:30 -04:00
Waheed Ahmed
b7b4e0b041 Added Kosovo in django country list. 
ECOM-4292
 2016-04-28 00:17:06 +05:00
AlasdairSwan
a6da71591a Merge pull request #12221 from edx/alasdair/ECOM-3200-program-card-learner-progress 
Adding program progress bar to program cards
 2016-04-27 15:06:39 -04:00
Chris Rodriguez
746cae2c9a Removing the focus outline for the main container in LMS 2016-04-27 14:32:37 -04:00
John Eskew
625e76a595 Merge pull request #12262 from edx/jeskew/pillow_upgrade 
Upgrade pillow.
 2016-04-27 14:17:17 -04:00
David Ormsbee
0acccf2fd4 Merge pull request #12280 from edx/release 
Release to Master (2016-04-26 release)
 2016-04-27 14:05:12 -04:00
AlasdairSwan
cdb05c26a6 Adding program progress bar to program cards 2016-04-27 13:46:48 -04:00
Brian Jacobel
19b9242986 Merge pull request #12151 from edx/bjacobel/requirejs-errors-in-django-templates 
Fix errors in old Django templates / migrate to Mako
 2016-04-27 13:39:54 -04:00
Nimisha Asthagiri
036537f174 Merge pull request #12263 from edx/tnl/next-button-fix 
Fix Next Button's 404 error
 2016-04-27 13:18:39 -04:00