Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
73c30e950f Merge pull request #3434 from edx/db/dev-process 
Document our development/review process
 2014-04-28 09:32:44 -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
Stephen Sanchez
37cb0052c7 Merge pull request #3483 from edx/ora2/release-2014-04-27T20.17 
Release for Apr 27, 2014
 2014-04-28 07:00:50 -04:00
Muhammad Ammar
69c1b8997d Fix paver python prereq paths 2014-04-28 08:18:04 +00:00
Sarina Canelake
4800811f72 Merge pull request #3484 from edx/sarina/042914-language-update 
Sarina/042914 language update
 2014-04-27 19:22:05 -04:00
Sarina Canelake
51188099a4 Update translations (autogenerated message) 2014-04-27 17:40:19 -04:00
Sarina Canelake
3422fcfe21 Update how translations are pulled 2014-04-27 17:40:18 -04:00
Stephen Sanchez
c9f707f49d Release for Apr 27, 2014 2014-04-27 16:21:33 -04:00
Sarina Canelake
cb5904050a Correct native spelling of Armenian language 2014-04-27 11:06:49 -04:00
lduarte1991
7dee976850 Removed diacritic mention and explained token 2014-04-25 18:53:29 -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
John Cox
441055d8d6 Update changelog 2014-04-25 14:32:03 -07: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
srpearce
b38a923630 Merge pull request #3479 from edx/sylvia/docs/DOC-345 
Correct copy/paste error in Adaptive Hint section
 2014-04-25 16:17:17 -04:00
Sylvia Pearce
cc892d64a9 Correct copy/paste error in Adaptive Hint section 2014-04-25 16:16:26 -04:00
Sylvia Pearce
3671b91aca Add info about removing prompt 2014-04-25 16:10:04 -04:00
marcotuts
a15e43f554 Merge pull request #2810 from edx/marco/discussions/styling-cleanup 
Forums visual styling adjustments
 2014-04-25 16:08:26 -04:00
David Baumgold
7aa627b1fa Merge pull request #3145 from carsongee/cg/course_import_validation 
Add test in import code to make sure two overlapping courses aren't imported
 2014-04-25 16:03:55 -04:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00
John Cox
1192b5f7c9 Make dispatch logic clearer 2014-04-25 12:11:20 -07:00
John Cox
c80b596890 Fix two error message corner cases 2014-04-25 12:11:20 -07:00
John Cox
ce0b640712 Add third-party auth implementation and tests 2014-04-25 12:11:20 -07:00
David Baumgold
838530982a Merge pull request #3380 from fmyzjs/patch-4 
install and set up paver before using it
 2014-04-25 14:05:09 -04:00
Sarina Canelake
dac6270345 Fix i18n of video player string 2014-04-25 14:02:24 -04:00
David Baumgold
0a022e13ba Merge pull request #3371 from carsongee/cg/pdf_textbook_urls 
Switch PDF Textbooks to use portable URLs
 2014-04-25 13:46:28 -04:00
Mark Hoeber
a4f4d7baf4 Merge pull request #3475 from edx/markhoeber/documentation/doc-107 
bug fix - wrong problem name
 2014-04-25 13:45:58 -04:00
Mark Hoeber
95e4728a89 bug fix - wrong problem name 
doc-289
 2014-04-25 13:44:20 -04:00
srpearce
fad631bfee Merge pull request #3474 from edx/sylvia/docs/typo_in_jsinput 
Fix note formatting problem in JSInput doc
 2014-04-25 13:21:49 -04:00
Sylvia Pearce
4f3efa6a1d Fix note formatting problem in JSInput doc 2014-04-25 13:20:56 -04:00
srpearce
34b17d4b08 Merge pull request #3473 from edx/sylvia/docs/DOC-237 
Update label information; correct typo; add XML to PWAH
 2014-04-25 13:13:21 -04:00
Sylvia Pearce
5ef9618f64 Update change log 2014-04-25 13:13:01 -04:00
Andy Armstrong
f6fc10f34b Merge pull request #3463 from aboudreault/xblock-initialization-issue 
XBlocks are something initialized before all resources (url) are loaded
 2014-04-25 13:09:49 -04:00
Sylvia Pearce
faf35d4277 Update label information; correct typo; add XML to PWAH 2014-04-25 12:33:11 -04:00
Alan Boudreault
901920b0cd no need for $.when() here.. 2014-04-25 11:51:08 -04:00
Mark Hoeber
e3d8510248 add index file 2014-04-25 11:27:09 -04:00
Usman Khalid
9d3ea699e6 Merge pull request #3455 from edx/usman/lms1466-email-formatting 
Wraps long lines in bulk email messages.
 2014-04-25 20:23:32 +05:00
Mark Hoeber
7975693dee index org changes 2014-04-25 11:17:37 -04:00
Jay Zoldak
76b9ecf4e1 Merge pull request #3472 from edx/zoldak/disable-video-test 
Disable flaky video test
 2014-04-25 10:32:57 -04:00
Mark Hoeber
dfa83a81e0 Merge pull request #3379 from edx/ahodges/documentation/AN870 
AN-900: new event types for PDFs
 2014-04-25 09:36:52 -04:00
Alison Hodges
1203001c0d AN-900: new event types for PDFs 2014-04-25 09:36:28 -04:00
srpearce
1499f0b9a0 Merge pull request #3465 from edx/sylvia/docs/TIM-463 
Add information about per-criterion feedback
 2014-04-25 09:29:06 -04:00
Sylvia Pearce
7411bc6258 Minor change 2014-04-25 09:28:33 -04:00
Usman Khalid
8fd14bfca7 Wraps long lines in bulk email messages. 
RFC 2822 states that line lengths in emails must be less than 998.
Some MTA's add newlines to messages if any line exceeds a certain
limit (the exact limit varies). Sendmail goes so far as to add
'!\n' after the 990th character in a line. To ensure that bulk
mail messages look consistent long lines are wrapped to a
conservative length.

LMS-1466
 2014-04-25 18:25:20 +05:00
Jay Zoldak
490d2fef8f Disable flaky video test 2014-04-25 09:12:02 -04:00
Oleg Marshev
7966ca45bd Merge pull request #3384 from edx/oleg/fix-matlab-timeout 
Run Code infinite queueing fix. BLD-994.
 2014-04-25 11:09:53 +03:00
Waheed Ahmed
9fc190dd53 Merge pull request #3445 from edx/waheed/stud1514-toggle-cheatsheet-not-working 
Added code to remove css on closing cheatsheet.
 2014-04-25 12:44:05 +05:00
Oleg Marshev
0f70a997f5 Add timestamp and wait for 35 sec. 2014-04-25 10:26:46 +03:00
Waheed Ahmed
49ef8c5686 Added code to remove css on closing cheatsheet. 2014-04-25 11:35:52 +05:00
marco
83defda7d4 visual styling adjustments to discussion listing metadata, simplifying the visual representation of votes, increasing the line height of each post while also increasing the size of the icons for following and comments. visual styling adjustments also included for the discussion itself, pushing comments to be full width within a response, and small typography adjustments to the post count metadata and the add response button 2014-04-24 19:33:03 -04:00