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

35113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanford Student
24c4c8abed ma-1881 handling empty translations and testing 
using lists for json serializability, if that's a word
 2016-02-10 15:56:42 -05:00
Christina Roberts
481f3227dd Merge pull request #11429 from edx/christina/ora-release 
Bump ORA version to 0.2.7.
 2016-02-05 11:14:55 -05:00
Jesse Zoldak
68cf4af2b4 Merge pull request #11442 from jzoldak/zoldak/TE-1131 
Get tests running successfully on CircleCI
 2016-02-05 10:47:23 -05:00
Jesse Zoldak
855d410159 Update the Python version 
Other small changes:
* output the list of installed python packages
* tee the pylint output to the console so the build doesn't timeout when computing violations
 2016-02-05 10:15:43 -05:00
cahrens
4c938358f6 Bump ORA version to 0.2.7. 2016-02-05 09:31:37 -05:00
Jesse Zoldak
d23b021df6 Bump the version of edx-search 2016-02-05 09:15:32 -05:00
Robert Raposa
e6f64429d7 Merge pull request #11437 from edx/robrap/markup 
Move markup helpers to djangolib
 2016-02-05 09:14:12 -05:00
Robert Raposa
29fe2c7b0c Move markup helpers to djangolib 2016-02-05 02:42:43 -05:00
Ned Batchelder
158c4e58a3 Merge pull request #11424 from edx/ned/make-i18n-more-foolproof 
Move JSON samples out of translated strings so translators can't make mistakes
 2016-02-04 20:31:42 -05:00
Kevin Falcone
98671a8aa6 Merge pull request #11399 from edx/jibsheet/dont-use-using 
Don't use using() in migrations
 2016-02-04 19:47:10 -05:00
Peter Fogg
2ddf1f2e6f Merge pull request #11427 from edx/peter-fogg/fix-audit-cert-regen 
Correctly set certificate status for audit certs when regenerating.
 2016-02-04 18:56:40 -05:00
Kelketek
1934ef1d11 Merge pull request #11312 from edx/kelketek/bump-pb 
Bump hash for problem builder
 2016-02-04 17:46:27 -06:00
Peter Fogg
711e2e7f3c Correctly set certificate status for audit certs when regenerating. 
COR-2403
 2016-02-04 17:23:20 -05:00
John Eskew
e5bd60fac0 Merge pull request #11128 from edx/jeskew/upgrade_django_to_1.8.8 
Upgrade Django from 1.8.7 to 1.8.9
 2016-02-04 17:06:58 -05:00
Jonathan Piacenti
328c84a2bb Update bok_choy database cache. 2016-02-04 15:55:18 -06:00
Jonathan Piacenti
b4918f7f41 Bump problem builder hash. 2016-02-04 15:55:18 -06:00
Ned Batchelder
aec1ed3992 Merge pull request #11423 from edx/ned/update_translations 
Update translations (autogenerated message)
 2016-02-04 16:50:35 -05:00
Peter Fogg
2d2913ef5d Merge pull request #11426 from edx/peter-fogg/fix-date-block-format 
Correctly format date block dates.
 2016-02-04 15:45:04 -05:00
Peter Fogg
22cb307961 Correctly format date block dates. 2016-02-04 14:34:08 -05:00
Ned Batchelder
21218ef989 Merge pull request #11372 from open-craft/omar/remove-multiple-enrollment-feature 
Remove unused MULTIPLE_ENROLLMENT_ROLES feature setting
 2016-02-04 13:42:48 -05:00
Muhammad Ammar
886d54dce9 Merge pull request #11320 from edx/ammar/boomark-button-requirejs-caching 
bookmark button js caching
 2016-02-04 21:07:45 +05:00
Ned Batchelder
bd377587ac Update translations (autogenerated message) 2016-02-04 15:50:17 +00:00
clrux
9ef9bc6efb Merge pull request #11129 from edx/clrux/ac-201 
LMS: darkening a gray on the profile page
 2016-02-04 10:11:24 -05:00
Ned Batchelder
6f9fd5d357 Move JSON samples out of translated strings so translators can't make mistakes 2016-02-04 10:07:05 -05:00
Ned Batchelder
3dcb4b0793 Update translations (autogenerated message) 2016-02-04 14:51:33 +00:00
Chris Rodriguez
652e4ce0c1 LMS: darkening a gray on the profile page 2016-02-04 09:09:45 -05:00
Ben Patterson
db8b61bb2a Merge pull request #11388 from edx/benp/more-testsonly-support 
Do not flush the database when using bok-choy in testsonly mode.
 2016-02-04 08:41:55 -05:00
muhammad-ammar
3127ac9180 bookmark button js caching 
TNL-3954
 2016-02-04 17:59:47 +05:00
Ben Patterson
e5da5006fb Testsonly mode should also skip clearing mongo. 2016-02-04 06:58:57 -05:00
Ben Patterson
4caed6184c Do not flush the database when using bok-choy in testsonly mode. 
Testsonly will not work currently, because the database flush will
remove some data fixtures. Even when they are loaded at the beginning
of the next test run, there are database corruptions. Instead of
flushing, do not do anything with the database at the end of the
testsonly test run. That way, tests that use dynamic data can be
run many times in a row.
 2016-02-04 06:58:57 -05:00
M. Rehan
9d5a4a244b Merge pull request #11336 from edx/mrehan/wrong-units-in-group-tnl-3727 
Fix - skip orphans from content group usage information for split
 2016-02-04 14:13:05 +05:00
Muhammad Rehan
50c7b7ceb8 TNL-3727 Skip orphans from content group usage information for split 2016-02-04 12:18:18 +05:00
Nimisha Asthagiri
599173c6b6 Merge pull request #11198 from edx/block-cache/collect-phase 
Refactor Block Cache to separate Collect and Transform phases
 2016-02-03 20:18:09 -05:00
Robert Raposa
90f2fb868e Merge pull request #11257 from edx/robrap/refactor-js-utils 
Refactor js_util helpers
 2016-02-03 20:07:19 -05:00
Robert Raposa
f555ffd585 Refactor and improve js_utils helpers 
- Rename escape_json_dumps to dump_js_escaped_json
- Rename escape_js_string to js_escaped_string
- Update js_escaped_string to output empty string for None
- Introduce dump_html_escaped_json
- Move dump_js_escaped_json after the pipe as new best practice
- Introduce additional uses of helpers
- Introduce new djangolib directory and move js_utils
 2016-02-03 17:13:21 -05:00
Nimisha Asthagiri
05767b433d Collect Course Blocks on Course Publish and Management Command 
MA-1368
 2016-02-03 16:56:22 -05:00
Nimisha Asthagiri
66397c35b9 Refactor Block Cache to separate Collect and Transform phases 2016-02-03 16:54:29 -05:00
Christina Roberts
901cafe57a Merge pull request #11419 from edx/christina/enable-test 
Remove skip from studio page bok choy test
 2016-02-03 16:37:10 -05:00
cahrens
19162fb752 Asset page is hopefully loading more reliably now. 2016-02-03 15:46:51 -05:00
Peter Fogg
8ed051e3cf Merge pull request #10642 from edx/feature/self-paced 
Course home page improvements.
 2016-02-03 15:06:59 -05:00
Christina Roberts
9a786d08a2 Merge pull request #11395 from edx/christina/fix-test-typo 
Fix unit tests so they are testing aria-expanded.
 2016-02-03 14:41:49 -05:00
Peter Fogg
244843d929 Track events on the course home page. 
Events are added for accessing the courseware, entering the verified
upgrade flow, and toggling a course update.

ECOM-2983
 2016-02-03 13:58:24 -05:00
Peter Fogg
0c1dc272d4 Change "Go to Course" to "Resume Course" on course home page. 
ECOM-2960
 2016-02-03 13:58:23 -05:00
Peter Fogg
77aa07544e Internationalize course info sidebar default. 2016-02-03 13:58:23 -05:00
Peter Fogg
71a00bf946 Revert "Move Course Handouts to Course Resources and Tools." 
This reverts commit e8909e4439f22a7568d95a7672ab60d4a36f7322.
 2016-02-03 13:58:23 -05:00
Bill DeRusha
e75f7950d4 Updates XBlock renders its own template. Adds expand and collapse JS + jasmine tests. 
ECOM-2809
 2016-02-03 13:58:23 -05:00
Peter Fogg
75bef91e17 Fix query counts after Django 1.8 merge. 2016-02-03 13:58:23 -05:00
Peter Fogg
9b7ce7f3f2 Lighten course tab font weight. 2016-02-03 13:58:22 -05:00
Peter Fogg
c22677c171 Move Course Handouts to Course Resources and Tools. 
The existing course handouts section is moved underneath Course
Updates and News, with updated styling.

ECOM-2808
 2016-02-03 13:58:22 -05:00
Peter Fogg
786c4456ea Last-accessed courseware on the home page. 
ECOM-2806
 2016-02-03 13:58:22 -05:00