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

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Smith
bbc81fe922 remove pycharm created files 2016-07-11 11:20:46 -04:00
alisan617
e07094bf74 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Update git.xml Create conda_packages.xml 2016-07-11 10:56:44 -04:00
alisan617
fdd7e46ed0 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master' 2016-07-11 10:14:25 -04:00
alisan617
72b6ec8242 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Create IntelliLang.xml, laf.xml, ide.general.xml, web-browsers.xml, Default.xml, databaseSettings.xml, diff.xml, git.xml, keymap.xml, debugger.xml, packages.xml 2016-07-11 10:14:20 -04:00
alisan617
b2b66980f1 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master' 
Conflicts:
	diff.xml
 2016-07-11 10:12:47 -04:00
Toby Lawrence
54fa8aebbc Merge pull request #12959 from edx/PERF-346 
[PERF-346] Add a second version component to versioned course asset URLs
 2016-07-11 09:32:09 -04:00
asadiqbal
682fde96d9 WL-552 2016-07-11 17:44:54 +05:00
Toby Lawrence
f15533dc8f [PERF-346] Add a second version component to versioned course asset URLs 
This version component reflects the "version" of the StaticContent
objects which we cache server-side.  If the layout of those objects
changes between releases, errors occur when loading them from cache.

By using a separate version value, which can be incremented on its own
after a change has been made to the StaticContent class, we can avoid
loading older cached content and in turn take advantage of these changes
faster, without needing to intervene operationally.
 2016-07-10 19:20:20 -04:00
Chris
db04911268 Merge pull request #12924 from edx/clrux/ac-521 
AC-521 fixes 'data-table' ignores
 2016-07-08 17:10:22 -07:00
Chris Rodriguez
ddc93abf81 AC-521 fixes data-table ignores in the platform 2016-07-08 15:28:31 -04:00
Christina Roberts
6d7a545276 Merge pull request #12932 from edx/christina/deprecated-components 
Move deprecating of XBlocks to new XBlockConfiguration model
 2016-07-08 15:05:42 -04:00
Christina Roberts
b6b792826c Merge pull request #12864 from edx/christina/disable-xblocks 
Move disabling of XBlocks to new XBlockConfiguration model
 2016-07-08 15:05:17 -04:00
Albert (AJ) St. Aubin
c25dd2ee1d Merge pull request #12960 from edx/staubina/TNL-4723_indexOfBug 
Updated to check and ensure the progress Detail is a string before lo…
 2016-07-08 15:05:04 -04:00
John Eskew
ea6812e954 Update version of XBlock repo. 2016-07-08 14:04:37 -04:00
John Eskew
1131edc9a2 Change test to reflect how XBlock handles control chars. 2016-07-08 14:04:00 -04:00
Cliff Dyer
cb4c712558 Merge pull request #12964 from edx/adam/merge-release-to-rc 
Adam/merge release to rc
 2016-07-08 13:53:57 -04:00
Adam Palay
2e095e1557 mark StudioHelpTest.test_studio_help_links as flaky 2016-07-08 12:49:53 -04:00
Albert St. Aubin
4df50e9008 Updated to check and ensure the progress Detail is a string before looking for the index of / 
TNL-4723

Added basic JS test to check for progress with integer detail

Added another test with a non-string value to force the failure state with data returns a non-string value

Removed test with unrealistic int input for progress_detail

Cleaned up duplicate code in renderProgress tests
 2016-07-08 11:44:09 -04:00
Calen Pennington
0aceb231ef Merge pull request #12961 from cpennington/fix-xunit-commands 
[TE-1511] Make --with-xunit(mp)? and --xunit(mp)?-file match in all test suites
 2016-07-08 10:52:35 -04:00
Calen Pennington
2e5936f0f5 [TE-1511] Make --with-xunit(mp)? and --xunit(mp)?-file match in all test suites 2016-07-08 09:48:51 -04:00
Ned Batchelder
bb9a6283ef Merge pull request #12956 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-07-07 21:57:51 -04:00
Ned Batchelder
9132b7d555 Update translations (autogenerated message) 2016-07-07 21:02:43 -04:00
Peter Pinch
cf572af191 Merge pull request #12889 from mitocw/fix/aq/caoch_dashboard_navigation_issues 
Fixed CCX coach dashboard access issues
 2016-07-07 20:29:24 -04:00
Amir Qayyum Khan
0d3f96d4b5 Fixed CCX coach dashboard access issues. 2016-07-08 04:24:19 +05:00
Renzo Lucioni
f6d7371dd1 Unify JWT generation code 
These changes unify four different approaches to JWT creation, moving the core of the AccessTokenView to a general-purpose JwtBuilder class. This utility class defaults to using the system's JWT configuration, but it will allow overriding of the signing key and audience claim to support those clients which still require this. Part of ECOM-4566.
 2016-07-07 16:38:39 -04:00
Braden MacDonald
7c3d902ff6 Merge pull request #11286 from open-craft/omar/remove-s3 
Add OpenStack Swift support
 2016-07-07 11:05:28 -07:00
John Eskew
5d196afce7 Merge pull request #12944 from edx/jeskew/fix_for_wiki_deprecation_msg 
Update the django-wiki version number.
 2016-07-07 11:36:46 -04:00
Joyce Zhu
470cfc1109 Merge pull request #12958 from edx/JoyceZhu/revert_erroneous_commit 
Revert "Remove receipt page links' bottom borders"
 2016-07-07 11:21:27 -04:00
Joyce Zhu
afa9a2cd3a Revert "Remove receipt page links' bottom borders" 
This reverts commit 01e2104979.
 2016-07-07 11:17:01 -04:00
Adam
f7c45cf47d Merge pull request #12952 from edx/adam/quiet-logs 
quiet some noisy logs
 2016-07-07 11:02:21 -04:00
Joyce Zhu
01e2104979 Remove receipt page links' bottom borders 2016-07-07 09:42:10 -04:00
Albert (AJ) St. Aubin
07eb59c331 Merge pull request #12942 from edx/add_author_aj 
Added author
 2016-07-07 07:53:40 -04:00
Chris
e4db0e39d0 Merge pull request #12915 from edx/clrux/ac-520 
AC-520 fixes `section` ignores
 2016-07-07 03:20:14 -07:00
Ned Batchelder
bcf1925b17 Merge pull request #12948 from edx/ned/no-irc 
Change IRC references to Slack
 2016-07-06 18:22:33 -04:00
Adam Palay
a19d2e76ff quiet some noisy logs 2016-07-06 16:32:27 -04:00
Adam
6dfc2f88b5 Merge pull request #12938 from edx/patch/2016-07-06 
filter inactive user partitions in user partition transformer.
 2016-07-06 15:55:48 -04:00
John Eskew
d7db6e9d22 Bump the django-wiki version number. 2016-07-06 15:48:04 -04:00
Chris Rodriguez
4cf0e19af2 AC-520 fixing section ignores 2016-07-06 15:01:44 -04:00
Ned Batchelder
7523fb2e07 Change IRC references to Slack 2016-07-06 13:56:58 -04:00
Albert St. Aubin
fc7cee0cad Added author 2016-07-06 13:08:50 -04:00
Chris
933fdae5ba Merge pull request #12903 from edx/clrux/ac-518 
AC-518 updates `button-name` todo; needs TinyMCE work
 2016-07-06 09:58:58 -07:00
cahrens
25bfd0a7d8 Get Studio deprecation list from XBlockConfiguration. 
Replaces settings value.
TNL-4669
 2016-07-06 11:05:52 -04:00
cahrens
8980d1ab2d Switch disabling of XBlocks to XBlockConfiguration. 
Also allows dynamic updates.
TNL-4668
 2016-07-06 11:04:53 -04:00
Chris Rodriguez
5b31e4d67f AC-518 - button-name - test_lms_instructor_dashboard.py 2016-07-06 10:32:00 -04:00
Brian Jacobel
39c2abdf28 Merge pull request #12941 from edx/bjacobel/npm-502 
Bump UI Toolkit version to 1.4.1
 2016-07-06 09:57:16 -04:00
Brian Jacobel
c89c3a2043 Bump UI Toolkit version to 1.4.1 
Required for the breadcrumbs work I will be doing later this week. Also should issues we are seeing with NPM this morning.
 2016-07-06 08:50:31 -04:00
E. Kolpakov
0dddc2e3d4 Bumped Django SWIFT storage version 2016-07-06 11:50:38 +03:00
Renzo Lucioni
f91da141e1 Merge pull request #12937 from edx/renzo/detail-page-touchups 
Program detail page touchups
 2016-07-05 23:12:04 -04:00
Toby Lawrence
bc990d5d75 Merge pull request #12911 from edx/PERF-344 
[PERF-344] Add versioning of cached course assets to allow graceful cache invalidation
 2016-07-05 19:34:27 -04:00
Qubad786
92ed01ef4f filter inactive user partitions in user partition transformer. 2016-07-05 16:34:23 -04:00