Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,441 Commits 1 Branch 0 Tags
8ff3b4e58d1eb8f3ec472fddbc2ed737818cd3ee
Commit Graph

21441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabe Mulley
8ff3b4e58d Merge pull request #2696 from mulby/gabe/add-problem-name-to-events 
Add module display name to module related server events
 2014-02-25 13:05:18 -05:00
Gabe Mulley
fe21f47573 Add module display name to module related server events 
This information will likely be used frequently for analytics purposes, so we would like to denormalize here to avoid having to join with the modulestore later.

Fixes: AN-594
 2014-02-25 11:53:36 -05:00
Sarina Canelake
b0ae3a536d Merge pull request #2714 from edx/sarina/tfex-022514 
Update translations (autogenerated message)
 2014-02-25 10:26:39 -05:00
Sarina Canelake
c46028bf25 Update translations (autogenerated message) 2014-02-25 10:18:30 -05:00
Mark Hoeber
a3e80504d1 Merge pull request #2705 from edx/markhoeber/documentation/stud-1214 
Updated course introduction video section
 2014-02-24 17:17:54 -05:00
Adam
5ab22ca412 Merge pull request #2700 from edx/adam/i18n-instructor-tab 
add i18n scraping to tabs.py (LMS-2166)
 2014-02-24 17:05:45 -05:00
Mark Hoeber
27b64313ef Updated course introduction video section 
updates for stud-1214
 2014-02-24 16:49:22 -05:00
Adam
c9a4de607d Merge pull request #2694 from edx/adam/announcement-text 
minor change to html in announcement unit (STUD-1334)
 2014-02-24 15:55:14 -05:00
Jay Zoldak
f3578eeca0 Merge pull request #2703 from edx/zoldak/verbose-bok-choy-logging 
Bump up the verbosity on bok-choy logging
 2014-02-24 15:53:05 -05:00
Adam Palay
8d2db05635 add i18n scraping to tabs.py (LMS-2166) 
add dummy strings
 2014-02-24 15:46:03 -05:00
Alexander Kryklia
59e4c6bfc4 Merge pull request #2422 from edx/anton/allow-multiple-transcripts 
Video: allow multiple transcripts
 2014-02-24 22:31:16 +02:00
Jay Zoldak
074a57e837 Bump up the verbosity on bok-choy logging 2014-02-24 15:26:29 -05:00
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02:00
Mark Hoeber
2aac72934b Merge pull request #2697 from edx/markhoeber/documentation/stud-1303 
New Images
 2014-02-24 14:49:12 -05:00
John Jarvis
7e035313af Merge pull request #2698 from edx/jarv/add-edx-jsdraw 
adding edx-private requirements file to add jsdraw
 2014-02-24 14:37:11 -05:00
Mark Hoeber
d336721ef5 Merge pull request #2693 from edx/markhoeber/documentation/IMF_issues 
Markhoeber/documentation/imf issues
 2014-02-24 14:32:44 -05:00
Mark Hoeber
b7d0d200bc Getting Starte chapter, for IMF changes 
DOC-60
 2014-02-24 14:31:58 -05:00
John Jarvis
dfb47ddf4c adding edx-private requirements file to add jsdraw 2014-02-24 14:06:08 -05:00
Mark Hoeber
7b587dadf0 New Images 
For STUD-1303

UI for Draft components changes
 2014-02-24 14:04:36 -05:00
Don Mitchell
0b262e7cea Merge pull request #2660 from edx/dbarch/parse_course_id 
Dbarch/parse course
 2014-02-24 13:24:00 -05:00
Ned Batchelder
5c07efa1a8 Update translations with latest from Transifex as of 20140224. 2014-02-24 11:55:52 -05:00
Don Mitchell
81a92e4bfc Consolidate course_id triple parsing 2014-02-24 11:45:59 -05:00
David Baumgold
2c1eb47f43 Merge pull request #2665 from edx/db/update-readme-for-contributing 
Update and linkify our README file
 2014-02-24 11:45:09 -05:00
Jay Zoldak
e4b6fe2c68 Merge pull request #2695 from edx/will/revert-paver-again 
Revert "Fix sys.path manipulation in pavement.py, with detailed comment"
 2014-02-24 11:31:26 -05:00
Will Daly
812e71bbbb Revert "Fix sys.path manipulation in pavement.py, with detailed comment" 
This reverts commit 544616be4b.
 2014-02-24 11:30:40 -05:00
Alison Hodges
9d92b2ed64 Merge pull request #2692 from edx/ahodges/documentation/wikidata 
Ahodges/documentation/wikidata
 2014-02-24 11:27:39 -05:00
Ned Batchelder
91c8df9bae Merge pull request #2659 from edx/ned/more-pervasive-date-l10n 
Make the i18n service available everywhere.
 2014-02-24 10:50:41 -05:00
Adam Palay
2e58e80a68 minor change to html in announcement unit (STUD-1334) 2014-02-24 10:34:44 -05:00
Brian Talbot
0b2267df80 Merge pull request #2502 from ionis-education-group/tabindex-register 
Prevent from tabbing on tos and honor links in registration page
 2014-02-24 10:22:13 -05:00
Ned Batchelder
28e9ae0412 Tests of the localized start dates 2014-02-24 10:06:13 -05:00
Ned Batchelder
b21473f976 Make fake_ugettext et al more usable elsewhere. 2014-02-24 10:06:13 -05:00
Ned Batchelder
6bb0eee3c6 Make the i18n service available everywhere. 
To get all dates localized, we need all runtimes to have the i18n
service, and since runtimes are made by the modulestores, we need to
pass it to them.

Soon (fingers crossed), modulestores won't be involved in making
runtimes, and many of these changes will go away.
 2014-02-24 10:06:13 -05:00
Alison Hodges
406a91f548 Added change log entry 2014-02-24 09:56:21 -05:00
zubair-arbi
b7c557ff15 Merge pull request #2621 from edx/zub/bugfix/std1248-postrequestupdatelocmapp 
add course updates location to loc_mapper on accessing course_info_updat...
 2014-02-24 19:40:27 +05:00
Alison Hodges
61a05ab877 Corrected and completed the wiki data chapter 2014-02-24 09:36:34 -05:00
Alison Hodges
9dae955377 Formatting fix for Comments 2014-02-24 09:26:39 -05:00
Will Daly
38d403f6c9 Merge pull request #2615 from edx/will/paver-attempt-2 
Paver (Part 1) -- Attempt 2
 2014-02-24 07:51:05 -05:00
zubiar-arbi
6b3c5e7d60 get updates_location from course_location directly + update tests 
STUD-1248
 2014-02-24 12:56:09 +05:00
zubiar-arbi
62a32cda21 add course updates location to loc_mapper on accessing course_info_update_handler 
STUD-1248
 2014-02-24 12:56:09 +05:00
Jim Abramson
e3a71b1625 Merge pull request #2646 from edx/jsa/forum-delete-comments 
add ability to delete comments on responses in discussions.
 2014-02-22 19:14:59 -05:00
Valera Rozuvan
e0aa30f06f Merge pull request #2616 from edx/valera/convert_time_to_js 
Converting Time module to JS.
 2014-02-22 20:41:39 +02:00
Mark Hoeber
05bccadfd8 Merge pull request #2684 from edx/sylvia/documentation/BLD-849 
Sylvia/documentation/bld 849
 2014-02-22 10:13:25 -05:00
Sylvia Pearce
1cb0cb209d Quick typo fix 2014-02-21 18:03:47 -05:00
Sylvia Pearce
eb6b8aa26f Add XML information from Appendix E to Common and Advanced Problems 2014-02-21 18:03:02 -05:00
Carson Gee
2da1e4ee26 Merge pull request #2674 from carsongee/cg/ssl_remove_password 
Remove SSL Certifcate auth reliance on internal password
 2014-02-21 17:04:55 -05:00
Mark Hoeber
10d1ea11e9 Merge pull request #2673 from edx/ahodges/documentation/betatesting2 
Ahodges/documentation/betatesting2
 2014-02-21 16:34:23 -05:00
Alison Hodges
c5124cc7cc Edits from Ruth, change log & index updates 2014-02-21 16:33:16 -05:00
Alison Hodges
cfcc0e272f More edits from Sarina, results of testing 
acct activation required; discussion and wiki posts. Added
cross-reference and info on executing tests when viewing a live course
 2014-02-21 16:31:25 -05:00
Mark Hoeber
351407c81a Merge pull request #2679 from edx/ahodges/documentation/discussiondata 
Ahodges/documentation/discussiondata
 2014-02-21 16:28:50 -05:00
Alison Hodges
5ff5cd2019 Documentation updates to add missing fields and verify descriptions of existing fields for discussion data 2014-02-21 16:27:56 -05:00