Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,787 Commits 1 Branch 0 Tags
3d76f092dd66e5fbeadc8f009cd778794c2c8fd1
Commit Graph

37787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris
3d76f092dd Merge pull request #12983 from edx/clrux/safelint-fixup 
Safelint violation count
 2016-07-12 14:40:42 -04:00
Jesse Zoldak
e33ddbea98 Merge pull request #12982 from edx/zoldak/SOL-1811 
Mark test for skipping SOL-1811
 2016-07-12 14:24:54 -04:00
Chris Rodriguez
1b7fe5978a Safelint violation count 2016-07-12 14:03:28 -04:00
Renzo Lucioni
b1fcc51c7f Merge pull request #12965 from edx/renzo/catalog-config-model 
Add ConfigurationModel governing integration with the catalog service.
 2016-07-12 13:34:11 -04:00
Jesse Zoldak
c6e0813785 Mark test for skipping SOL-1811 2016-07-12 13:16:21 -04:00
Chris
53c98f10cc Merge pull request #12750 from edx/clrux/ac-486 
AC-486 updating tabbed_view to use proper accessibility rules
 2016-07-12 12:50:20 -04:00
Chris Rodriguez
298f168e23 AC-486 updating tabbed_view to be accessible 2016-07-12 11:01:11 -04:00
Asad Iqbal
7147a69490 Merge pull request #12968 from edx/asadiqbal08/WL-552 
asadiqbal08/WL-552 ID-Verification message is responsive in activate account page
 2016-07-12 11:42:11 +05:00
sanfordstudent
d13e456959 Merge pull request #12939 from edx/sstudent/TNL-4924 
moving milestones/gating check to access.py
 2016-07-11 16:21:53 -04:00
Fred Smith
d82292cb98 Merge pull request #12971 from edx/derf/go_away_pycharm 
Remove pycharm project files and gitignore
 2016-07-11 15:51:00 -04:00
Renzo Lucioni
e7cdcb9b71 Merge pull request #12954 from edx/renzo/extract-token-generation 
Unify JWT generation code
 2016-07-11 15:37:14 -04:00
Douglas Hall
a873bf7c7b Merge pull request #12901 from edx/douglashall/WL-541 
WL-541 Add recipient key to Zendesk ticket creation API request payload
 2016-07-11 15:36:11 -04:00
Douglas Hall
c38f2373c7 Add recipient key to Zendesk ticket creation API request payload 2016-07-11 14:56:44 -04:00
Renzo Lucioni
191a353078 Add ConfigurationModel governing integration with the catalog service. 
This is the first in a series of commits that will retrieve and use data from the catalog API. Part of ECOM-4566.
 2016-07-11 14:47:55 -04:00
Sanford Student
5db58c0038 moving milestones check to access.py 2016-07-11 14:32:52 -04:00
John Eskew
4fca1d9d98 Merge pull request #12893 from edx/jeskew/control_chars_in_string_fields 
Update version of XBlock repo.
 2016-07-11 13:29:51 -04:00
Fred Smith
6a4f4ca812 ignore pycharm project files 2016-07-11 11:23:14 -04:00
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
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