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

74 Commits

Author SHA1 Message Date
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
Robert Raposa
3682fac832 Add json escaping to Studio 
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates

TNL-2646: Escape json.dumps
 2015-11-04 13:34:42 -05:00
Ben Patterson
1032d37271 Revert "Public Course Import/Export API (continued)" 2015-10-23 20:02:34 -04:00
Brandon DeRosier
edf7d9965e Revert "Revert "edX Course/Library Import/Export API"" 
This reverts commit 2bfbda3c1e.
 2015-09-24 09:01:00 -04:00
Brandon DeRosier
2bfbda3c1e Revert "edX Course/Library Import/Export API" 
This reverts commit c94abd2705.
 2015-07-08 16:55:38 -04:00
Brandon DeRosier
c94abd2705 edX Course/Library Import/Export API 
This is a public, versioned, RESTful API for importing and
exporting full course content. The code was initially ripped from the
existing import/export API in the CMS contentstore djangoapp and wrapped
in Django Rest Framework view classes. It's a new djangoapp in
the openedx directory which is largely an abstraction off the CMS
Import/Export views.

This PR includes configuration changes. Most notably, Studio is
configured to serve the OAuth2 provider alongside the LMS.

This is the initial thread on the code list:
https://groups.google.com/forum/#!msg/edx-code/DmnHWmly25A/ZqjD1zb4o7oJ

And this thread contains another description of the changes:
https://groups.google.com/d/msg/edx-code/6dP9SEKsmqQ/Pvyn8fBDx68J

There are a numerous non-covered lines, all of which are missing
coverage in the CMS API this was ported from. They're mostly error
conditions, such as handling of multipart file upload errors.
 2015-07-02 15:32:00 -04:00
Alessandro
8efadaec52 Add timestamp on success step + refactoring 
TNL-925
 2015-05-22 17:11:29 +02:00
louyihua
2c75b5d725 Fix two missing replacements of {studio_name} 
Located in ```howitworks.html``` and ```import.html```.
 2015-03-31 13:04:54 +08:00
Carol Tong
4e9e11e4c0 Add Help links and targets for import/export libraries 2015-03-19 10:11:16 -04:00
Jonathan Piacenti
8c920b469c Replace broken logic in import template with working logic in view. 2015-03-12 20:13:47 +00:00
Jonathan Piacenti
8ad4d081fb Added library import and export via .tar.gz'd XML files. 2015-03-10 21:29:29 +00:00
Chris
c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0 
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
 2015-01-06 15:24:12 -05:00
David Baumgold
34c6415527 Use STUDIO_SHORT_NAME for Studio 
STUDIO_NAME = "edX Studio"
STUDIO_SHORT_NAME = "Studio"
 2014-12-23 11:14:58 -05:00
David Baumgold
7366d2b1a2 Replace "edX Studio" with "{studio_name}" 
For theming and internationalization
 2014-12-19 13:58:42 -05:00
Greg Price
067e270a84 Fix spelling of complementary role 2014-11-05 15:48:51 -05:00
polesye
83fbdc2ac4 TNL-481: Add RequireJS Optimizer. 2014-10-20 17:33:21 +03:00
zubair-arbi
fc7d491cdc show upload progress on import course view + display last import status on import page load 
STUD-2017
 2014-09-08 17:51:51 +05:00
Mark Hoeber
8fcbdaed03 Update of all templates 
Changed help button to link and removed drop-down items
 2014-05-16 20:38:09 -04:00
cahrens
d250f1f086 Minor reword to server timed out message. 2014-04-30 09:33:29 -04:00
Waheed Ahmed
09972c7973 Message changed for course import when timeout. 
STUD-1283
 2014-04-09 11:54:06 +05:00
Ned Batchelder
fd13908b90 Fix single-quoted translated strings to be double-quoted. 2014-01-10 14:40:34 -05:00
Ned Batchelder
c7cf0c6d3e Fixes to Translator comments found while debugging the i18n pipeline. 2014-01-03 17:50:16 -05:00
Mark Hoeber
f5ae957a91 Studio: Review all panel help copy 
Reviewed and updated all on-page panel help text in Studio for clarity,
consistency, and brevity.  Updated template HTML files to change text

STUD-924
 2013-11-19 10:35:17 -05:00
Brian Talbot
e41214b1ed Studio: revises the styling for the export view to sync with the import view's UI 2013-11-01 16:01:11 -04:00
cahrens
15c12bc386 csrf token not passed to template. 2013-10-29 16:09:28 -04:00
cahrens
a9d1d4eefc Convert import to new URL pattern. 2013-10-29 15:33:22 -04:00
David Baumgold
303ac5bd49 import: handle case where result has not responseText 2013-10-22 17:34:45 -04:00
Brian Talbot
8769a1a687 Studio: revises layout for success step and actions in import view 2013-10-15 13:44:33 -04:00
Julian Arni
bb00924917 Use requirejs for import.js 
And fixes for rebase-breakage.
 2013-10-07 14:07:26 -04:00
Brian Talbot
5cfec75ece Studio: adds in instructional copy to user on when it is safe to leave the import view without harming an import process 2013-10-07 09:57:41 -04:00
Julian Arni
7b3c4945cf Review fixes 
Studio: revises import help/status copy to better reflect/generalize what is done with imported content

Add test cases for import status
 2013-10-07 09:55:46 -04:00
Julian Arni
642bf0e6e6 Clear import status on retry 2013-10-07 09:53:37 -04:00
Brian Talbot
1735a0f41f Studio: copy and styling changes to import view to support new status UI 2013-10-07 09:52:59 -04:00
Brian Talbot
89bba535e1 Studio: adds in action-related elements to the status display UI of the Import view 2013-10-07 09:52:59 -04:00
Julian Arni
4bbacb02db Re-add bar references 2013-10-07 09:52:59 -04:00
Julian Arni
cab7c4ff74 Remove references to old upload progress bar 2013-10-07 09:52:59 -04:00
Julian Arni
45ce8d30d9 Use swanky error css for error messages 2013-10-07 09:52:59 -04:00
Julian Arni
abdaeef9d8 Hook up js to css classes 2013-10-07 09:51:52 -04:00
Brian Talbot
59af44574c Studio: revises general layout/styling of import view and adds in detail progress feedback after import (WIP) 
Studio: removes import progress bar HTML and Sass; hides import status by default

Studio: revises import file upload success copy; sets up showing/hiding states for import status and additional messages

Studio: revises iconography and adds in success step in import status feedback

Studio: adds hidden styling back into import status UI
 2013-10-07 09:51:19 -04:00
Julian Arni
a108827564 Route ajax request to appropriate view, and show feedback only then 
Hook up view

Fix getStatus function
 2013-10-07 09:51:19 -04:00
Julian Arni
c62691e9fc Scaffolding for import progress reporting 2013-10-07 09:49:59 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Brian Talbot
c2507ddc21 Studio: revises class naming conventions applied to the <body> element and used for view specific styling 2013-10-01 16:53:41 -04:00
Julian Arni
c196d1895a i18n fix 2013-09-23 10:13:33 -04:00
Julian Arni
4fdf7a4849 Prompt before leaving page 2013-09-17 15:55:30 -04:00
Julian Arni
0f81bdcefd Properly handle error responses 2013-09-17 09:46:10 -04:00
Julian Arni
cdf0eef5ca Consider redirect code as succcesful 2013-09-16 15:06:51 -04:00
Julian Arni
6cb2e0b206 Check extension rather than mimetype 2013-08-28 11:13:20 -04:00
Julian Arni
fcd11d93d5 Handle nginx 499s and double requests 2013-08-25 22:40:11 -04:00
Julian Arni
8a8bcf289f remove repeated warnings 2013-08-25 22:40:10 -04:00