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

693 Commits

Author SHA1 Message Date
John Eskew
924f114b7c Bump XBlock version to 0.4.12 2016-07-15 15:23:25 -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
John Eskew
ea6812e954 Update version of XBlock repo. 2016-07-08 14:04:37 -04:00
John Eskew
d7db6e9d22 Bump the django-wiki version number. 2016-07-06 15:48:04 -04:00
Matt Drayer
68312bdd2d Revert "Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"" 
2. Update COMPREHNSIVE_THEME_DIR to COMPREHENSIVE_THEME_DIRS
3. Update paver commands to support multi theme dirs
4. Updating template loaders
5. Add ENABLE_COMPREHENSIVE_THEMING flag to enable or disable theming via settings
6. Update tests
7. Add backward compatibility for COMPREHEHNSIVE_THEME_DIR
 2016-06-30 15:19:51 +05:00
Douglas Hall
56055cc47e Merge branch 'release' into douglashall/merge_patch_2016_06_22_to_master 2016-06-24 11:07:43 -04:00
Douglas Hall
e2fd776aab Upgrading edx-proctoring to 0.12.21 to pull in additional fix 2016-06-23 15:27:36 -04:00
Kevin Falcone
dbc4eccf8e Convert to tag syntax for version 2016-06-23 14:34:11 -04:00
Douglas Hall
40543ca0de Upgrade edx-proctoring to 0.12.20 2016-06-22 13:54:56 -04:00
Douglas Hall
f8ac8c1aaa Merge pull request #12815 from edx/douglashall/SOL-1844 
SOL-1844 Upgrade edx-proctoring to 0.12.20
 2016-06-21 15:24:26 -04:00
Eric Fischer
49add6c963 edx-submissions version bump (#12812) 2016-06-21 14:44:34 -04:00
Douglas Hall
697821e570 Upgrade edx-proctoring to 0.12.20 2016-06-21 10:47:46 -04:00
Ben Patterson
b8fbab67d4 Merge pull request #12725 from edx/benp/ac-488 
Pin the specific version number so the github install knows when to run.
 2016-06-14 14:08:52 -04:00
asadiqbal
d932e09c22 updated the version of recommeder xblock 2016-06-13 16:51:44 +05:00
Ben Patterson
acb3abe571 Pin the specific version number so the github install knows when to run. 2016-06-10 16:19:53 -04:00
asadiqbal
fbafa72993 updated the version from 2.0.6 to 2.0.7 2016-06-10 17:35:49 +05:00
Ned Batchelder
1ce2cbd187 Use v0.3.2 of i18n_tools 2016-06-09 10:41:40 -04:00
Eric Fischer
ed2644a115 Bump installed edx-proctoring version (#12669) 2016-06-07 18:17:03 -04:00
Douglas Hall
98a392c301 Merge pull request #12683 from edx/douglashall/LOC-78/upgrade_lti_consumer_to_1_0_9 
LOC-78 Upgrade xblock-lti-consumer to fix i18n LTI launch parameter
 2016-06-07 11:20:26 -04:00
Douglas Hall
8ce63fef9b LOC-78 Upgrade xblock-lti-consumer to fix i18n LTI launch parameter 2016-06-07 10:24:02 -04:00
Christina Roberts
267e67d9e3 Merge pull request #12677 from edx/christina/update-ora-version 
Update for ora xblock static file handling.
 2016-06-07 10:05:55 -04:00
Ben Patterson
b9a38db626 Merge pull request #12647 from edx/benp/pa11ycrawler-update-AC-488 
AC-488. Use tip of pa11ycrawler repo to fix intermittent JSON decodin…
 2016-06-06 14:34:02 -04:00
cahrens
29db293054 Update for ora xblock static file handling. 
TNL-4710
 2016-06-06 14:25:58 -04:00
Ben Patterson
51099305e2 AC-488. Use tip of pa11ycrawler repo to fix intermittent JSON decoding error. 2016-06-03 10:31:54 -04:00
asadiqbal
9725fa94a5 updated the xblock version 2016-06-03 13:22:47 +05:00
Douglas Hall
0d49527607 Upgrading xblock-lti-consumer to v1.0.7 2016-06-01 13:41:57 -04:00
Afzal Wali
eadd656df0 SOL-1802 Allow proctoring service to create support ticket. 2016-05-27 09:29:06 -04:00
Ned Batchelder
83155840aa Merge pull request #12520 from edx/ned/oops-messages-po 
Two tweaks because we keep django.po and djangojs.po now.
 2016-05-24 06:40:10 -04:00
Ned Batchelder
2245a8f577 Use the latest non-clobbering i18n_tools 2016-05-20 13:28:29 -04:00
Jillian Vogel
83c58c603d Bump Drag-and-Drop-v2 v2.0.6 2016-05-20 17:23:46 +09:30
Ned Batchelder
6142c76ce8 Merge pull request #12471 from edx/ned/release-translations 
Support named-release translation files.
 2016-05-19 10:41:06 -04:00
Asad Iqbal
5d6362f3d5 Merge pull request #12147 from edx/asadiqbal08/WL-420 
asadiqbal08/WL-420 Updating drag and drop version. 
merging.
 2016-05-17 20:20:26 +05:00
Ned Batchelder
f88181aca9 Add paver i18n_release_push and _pull commands 2016-05-17 10:31:53 -04:00
Christine Lytwynec
86a96b5af0 update pa11ycrawler version 2016-05-13 14:22:14 -04:00
Christine Lytwynec
510eaa3c95 Merge pull request #12423 from edx/clytwynec/ac-367 
Speed up pa11ycrawler runs on Jenkins, Update pa11ycrawler to v0.0.2
 2016-05-12 13:16:19 -04:00
Christine Lytwynec
f68747ec96 Speed up pa11ycrawler runs on Jenkins, Update pa11ycrawler to v0.0.2 2016-05-12 11:33:58 -04:00
Afzal Wali
15b113b657 Bumped the proctoring version. 2016-05-03 17:48:53 +05: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
Eric Fischer
ecfd953e80 Updated edx-proctoring requirement 
Contains latest release, changes for TNL-4366
 2016-04-28 13:27:18 -04:00
Douglas Hall
139524cadb Upgrade xblock_lti_consumer to 1.0.6 2016-04-26 16:08:16 -04:00
muzaffaryousaf
db672f4631 Karma configurations for common, lms and cms. 
TNL-4102
 2016-04-22 19:09:27 +05:00
Christine Lytwynec
66e2d06235 Merge pull request #12060 from edx/clytwynec/ac-367 
Clytwynec/ac 367
 2016-04-22 09:49:26 -04:00
Mushtaq Ali
8e93c69e6d edx-ora2 release version 1.1.4 update 2016-04-21 11:29:58 +05:00
Dmitry Viskov
0151a149b0 Asides can be exported with the rest of courseware through the Export function within CMS 2016-04-16 03:48:23 +03:00
asadiqbal
a185bb3a83 WL-420 2016-04-14 18:22:16 +05:00
Matt Drayer
392ee7d258 Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming" 
This reverts commit a796b56314.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
 2016-04-12 08:22:14 -04:00
Christine Lytwynec
a14718bb92 Add pa11ycrawler command 2016-04-11 15:47:26 -04:00
Douglas Hall
2d3a034695 Upgraded xblock-lti-consumer to 1.0.5 2016-04-11 12:04:05 -04:00
Douglas Hall
fed01b3547 Upgraded xblock-lti-consumer to 1.0.5 2016-04-07 16:00:12 -04:00
Eric Fischer
813b50aed2 Fix conflict, 1.1.3 is correct 2016-04-07 14:45:19 -04:00