Commit Graph

1209 Commits

Author SHA1 Message Date
Brian Wilson
d6a74a644d Merge branch 'master' into release
Conflicts:
	cms/static/js/views/modals/edit_xblock.js
2014-05-13 11:10:48 -04:00
Sarina Canelake
a5381db070 Only show banner on legacy dash for edx.org
LMS-1296
2014-05-12 12:42:19 -04:00
Sarina Canelake
ced09a6b04 Switch default instructor dashboard to new dash
LMS-1296
2014-05-12 10:18:27 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx
Reconnecting Token Generator for Annotation Tool
2014-05-09 16:14:42 -04:00
Ned Batchelder
4d4390c0c9 IGNORABLE_404_ENDS is wrong and unused
This setting is only used if SEND_BROKEN_LINK_EMAILS is true, which it
is not, and it is deprecated, and this value for it is wrong, since it
is used as an iterable.
2014-05-06 18:02:53 -04:00
Ned Batchelder
db8c4de202 Remove press-page machinery and assets 2014-05-06 13:29:17 -04:00
Renzo Lucioni
bfee237a0d Add ability to deactivate GA snippet 2014-05-05 17:31:07 -04:00
Adam
5cef9f7a37 Merge pull request #3202 from edx/talbs/lms-dashboard-trackstatus
LMS: Show Enrollment Type on Dashboard
2014-05-05 13:19:49 -04:00
Waqas
a07da78a0f Add the "VERIFIED_CERTIFICATES" toggle on dashboard 2014-05-05 20:10:26 +05:00
Sarina Canelake
692e4b2ea7 Merge pull request #3589 from edx/sarina/050514-language-update
Sarina/050514 language update
2014-05-05 10:33:48 -04:00
Sarina Canelake
8f0173dc10 Add new languages 2014-05-05 09:13:51 -04:00
Waqas
0d7f34b5d3 Update the software secure result call back by correcting the typo
LMS-2516
2014-05-05 16:44:33 +05:00
Gabe Mulley
36269bd5a8 Integrate event-tracking in to the LMS
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
2014-05-01 14:04:35 -04:00
e0d
2bfb1b4a56 Merge branch 'release' 2014-04-30 14:42:27 -04:00
Jason Bau
f8c062b6ce lti 2.0 result service rest endpoint 2014-04-29 12:01:12 -07:00
Adam Palay
8ad4cdb366 factor out google analytics ids (LMS-2555) 2014-04-28 16:47:17 -04:00
muhammad-ammar
dfa45eac16 Merge pull request #3440 from edx/ammar/config-youtube-stub-for-bok-choy
Configure youtube stub for bok-choy
2014-04-28 17:32:33 +05:00
Sarina Canelake
3422fcfe21 Update how translations are pulled 2014-04-27 17:40:18 -04:00
Sarina Canelake
cb5904050a Correct native spelling of Armenian language 2014-04-27 11:06:49 -04:00
Ned Batchelder
82bd46d5a5 Merge pull request #3450 from johncox-google/johncox/feature/buttons
Change signin control from text list to buttons.
2014-04-25 17:38:16 -04:00
David Baumgold
5edae3edb0 Merge pull request #2780 from FiloSottile/progress_success_button
Show a success button at the top of the Progress page
2014-04-25 16:56:58 -04:00
John Cox
0379bd34a0 Fix acceptance tests 2014-04-25 13:34:18 -07:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00
John Cox
ce0b640712 Add third-party auth implementation and tests 2014-04-25 12:11:20 -07:00
lduarte1991
5ae1ca9685 Reconnecting Token Generator for Annotation Tool 2014-04-24 16:14:05 -04:00
Adam
1934586afa Merge pull request #3422 from edx/usman/lms2554-tinymce-js
Fixed path of tinymce.js.
2014-04-22 12:31:17 -04:00
Usman Khalid
543306b29f Fixed path of tinymce.js.
LMS-2554
2014-04-22 20:41:02 +05:00
Sarina Canelake
deb9eb822e Merge pull request #3416 from edx/sarina/042214-language-update
Sarina/042214 language update
2014-04-22 11:03:07 -04:00
Sarina Canelake
f4332bb413 Add new languages from Transifex 2014-04-22 09:48:28 -04:00
Dave St.Germain
5bd944a3a6 Update codejail to enable logging 2014-04-22 09:46:48 -04:00
Jay Zoldak
3fc19a35b0 Serve video HTML5 sources locally for acceptance tests 2014-04-15 10:40:53 -04:00
Jay Zoldak
9957b1aa8e Disable discussion service setting for lettuce tests 2014-04-10 11:51:20 -04:00
Jay Zoldak
579e66fe88 Quiet some noisy loggers for lettuce acceptance tests 2014-04-09 14:40:50 -04:00
Dave St.Germain
660244201f Refactored course_nav middleware to isolate the django-wiki hack,
remove unnecessary code, and clarify what it's doing.
2014-04-08 15:24:48 -04:00
Sarina Canelake
c51d418163 Merge pull request #3235 from edx/sarina/040714-language-update
Sarina/040714 language update
2014-04-07 14:44:41 -04:00
Dave St.Germain
25f722d35d Merge pull request #3212 from edx/dcs/log-codejail
This should enable logging of codejail on prod
2014-04-07 14:14:02 -04:00
Sarina Canelake
d7f499f276 Don't pull unreviewed languages from Transifex 2014-04-07 13:19:25 -04:00
Jay Zoldak
d45cd90df1 Merge pull request #3218 from edx/zoldak/bok-choy-contentstore
Fix the pointer to the contentstore in the bok-choy settings
2014-04-05 20:21:58 -04:00
Filippo Valsorda
1ce7a24572 Make the SHOW_PROGRESS_SUCCESS_BUTTON feature more flexible
The button text default is now in the template and i18n-able, a
PROGRESS_SUCCESS_BUTTON_TEXT_OVERRIDE option is offered in settings.
The button url now uses string formatting.
2014-04-05 18:16:28 +02:00
Filippo Valsorda
da5ab6d222 Add SHOW_PROGRESS_SUCCESS_BUTTON feature
Show a button at the top of lms/templates/courseware/progress.html if the
lowest nonzero grade cutoff has been reached. Introduce two settings:
PROGRESS_SUCCESS_BUTTON_URL is the href of that button (the course id is
appended); PROGRESS_SUCCESS_BUTTON_TEXT is the text, defaults to
"Download your certificate"
2014-04-05 18:13:00 +02:00
chrisndodge
c407e89889 Merge pull request #2781 from edx/cdodge/password-history-enforcements
Add some optional policies around password resets, such as password reus...
2014-04-04 16:14:43 -04:00
Jay Zoldak
72259b2fe1 Fix the pointer to the contentstore in the bok-choy settings 2014-04-04 12:30:09 -04:00
Dave St.Germain
011a2fcf13 This should enable logging of codejail on prod 2014-04-03 16:33:37 -04:00
Nimisha Asthagiri
f44a1b6c1c Tiny MCE version 4.0.20
Changed tiny-MCE to not load CSS files dynamically.
Added CSS files for tiny-MCE in env files.
Moved TinyMCE files to directory structure required by Jake command.
Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
Updated CHANGELOG to indicate tinymce version 4.0.20.
Renamed tinymce.css.
Directions for creating tinymce.full.min.js and commenting of edX changes.
Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
Allow TinyMCE to handle CSS within the iframe.
2014-04-02 11:12:26 -04:00
David Baumgold
c388b408e1 Merge pull request #3054 from louyihua/fix-chinese-language-name
Fix the chinese name of chinese language in common.py
2014-03-31 13:52:26 -04:00
Sarina Canelake
36185936dd Merge pull request #3130 from edx/sarina/033114-language-update
Update translations (autogenerated message)
2014-03-31 13:43:24 -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
Sarina Canelake
6fef664309 Update translations (autogenerated message) 2014-03-31 10:42:17 -04:00
Chris Dodge
d5bb1b5cca Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets 2014-03-31 10:30:58 -04:00
Calen Pennington
81a038cbaf Add datadog metrics logging for django model creates, updates, and deletes 2014-03-28 14:45:59 -04:00