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
Jason Zhu
fca915c365
install and set up paver before using it
...
install and set up paver before using it
2014-04-19 17:21:21 +08: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
Jonas Jelten
3de30aba2e
fixed retry invokation for calling setState
...
to successfully call a function with parameters by setTimeout,
it needs to be a function that will be called by setTimeout internally.
this patch actually enables multiple tries for calling the setState function.
2014-04-18 23:00:25 +02:00
Jonas Jelten
49f3eb3bc4
added jj to the author list
2014-04-18 22:56:51 +02: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
John Jarvis
67128c5ff8
grammar
2014-04-18 10:13:23 -04:00
Sarina Canelake
d408f174e3
Wording for batch beta email add with autoenroll (LMS-2551)
2014-04-18 10:13:19 -04:00
John Jarvis
b67987cd43
fixing example
2014-04-18 10:12:47 -04:00
John Jarvis
27104c93ea
adding django admin command to change enrollment
2014-04-18 10:07:18 -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
Diana Huang
639c42dbe2
Merge branch 'release'
2014-04-17 14:02:56 -04:00
Diana Huang
77ccf688a1
Merge pull request #3386 from edx/hotfix/2014-04-17
...
Show full body when expanding inline forum thread
2014-04-17 13:56:55 -04:00
Adam
03d85761e2
Merge pull request #3383 from edx/adam/ui-disabled-fix
...
change .ui-disabled to .is-disabled
2014-04-17 13:40:43 -04:00
Greg Price
862a16cac0
Show full body when expanding inline forum thread
...
This was a bug in 3af90ef
2014-04-17 12:36:03 -04:00
William Desloge
8ef6a41db5
Fix missing call to translate in receipt page
2014-04-17 17:46:32 +02:00
Adam Palay
82142a4936
pass event to callback functions in membership.coffee (LMS-2547)
2014-04-17 11:43:36 -04:00
Adam Palay
6d356a4512
change .ui-disabled to .is-disabled
2014-04-17 11:15:02 -04:00
Jason Zhu
2231d6ccf3
install and set up paver before using it
...
install and set up paver before using it
2014-04-17 14:28:00 +08:00
Diana Huang
79fea6205e
Merge branch 'release'
...
Conflicts:
lms/static/coffee/src/instructor_dashboard/membership.coffee
lms/templates/instructor/instructor_dashboard_2/membership.html
requirements/edx/github.txt
2014-04-16 15:41:59 -04:00
