Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable XBlock js and css in Studio #1949

Merged
merged 3 commits into from
Feb 5, 2014
Merged

Enable XBlock js and css in Studio #1949

merged 3 commits into from
Feb 5, 2014

Conversation

cpennington
Copy link
Contributor

No description provided.

@cpennington
Copy link
Contributor Author

@nedbat @andy-armstrong @singingwolfboy: This depends on #1899. It also has frontend changes, which I would love additionally close review of.

singingwolfboy
singingwolfboy reviewed Dec 20, 2013
View reviewed changes
cms/static/coffee/src/xblock/cms.runtime.v1.coffee

usageId = $(@element).data("usage-id")

"/preview/xblock/#{usageId}/handler/#{handlerName}#{suffix}#{query}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make more sense to use a dedicated library for URL manipulation, like URI.js?

@singingwolfboy
Copy link
Contributor

I don't fully understand everything that this PR is doing, but I don't see anything terrible, and I trust that I know what you're doing when it comes to XBlock, @cpennington. 👍

@cpennington
Copy link
Contributor Author

That's about as an enthusiastic thumbs up as I've ever gotten. 😄

@andy-armstrong
Copy link
Contributor

I'm with @singingwolfboy... I don't understand it all, but what I do looks good. 👍

P.S. I've picked up URI.js in my latest commits, so between us we'll have to merge our usages. @singingwolfboy pointed me at the same gist that you used.

singingwolfboy
singingwolfboy reviewed Dec 23, 2013
View reviewed changes
cms/static/coffee/spec/main.coffee
@@ -38,6 +38,7 @@ requirejs.config({
"jasmine.async": "xmodule_js/common_static/js/vendor/jasmine.async",
"draggabilly": "xmodule_js/common_static/js/vendor/draggabilly.pkgd",
"domReady": "xmodule_js/common_static/js/vendor/domReady",
"URI": "xmodule_js/common_static/js/vendor/URI.min.js",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove trailing .js

@singingwolfboy
Copy link
Contributor

This pull request needs a rebase. Is there anything else preventing it from going in?

@andy-armstrong
Copy link
Contributor

I have a much better understanding of this since our conversation, and it all looks good to me. Can we help you to get it merged? Our A/B test work would benefit from this support.

@cpennington
Allow multiple client-side runtimes on a single page
49217eb 
Make XBlock client-side runtimes proper classes, so that handlerUrl can
be defined in a per-runtime way, and we can have multiple runtimes on a
single page.

[LMS-1630][LMS-1421][LMS-1517]
andy-armstrong
andy-armstrong reviewed Feb 4, 2014
View reviewed changes
cms/djangoapps/contentstore/views/item.py
else:
accept_header = request.META.get('HTTP_ACCEPT', 'application/json')

if 'application/x-fragment+json' in accept_header:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cpennington: @singingwolfboy and I were wondering why you introduced a custom MIME type rather than just using application/json. It seems reasonable, but we weren't sure when this was a good practice versus just using application/json. Should we be doing this in some/all of our other RESTful services?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because there's other uses of application/json in this same method, and I didn't want to break those. The application/json representation is just a dump of the field values, rather than the rendered fragment.

@nedbat
Copy link
Contributor

nedbat commented Feb 4, 2014

I don't have much to add here. Merging seems fine.

cpennington added a commit that referenced this pull request Feb 5, 2014
@cpennington
Merge pull request #1949 from cpennington/xblock-studio-js-and-css
6d67d0c 
Enable XBlock js and css in Studio
@cpennington cpennington merged commit 6d67d0c into openedx:master Feb 5, 2014
@cpennington cpennington deleted the xblock-studio-js-and-css branch February 5, 2014 13:19
jenkins-ks pushed a commit to nttks/edx-platform that referenced this pull request Jun 23, 2017
@ahara121
Fix bugs. openedx#1941 openedx#1942 openedx#1943 (openedx#1949)
368523a 
* Fix bug. Unactivated user redirect to notice_unactivated. openedx#1941

* Fix bug. Send reactivation email to unactivated user. openedx#1942 openedx#1943

* Fix bug. Mod activation mail message. openedx#1944

* Mod bok-choy test. openedx#1941

* Fix review.

* Cancel bug. Activation mail message. openedx#1944

* Fix review.
shimulch pushed a commit to open-craft/edx-platform that referenced this pull request Jan 26, 2021
@attiyaIshaque @moeez96
@pomegranited @ztraboo @msaqib52 @wasifarbisoft @mudassir-hafeez @shafqatfarhan @ihtram @Agrendalath @nasirhjafri @sohaibaslam @murad-hubib @Ali-D-Akbar @naeem91 @musmanmalik
YONK-1835 - Merge master into juniper branch (openedx#2012)
3370f6b 
* MCKIN-22396 Fix samesite cookie issue for Scorm Shell login flow (openedx#1879)

* Adds django-cookies-sameseite middleware

and settings to set SameSite=None for all secure cookies.

* Fix `SameSite` cookie issue for LTI Provider. EW-449

(cherry picked from commit 28479a2)

* Fix tests, conflicts resolved

Co-authored-by: Jillian Vogel <jill@opencraft.com>
Co-authored-by: Zachary Trabookis <ztraboo@clemson.edu>

* MCKIN-19584: add support for inline discussions translations (openedx#1863)

* MCKIN-19584: add support for inline discussions translations (openedx#1830)

* add support for inline discussions translations

* mark js string for translation on discussions

* ironwood fix

* MCKIN-19840 EOC (End of course Journal) - None of the strings are translated in any language (openedx#1857)

* MCKIN-19840 Add version bump for EOC 0.7.1 (openedx#1867)

* MCKIN-23062 purge cohorts of deleted groups

* MCKIN-23098 404 error on opening the module having EOC with no translations (openedx#1870)

* MCKIN-23098 404 error on opening the module having EOC with no translations integrated

* fix typo and chinese translation on discussions page (openedx#1875)

* Fix mismatching versions for api integration

* security fixes patch

* MCKIN-23604 Match fork code with upstream (openedx#1880)

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)

* MCKIN-22507 Updated GW submission API to accept TA email id (openedx#1871)

* MCKIN-22507 Updated GW submission API to accept TA email id

* Fixed typo

* MCKIN-22509 VB

* [MCKIN-22507] Review version bump for xblock-group-project-v2 (openedx#1887)

* MCKIN-22509 Added API to check/create anonymous user id (openedx#1882)

* MCKIN-23249 Threw error if any of group has submissions (openedx#1884)

* Added ignore condition for generated files

* Release freeze (openedx#1895)

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)

* MCKIN-22507 Updated GW submission API to accept TA email id (openedx#1871)

* MCKIN-22507 Updated GW submission API to accept TA email id

* Fixed typo

* MCKIN-22509 VB

* [MCKIN-22507] Review version bump for xblock-group-project-v2 (openedx#1887)

* MCKIN-22509 Added API to check/create anonymous user id (openedx#1882)

* MCKIN-23249 Threw error if any of group has submissions (openedx#1884)

* Added ignore condition for generated files

Co-authored-by: Piotr Surowiec <piotr@opencraft.com>
Co-authored-by: Nasir Hussain <nasirhjafri@gmail.com>
Co-authored-by: Sohaib Aslam <sohaib.aslam@arbisoft.com>
Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com>

* Revert "[MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)"

This reverts commit 5dad4f0.

* Revert "[MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)"

This reverts commit 5dad4f0.

* MCKIN-23061 Fix enlarged buttons on studio (openedx#1892)

* Revert "Updated subsections grade percentage to start rounding"

This reverts commit fde830b.

* MCKIN-22514 problem builder verion bump

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions`

* [BB-2765] Add `reverse_sql` to `database_fixups/0002` migration

* MCKIN-24492 version bump api-integration (openedx#1898)

* MCKIN-21527 Problem Builder (FTE, Assessment, MCQ, MRQ) - On opening these modules, none of the text is translated on notifications dropdown. (openedx#1889)

* MCKIN-21918 Inline discussion japanese buttons (openedx#1891)

Co-authored-by: murad-hubib <murad.habib@arbisoft.com>

* bump xblock problem-builder version to 3.5.1 (openedx#1899)

* MCKIN-24501 api-integration version bump (openedx#1903)

* Security patch from aug 26 (openedx#1894)

Co-authored-by: Ned Batchelder <ned@edx.org>

* sustaining xss security fixes 3 (openedx#1893)

Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>

* Sustaining security fixes 4 & 5 (openedx#1901)

Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>

* MCKIN-24663 sorting alphanumeric list (openedx#1908)

* MCKIN-24633 releasing problem builder v3.5.2 (openedx#1917)

* MCKIN-24559 - Organization extensions VB (openedx#1905)

Releasing `v2.0.6`

* MCKIN-24565 - Organizations extensions VB (openedx#1907)

Releasing `v2.0.7`

* MCKIN-24511 Projects extension VB (openedx#1915)

* Resolved conflits

* Resloved conflicts

* MCKIN-21919 Inline Discussion - The following strings are not translated in Korean Language (openedx#1906)

* Resolved conflict

* Resolved conflicts

* MCKIN-24633 releasing problem builder v3.5.2 (openedx#1917)

* MCKIN-25170 translation for review grade

* MCKIN-24296 missing translations added (openedx#1926)

* missing translations added (openedx#1927)

* MCKIN-25091 fixed Discussion post Anonymously (openedx#1925)

* VB for VR and eoc (openedx#1933)

* MCKIN-25752 discussion and question posted translations (openedx#1934)

* MCKIN-26123 Plateform Issues (openedx#1939)

* MCKIN-26123 Plateform Issues (openedx#1940)

* MCKIN-26123 Drag and Drop Version update (openedx#1942)

* MCKIN-23104 version upgrade of EOC journal (openedx#1941)

* MCKIN-26505 Version update of Problem Builder (openedx#1945)

* MCKIN-26123 Drag&Drop Version Update (openedx#1947)

* MCKIN-26589 Integrate translations of FIND DISCUSSIONS for main discussions page for all languages (openedx#1949)

* [v1.54.0] complied mo files

* compile js translations

* Fix unit tests and compile msgs js issue.

* Compile translations

Co-authored-by: Moeez Zahid <moeezzahid1996@gmail.com>
Co-authored-by: Jillian Vogel <jill@opencraft.com>
Co-authored-by: Zachary Trabookis <ztraboo@clemson.edu>
Co-authored-by: Saqib <msaqib52@gmail.com>
Co-authored-by: Wasif ur Rehman <wasifarbisoft@users.noreply.github.com>
Co-authored-by: Mudassir Hafeez <mudassir.hafeez@arbisoft.com>
Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com>
Co-authored-by: ihtram <iulhaq@edx.org>
Co-authored-by: Piotr Surowiec <piotr@opencraft.com>
Co-authored-by: Nasir Hussain <nasirhjafri@gmail.com>
Co-authored-by: Sohaib Aslam <sohaib.aslam@arbisoft.com>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Mudassir Hafeez <41048311+mudassir-hafeez@users.noreply.github.com>
Co-authored-by: murad-hubib <murad.habib@arbisoft.com>
Co-authored-by: Ned Batchelder <ned@edx.org>
Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>
Co-authored-by: Naeem Ilyas <naeem-ilyas@live.com>
Co-authored-by: Muhammad Usman <43761905+musmanmalik@users.noreply.github.com>
Co-authored-by: Mudassir Hafeez <mudasir5761@gmail.com>
Co-authored-by: ihtram <m.ihtram@arbisoft.com>
shimulch pushed a commit to open-craft/edx-platform that referenced this pull request Jan 26, 2021
@attiyaIshaque @moeez96
@pomegranited @ztraboo @msaqib52 @wasifarbisoft @mudassir-hafeez @shafqatfarhan @ihtram @Agrendalath @nasirhjafri @sohaibaslam @murad-hubib @Ali-D-Akbar @naeem91 @musmanmalik
[YONK-1845] Merge master into juniper branch. (openedx#2026)
47bb0c3 
* MCKIN-22396 Fix samesite cookie issue for Scorm Shell login flow (openedx#1879)

* Adds django-cookies-sameseite middleware

and settings to set SameSite=None for all secure cookies.

* Fix `SameSite` cookie issue for LTI Provider. EW-449

(cherry picked from commit 28479a2)

* Fix tests, conflicts resolved

Co-authored-by: Jillian Vogel <jill@opencraft.com>
Co-authored-by: Zachary Trabookis <ztraboo@clemson.edu>

* MCKIN-19584: add support for inline discussions translations (openedx#1863)

* MCKIN-19584: add support for inline discussions translations (openedx#1830)

* add support for inline discussions translations

* mark js string for translation on discussions

* ironwood fix

* MCKIN-19840 EOC (End of course Journal) - None of the strings are translated in any language (openedx#1857)

* MCKIN-19840 Add version bump for EOC 0.7.1 (openedx#1867)

* MCKIN-23062 purge cohorts of deleted groups

* MCKIN-23098 404 error on opening the module having EOC with no translations (openedx#1870)

* MCKIN-23098 404 error on opening the module having EOC with no translations integrated

* fix typo and chinese translation on discussions page (openedx#1875)

* Fix mismatching versions for api integration

* security fixes patch

* MCKIN-23604 Match fork code with upstream (openedx#1880)

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)

* MCKIN-22507 Updated GW submission API to accept TA email id (openedx#1871)

* MCKIN-22507 Updated GW submission API to accept TA email id

* Fixed typo

* MCKIN-22509 VB

* [MCKIN-22507] Review version bump for xblock-group-project-v2 (openedx#1887)

* MCKIN-22509 Added API to check/create anonymous user id (openedx#1882)

* MCKIN-23249 Threw error if any of group has submissions (openedx#1884)

* Added ignore condition for generated files

* Release freeze (openedx#1895)

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)

* MCKIN-22507 Updated GW submission API to accept TA email id (openedx#1871)

* MCKIN-22507 Updated GW submission API to accept TA email id

* Fixed typo

* MCKIN-22509 VB

* [MCKIN-22507] Review version bump for xblock-group-project-v2 (openedx#1887)

* MCKIN-22509 Added API to check/create anonymous user id (openedx#1882)

* MCKIN-23249 Threw error if any of group has submissions (openedx#1884)

* Added ignore condition for generated files

Co-authored-by: Piotr Surowiec <piotr@opencraft.com>
Co-authored-by: Nasir Hussain <nasirhjafri@gmail.com>
Co-authored-by: Sohaib Aslam <sohaib.aslam@arbisoft.com>
Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com>

* Revert "[MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)"

This reverts commit 5dad4f0.

* Revert "[MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)"

This reverts commit 5dad4f0.

* MCKIN-23061 Fix enlarged buttons on studio (openedx#1892)

* Revert "Updated subsections grade percentage to start rounding"

This reverts commit fde830b.

* MCKIN-22514 problem builder verion bump

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions`

* [BB-2765] Add `reverse_sql` to `database_fixups/0002` migration

* MCKIN-24492 version bump api-integration (openedx#1898)

* MCKIN-21527 Problem Builder (FTE, Assessment, MCQ, MRQ) - On opening these modules, none of the text is translated on notifications dropdown. (openedx#1889)

* MCKIN-21918 Inline discussion japanese buttons (openedx#1891)

Co-authored-by: murad-hubib <murad.habib@arbisoft.com>

* bump xblock problem-builder version to 3.5.1 (openedx#1899)

* MCKIN-24501 api-integration version bump (openedx#1903)

* Security patch from aug 26 (openedx#1894)

Co-authored-by: Ned Batchelder <ned@edx.org>

* sustaining xss security fixes 3 (openedx#1893)

Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>

* Sustaining security fixes 4 & 5 (openedx#1901)

Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>

* MCKIN-24663 sorting alphanumeric list (openedx#1908)

* MCKIN-24633 releasing problem builder v3.5.2 (openedx#1917)

* MCKIN-24559 - Organization extensions VB (openedx#1905)

Releasing `v2.0.6`

* MCKIN-24565 - Organizations extensions VB (openedx#1907)

Releasing `v2.0.7`

* MCKIN-24511 Projects extension VB (openedx#1915)

* Resolved conflits

* Resloved conflicts

* MCKIN-21919 Inline Discussion - The following strings are not translated in Korean Language (openedx#1906)

* Resolved conflict

* Resolved conflicts

* MCKIN-24633 releasing problem builder v3.5.2 (openedx#1917)

* MCKIN-25170 translation for review grade

* MCKIN-24296 missing translations added (openedx#1926)

* missing translations added (openedx#1927)

* MCKIN-25091 fixed Discussion post Anonymously (openedx#1925)

* VB for VR and eoc (openedx#1933)

* MCKIN-25752 discussion and question posted translations (openedx#1934)

* MCKIN-26123 Plateform Issues (openedx#1939)

* MCKIN-26123 Plateform Issues (openedx#1940)

* MCKIN-26123 Drag and Drop Version update (openedx#1942)

* MCKIN-23104 version upgrade of EOC journal (openedx#1941)

* MCKIN-26505 Version update of Problem Builder (openedx#1945)

* MCKIN-26123 Drag&Drop Version Update (openedx#1947)

* MCKIN-26589 Integrate translations of FIND DISCUSSIONS for main discussions page for all languages (openedx#1949)

* [v1.54.0] complied mo files

* MCKIN-24786 - api-integration version bump

* MCKIN-26967 - EOC VB

* MCKIN-23037 - Ooyala xblock version bump

* MCKIN-27119 - Missing strings added

* MCKIN-26468 - projects extensions VB (openedx#1951)

Releasing `v3.0.4`

* MCKIN-24382 Scorm VB (openedx#1966)

* Scorm VB

* MCKIN-26967 EOC VB

* MCKIN-24385: bump xblock diagnostic feedback version to v0.4.0 (openedx#1971)

* MCKIN-24468 McKA - Update Scorm xblock to Python 3.5 fix bug (openedx#1979)

* MCKIN-24385 bump xblock-diagnosticfeedback version to v0.4.1 (openedx#1987)

* MCKIN-26471 API integration VB (openedx#1995)

* bump xblock scorm version to v3.2.1 (openedx#1996)

* MCKIN-26850 EOC-journal version bump (openedx#2001)

* MCKIN-24383 & 24384 VB for GP v2 and Adventure (openedx#1961)

* MCKIN-24383 GW v2 version bump (openedx#2000)

* vb gp (openedx#2002)

* vb gp (openedx#2004)

* MCKIN-28139 Pinned pyopenssl version to 18.0.0

* vb gp (openedx#2004)

* MCKIN-28122 Traslations for all languages (openedx#2015)

* MCKIN-28123 vb gp (openedx#2018)

* Versions update.

Co-authored-by: Moeez Zahid <moeezzahid1996@gmail.com>
Co-authored-by: Jillian Vogel <jill@opencraft.com>
Co-authored-by: Zachary Trabookis <ztraboo@clemson.edu>
Co-authored-by: Saqib <msaqib52@gmail.com>
Co-authored-by: Wasif ur Rehman <wasifarbisoft@users.noreply.github.com>
Co-authored-by: Mudassir Hafeez <mudassir.hafeez@arbisoft.com>
Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com>
Co-authored-by: ihtram <iulhaq@edx.org>
Co-authored-by: Piotr Surowiec <piotr@opencraft.com>
Co-authored-by: Nasir Hussain <nasirhjafri@gmail.com>
Co-authored-by: Sohaib Aslam <sohaib.aslam@arbisoft.com>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Mudassir Hafeez <41048311+mudassir-hafeez@users.noreply.github.com>
Co-authored-by: murad-hubib <murad.habib@arbisoft.com>
Co-authored-by: Ned Batchelder <ned@edx.org>
Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>
Co-authored-by: Naeem Ilyas <naeem-ilyas@live.com>
Co-authored-by: Muhammad Usman <43761905+musmanmalik@users.noreply.github.com>
Co-authored-by: Mudassir Hafeez <mudasir5761@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cpennington @singingwolfboy @andy-armstrong @nedbat