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

22659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
4bc3ec285c Added a visualization of the PR process 2014-04-23 17:19:22 -04:00
David Baumgold
44e4f96dc6 link to docs to rebase a pull request 2014-04-23 17:09:49 -04:00
David Baumgold
09f8923884 Include analytics team in dev process 2014-04-23 17:05:36 -04:00
David Baumgold
ac1e566bce Refer to process docs in CONTRIBUTING.rst 2014-04-22 17:08:22 -04:00
David Baumgold
4db7f33196 Added process documentation 2014-04-22 17:06:16 -04:00
David Baumgold
6fc05bcacf Merge pull request #3429 from edx/move-experiments-rst 
Move experiments.rst into the en_us directory
 2014-04-22 15:57:17 -04:00
Alison Hodges
f4d6bbaf3c Merge pull request #3388 from edx/ahodges/documentation/LMS2525 
Ahodges/documentation/lms2525
 2014-04-22 15:45:49 -04:00
Alison Hodges
52c34886d2 doc for LMS-2525: feature changes for student enrollment 2014-04-22 15:44:57 -04:00
Anton Stupak
d861a9a0a2 Merge pull request #3369 from edx/anton/download-handout 
Video: Add Download Handout
 2014-04-22 22:30:10 +03:00
Jay Zoldak
ac980460cc Merge pull request #3428 from edx/zoldak/fix-lang-test 
Wait for ajax post after changing language
 2014-04-22 15:13:44 -04:00
David Baumgold
8b40d728f0 Move experiments.rst into the en_us directory 2014-04-22 15:11:23 -04:00
polesye
127bf7ed3f BLD-1000: Download handout. 2014-04-22 21:44:36 +03:00
David Baumgold
7c89055089 Merge pull request #3404 from edx/watchdog-in-paver-reqs 
Added watchdog to Paver requirements
 2014-04-22 14:39:27 -04:00
Jay Zoldak
7d0297f0df Wait for ajax post after changing language 2014-04-22 14:28:10 -04:00
Stephen Sanchez
b993dfbdb3 Merge pull request #3424 from edx/ora2/release-2014-04-22T16.55 
Release for Apr 22, 2014
 2014-04-22 14:03:46 -04:00
Sef Kloninger
f3842dcc01 Merge pull request #2834 from edx/sef/theme-embargo-master 
make embargo template theme-able
 2014-04-22 10:04:08 -07:00
Stephen Sanchez
575c92c8c3 Release for Apr 22, 2014 2014-04-22 13:02:04 -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
ichuang
d4201f028e Merge pull request #3413 from edx/bugfix/ichuang/multiple-choice-question-hints 
bugfix: allow multiple choice questions to display hints

Thanks, @sarina, @pmitros
 2014-04-22 12:03:43 -04:00
Stephen Sanchez
28e2bf3ffa Merge pull request #3420 from edx/ora2/release-2014-04-22T15.15 
Release for Apr 22, 2014
 2014-04-22 11:58:48 -04:00
Renzo Lucioni
26fdf5d2af Merge pull request #3421 from edx/renzo/segment-io-identify-fix 
Correct ordering of Segment.io identify and page calls
 2014-04-22 11:45:29 -04:00
Usman Khalid
543306b29f Fixed path of tinymce.js. 
LMS-2554
 2014-04-22 20:41:02 +05:00
Renzo Lucioni
cfd841b872 Correct ordering of Segment.io identify and page calls 2014-04-22 11:29:36 -04:00
Stephen Sanchez
cd412448bb Release for Apr 22, 2014 2014-04-22 11:17:54 -04: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
3953b97c44 Update translations (autogenerated message) 2014-04-22 10:08:14 -04:00
Dave St.Germain
00c7100e46 Merge pull request #3415 from edx/dcs/codejail-version 
Update codejail to enable logging
 2014-04-22 09:48:36 -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
Alison Hodges
54081d7405 Merge pull request #3405 from edx/ahodges/documentation/pythonsnippets 
DOC-279, correct add discussion category steps
 2014-04-22 09:36:45 -04:00
Alison Hodges
6b26c82c4f DOC-279, correct add discussion category steps 
also removed "static" for pages
 2014-04-22 09:34:23 -04:00
Sarina Canelake
a52540c8ee Merge pull request #3397 from edx/sarina/lms-2551 
Wording for batch beta email add with autoenroll (LMS-2551)
 2014-04-22 09:34:08 -04:00
Alison Hodges
bed7f2c81a Merge pull request #3407 from edx/ahodges/documentation/DOC264 
Ahodges/documentation/doc264
 2014-04-22 09:20:43 -04:00
Alison Hodges
03da681d52 DOC-264, clarify that students can opt out of email 2014-04-22 09:19:50 -04:00
Anton Stupak
581716cbdd Merge pull request #3414 from edx/anton/i18n-choice-response 
MultipleChoiceResponse i18n.
 2014-04-22 14:47:31 +03:00
polesye
ca93855fcf BLD-717: MultipleChoiceResponse i18n. 2014-04-22 12:17:16 +03:00
ichuang
f91b96565d bugfix: allow multiple choice questions to display hints 2014-04-21 22:03:26 -04:00
David Baumgold
b44ed8061f Merge pull request #3094 from yarko/yarko/fix-paver-env-assets 
ensure SERVICE_VARIANT set; pass theme to coffeescript;
 2014-04-18 23:10:46 -04:00
yarko
97ecc7a743 fix class var; set SERVICE_VARIANT to lms by default if unset (helps "paver --help" work cleanly) 2014-04-18 17:46:55 -05:00
yarko
cc86b656ea remove theme_paths var, per @sefk 2014-04-18 15:47:57 -05:00
Jay Zoldak
a78b3225bb Merge pull request #3387 from edx/zoldak/update_page_objects 
Update bok-choy page definitions
 2014-04-18 16:07:04 -04:00
yarko
59106f236f set reasonable SERVICE_VARIANT based on command line; ensure theme passed to coffeescript also; 2014-04-18 15:00:05 -05:00
David Baumgold
fdcafa9427 Added watchdog to Paver requirements 2014-04-18 15:38:26 -04:00
Adam
cc67c07dfb Merge pull request #3385 from edx/adam/add-event 
pass event to callback functions in membership.coffee (LMS-2547)
 2014-04-18 13:53:21 -04:00
David Baumgold
c854ec5c3b Merge pull request #3366 from IONISx/missing-translations 
Missing translations
 2014-04-18 13:41:04 -04:00
Sarina Canelake
d408f174e3 Wording for batch beta email add with autoenroll (LMS-2551) 2014-04-18 10:13:19 -04:00
Jay Zoldak
5e1964dd87 Update bok-choy page definitions 2014-04-18 09:35:10 -04:00
Diana Huang
19b6718c2e Merge pull request #3392 from edx/release 
Release
 2014-04-18 09:34:26 -04:00
Greg Price
5c94a3d157 Merge pull request #3389 from edx/hotfix/2014-04-17a 
Render markup in inline threads on expand/collapse
 2014-04-17 17:17:35 -04:00
Greg Price
92151e3bd6 Render markup in inline threads on expand/collapse 
This was a bug in 3af90ef.
 2014-04-17 15:13:00 -04:00