Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
22,242 Commits 1 Branch 0 Tags
0513e144b1be90a49e45cc7c8b7cd30da8dedbb0
Commit Graph

4507 Commits

Author SHA1 Message Date
polesye
92cd46277d BLD-950: Update captions logic on front-end. 2014-04-01 12:25:45 +03:00
Mark Hoeber
8452ee7c0d Merge pull request #3132 from edx/markhoeber/documentation/stud-1488 
Added note about pages being publicly viewable
 2014-03-31 16:19:08 -04:00
Andy Armstrong
2086d09ff5 Merge pull request #3121 from louyihua/translation-fix-cms 
Translation fix in studio: For better translation in unit.html
 2014-03-31 15:37:57 -04:00
louyihua
582971755a Translation fix in studio: For better translation 
As the sentence in unit.html is splitted into three parts due to the varible release_date may be None, it breaks the integrity of a sentence.
Different language may have different word or event grammer order, so if a sentence is breaked into three parts, translators cannot adjust the word orders to create a good translation.
So this fix tries to combine the sentence together.
 2014-04-01 02:23:02 +08:00
Frances Botsford
a01d296d1c moved Studio public Pages warning to a more prominent location 2014-03-31 13:42:06 -04:00
Alexander Kryklia
dfa7c27e77 Add multiple transcripts editor. 
Fix donwload subs for non youtube videos and non-en language - continue.
Add acceptance tests.
Add detetion of assets on request.
Updated docstring.
Add fixes and acceptance tests.
Fix acceptance tests.
Update docsrtings and cleanup code, resful for language_id.
Specify exception type in POST.
Fix url in upload module.
Improve exception handling.
Remove 'en' and catching in editable_metadata.
Move descriptor.get_context test to lms tests.
Add query parameter to translation dispatch.
Response to format parameter of translatin GET request.
Fix Acceprance test: Metadata Editor.
move handlers to proper scores.
Split video player into smaller files.
Add ugettext and fix typoes.
Add changelog.
Support for downloading non-ascii filenames.
Change event binding.
Add content-language to download requests.
Reractor POST handler to not update self.transcripts.
 2014-03-31 18:49:56 +03:00
Mark Hoeber
bb4f30b31a Added note about pages being publicly viewable 
STUD-1488
 2014-03-31 11:14:39 -04:00
zubiar-arbi
2b389a2dfa raise ItemNotFoundError if course not found in modulestore (course_listing) 
STUD-1455
 2014-03-31 14:12:38 +05:00
Calen Pennington
81a038cbaf Add datadog metrics logging for django model creates, updates, and deletes 2014-03-28 14:45:59 -04:00
Nimisha Asthagiri
1bd6792a08 Support for "View Live" on Pages page. 
Settings for ENABLE_STUDENT_NOTES and ENABLE_TEXTBOOK in CMS.
Do not display empty collection tabs.
Updated Changelog.
 2014-03-28 05:41:32 -04:00
Brian Talbot
3b0f71482e Studio - revising markup, templates and styling for page editing UI: 
* added in fixed state markup/logic
* added in collection markup/logic
* revised styling for page titles, collection, and fixed elements
 2014-03-28 05:41:32 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Valera Rozuvan
3f41aae9f7 Make YouTube mocked server serve YouTube API 
1.) Making YouTube mock server serve YouTube API.
2.) Adding ability to block YouTube API from YouTube mock server.
3.) Adding acceptance tests that check YouTube mock server for availability of YouTube API, and for it's ability to block YouTube API.

Part of BLD-939.
 2014-03-28 10:34:34 +02:00
Dave St.Germain
0501775d64 Add an option to prevent multiple logins of the same user. 2014-03-27 16:05:25 -04:00
Valera Rozuvan
e50fad6475 Fix failing tender. 2014-03-27 20:36:08 +02:00
Carlos Andrés Rocha
ba8faeadb4 Merge branch 'release' 2014-03-27 14:11:57 -04:00
Carson Gee
2c03c63990 Properly get lazily translated exception message 2014-03-26 21:46:22 -04:00
Piotr Mitros
5f9ef9a402 Concept added to Studio advanced components 2014-03-26 16:37:45 -04:00
David Baumgold
2d452d8bb2 Merge pull request #3005 from singingwolfboy/db/paver 
Paver v3
 2014-03-26 13:41:05 -04:00
cahrens
2c79c1fe2f Revert to older version of TinyMCE. 
We had trouble with Cloudfront/hashed files and need more time
to investigate.
This reverts commit e8f53ac9dc6d8a1d9928787635c7c5f7e409a9ec.
 2014-03-26 11:06:59 -04:00
polesye
a1c957ecd3 BLD-951: Fix flaky tests. 2014-03-26 11:45:17 +02:00
Andy Armstrong
2a3509f798 Merge pull request #3046 from edx/andya/fix-xblock-loading-in-studio 
Fix Studio's XBlock dependency loading issues
 2014-03-25 17:25:57 -04:00
Andy Armstrong
a37d2c1b93 Fix Studio's XBlock dependency loading issues 
STUD-1465

Changed the XBlock rendering logic to use promises to track asynchronous tasks.
Each dependency is then only loaded once the previous one has completed, and the
XBlock initialization only happens once all dependencies are loaded. This gives
XBlocks the same semantics in Studio as they get when shown directly on a page.
 2014-03-25 16:36:06 -04:00
Will Daly
44dad41ede Switch from Rake to Paver 2014-03-25 11:32:19 -04:00
Will Daly
ba00a442d7 Merge pull request #3037 from edx/will/tim-installation-rebase 
Install new ORA (edx-tim)
 2014-03-25 10:59:05 -04:00
David Baumgold
274224bf6c Merge pull request #3051 from louyihua/fix-cms-email-translation 
Fix typo in studio's email text
 2014-03-25 10:40:13 -04:00
Will Daly
440d9ddb89 Install edx-ora2 
Support for displaying submissions API scores in Progress page.
 2014-03-25 09:42:55 -04:00
louyihua
b70b232205 i18n: Fix typo in studio's email 
The right parenthesis should be appeared before the method '.format', not after.
 2014-03-25 16:51:24 +08:00
Alexander Kryklia
de15848e9b Merge pull request #2622 from edx/alex/fix_duplicate_code_in_transcripts_ajax 
Remove duplicate code in transcripts_ajax.
 2014-03-25 10:36:21 +02:00
zubair-arbi
22205c35c8 Merge pull request #2985 from edx/zub/story/deletecoursefromlocmapper 
remove course location from loc_mapper on delete
 2014-03-25 12:44:04 +05:00
Valera Rozuvan
1c8eed853e Moved all YouTube related URLs to a separate namespace. 
All YouTube urls are defined on backend side.
 2014-03-24 18:40:28 +02:00
Andy Armstrong
f3c23e89d5 Merge pull request #3027 from edx/andya/asset-loading-indicator 
Add a loading indicator to the Files & Uploads page.
 2014-03-24 11:53:38 -04:00
Andy Armstrong
664f78dcb1 Merge pull request #2657 from edx/christina/tinymce-upgrade 
Upgrade TinyMCE and switch to CodeMirror plugin
 2014-03-24 11:53:17 -04:00
Alexander Kryklia
c9e9f6e6d5 Remove duplicate code in transcripts_ajax. 2014-03-24 17:23:30 +02:00
Andy Armstrong
f92c337235 Add a loading indicator to the Files & Uploads page. 2014-03-24 10:51:36 -04:00
cahrens
7b24172614 Update tests for minor UI changes. 
Code editor button no longer shows an icon, and code style toolbar button location has moved.
 2014-03-24 10:45:09 -04:00
zubiar-arbi
9d04a9270b remove course location from loc_mapper on delete 2014-03-24 19:26:19 +05:00
Mark Hoeber
982f24aed1 Merge pull request #3026 from edx/markhoeber/documentation/STUD-1458 
Update to page help on new Pages page in Studio
 2014-03-23 12:38:20 -04:00
Jay Zoldak
a00007b837 Merge pull request #3024 from edx/zoldak/update-se-version 
Update selenium version
 2014-03-22 07:45:02 -04:00
Mark Hoeber
d752894604 Update to page help on new Pages page in Studio 
STUD-1458

Modified the edit-tabs template and the preview-lms-staticpages image
used in the modal.
 2014-03-21 16:33:26 -04:00
Frances Botsford
9054c621fc keeping the component editor inside the component window 2014-03-21 15:47:32 -04:00
Jay Zoldak
cd81b5aa2b Temporarily disable video autoplay selenium tests 2014-03-21 15:47:24 -04:00
cahrens
a6b18dea80 Fire events before and after the link dialog is shown. 
This allows us to convert the static links.
 2014-03-21 15:39:44 -04:00
Nimisha Asthagiri
3bcf619f0d Merge pull request #2910 from edx/frances/feature/studio-nav-manipulation2 
Frances/feature/studio nav manipulation2
 2014-03-21 15:13:22 -04:00
cahrens
bb0a58abf7 Code review feedback. 2014-03-21 15:00:31 -04:00
cahrens
b0c35982a6 Change the event handling for image plugin. 
Fixes FireFox bug, and allows us to correct the image path when we show the plugin (as opposed ot only correcting path when we close the plugin).
 2014-03-21 14:49:12 -04:00
cahrens
d623a4e480 Updates from code review. 2014-03-21 14:42:00 -04:00
cahrens
fb6afc708d pep8 2014-03-21 14:42:00 -04:00
cahrens
e1908b5ab2 Fire an event with the link plugin closes so we can rewrite links. 2014-03-21 14:41:59 -04:00
cahrens
09643c8738 Add test for code format toolbar button. 2014-03-21 14:41:59 -04:00