Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
25,283 Commits 1 Branch 0 Tags
3d50f4c3a73d594dea098bbb2ff882bb2bd56bf8
Commit Graph

25283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
3d50f4c3a7 Merge pull request #4959 from edx/diana/set-cur-lang 
Make sure that the currently-set language is the one that shows on the left sidebar if no language  preference exists.
 2014-08-26 09:43:09 -04:00
Anton Stupak
876fdbb3bd Merge pull request #4970 from edx/anton/enable-bok-choy-test 
Enable Bok Choy split test.
 2014-08-26 14:28:19 +03:00
polesye
5495329aab BLD-1226: enable 'delete_inactive_group' test. 2014-08-26 11:44:10 +03:00
Don Mitchell
a0e697235d Merge pull request #4966 from edx/split/html_id 
Update opaque-keys library to use block_id for html_id for new keys.
 2014-08-25 18:06:02 -04:00
Nimisha Asthagiri
e42a3f15db Update opaque-keys library to use block_id for html_id for new keys. 
Catch more places where get_children was giving us version aware references.
LMS-11237
 2014-08-25 17:41:57 -04:00
Diana Huang
ff4fc7956e Make sure that the currently-set language is the 
one that shows on the left sidebar if no language
preference exists.

ECOM-135
 2014-08-25 17:12:29 -04:00
Jesse Zoldak
c5ad234cb9 Merge pull request #4964 from edx/revert-4960-split/html_id 
Revert "Update opaque-keys library to use block_id for html_id for new k...
 2014-08-25 17:12:12 -04:00
Jesse Zoldak
b90e947b8d Revert "Update opaque-keys library to use block_id for html_id for new keys." 2014-08-25 17:11:39 -04:00
Piotr Mitros
b166503749 Merge pull request #4889 from edx/danielli/pyfs 
Adds pyfilesystem service from XBlocks to edx-platform
 2014-08-25 16:37:46 -04:00
swdanielli
cba117d547 Merge branch 'danielli/pyfs' of https://github.com/edx/edx-platform into danielli/pyfs 2014-08-25 15:40:06 -04:00
swdanielli
a7d78e755d fix test case for pyfs 2014-08-25 15:38:35 -04:00
Don Mitchell
cf8b853d7d Merge pull request #4960 from edx/split/html_id 
Update opaque-keys library to use block_id for html_id for new keys.
 2014-08-25 15:24:08 -04:00
Nimisha Asthagiri
f7efb50ffb Update opaque-keys library to use block_id for html_id for new keys. 
Catch more places where get_children was giving us version aware references.
LMS-11237
 2014-08-25 14:21:49 -04:00
Sarina Canelake
eb84832849 Merge pull request #4325 from edx/victor/update-activation-email-text 
Update activation email text
 2014-08-25 13:43:18 -04:00
Don Mitchell
0976f8031f Merge pull request #4931 from edx/reruns/check_answer 
Fix check and show answer for split
 2014-08-25 13:10:28 -04:00
Stephen Sanchez
dd50b9d009 Merge pull request #4855 from edx/sanchez/update-platform-footer 
Updating the footer for edx.org and open edx.
 2014-08-25 12:47:37 -04:00
swdanielli
8378422f3d code clean 2014-08-25 12:25:03 -04:00
swdanielli
504a7a21ba add pyfs service 2014-08-25 12:25:03 -04:00
Piotr Mitros
e6f48435e3 Merge pull request #4952 from edx/pmitros/latest-xblock 
Update to latest XBlock
 2014-08-25 12:22:03 -04:00
Victor Shnayder
26d975c2f4 Update activation email text 
Make it more active.  Adds a separate section for edX.org-specific copy,
because it's hard to make it generic.

LMS-11084
 2014-08-25 12:09:47 -04:00
jmclaus
15cbd1944c Merge pull request #4745 from stvstnfrd/circuit/clean 
Remove JavaScript variables from global namespace
 2014-08-25 11:56:28 -04:00
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx. 
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
 2014-08-25 15:33:43 +00:00
Don Mitchell
d77fe6e5da Merge pull request #4881 from edx/dhm/get_children_agnostic 
Split get_block uses the passed in id rather than constructed
 2014-08-25 11:31:54 -04:00
Don Mitchell
ad8ece5134 Split get_block uses the passed in id rather than constructed 
on returned block so that branch/version awareness is inherited.
LMS-11263
 2014-08-25 10:30:40 -04:00
Don Mitchell
4d701bebef Fix check and show answer for split 
LMS-11237
 2014-08-25 10:29:50 -04:00
Piotr Mitros
d0ac4c375e Update to latest XBlock 2014-08-25 10:24:55 -04:00
Don Mitchell
e4aaf4975c Merge pull request #4899 from edx/dhm/mongo_indices 
Refactored expected indices after email w/ mongo
 2014-08-25 10:19:27 -04:00
Stephen Sanchez
b3f4ce2312 Merge pull request #4879 from edx/sanchez/update-platform-header 
Updating the platform header styles to match new site styles.
 2014-08-25 09:57:14 -04:00
Nimisha Asthagiri
5c6a846784 Merge pull request #4936 from edx/benmcmorran/bokchoy-course-reruns 
Add bokchoy tests for course reruns
 2014-08-22 19:05:07 -04:00
stv
1aeadcda97 Avoid use of Array/Object constructors 
Array and Object constructors, as opposed to their literal values ('[]'
and '{}'), incur additional overhead and are less effectively optimized
by the compiler.
 2014-08-22 15:25:25 -07:00
stv
2f0a51b479 Remove superfluous whitespace and comments 2014-08-22 15:25:15 -07:00
stv
b858d846da Unpollute JavaScript global namespace 
As these variables were being assigned without being explicitly
declared, they were implicitly added to the global namespace.

This commit removes 59 variables from the global namespace.
 2014-08-22 15:24:57 -07:00
Christina Roberts
237cf77f55 Merge pull request #4948 from edx/christina/last-group-config-pr 
Unflag Group Configurations, Render only existing children in staff view...
 2014-08-22 17:58:19 -04:00
Ben McMorran
098c1d59cd Add bokchoy tests for course reruns 2014-08-22 17:41:41 -04:00
Jesse Zoldak
da0fab1ee5 Merge pull request #4949 from edx/zoldak/define-log-dir 
Define SELENIUM_DRIVER_LOG_DIR in paver bok-choy command
 2014-08-22 17:05:52 -04:00
Jesse Zoldak
cc41ccb48c Define SELENIUM_DRIVER_LOG_DIR in paver bok-choy command 2014-08-22 16:57:23 -04:00
Alexander Kryklia
095b07275e Unflag Group Configurations, Render only existing children in staff view of split_test. 2014-08-22 16:43:54 -04:00
Ben McMorran
b875a42971 Merge pull request #4938 from edx/benmcmorran/reword-rerun-note 
Reword course rerun notification
 2014-08-22 16:07:04 -04:00
Sarina Canelake
657610dd73 Merge pull request #4944 from edx/sarina/make-studio-reg-copy-match 
Make Studio and LMS register pages use the same language
 2014-08-22 15:29:28 -04:00
Ben McMorran
e8fd9c08c1 Merge pull request #4934 from edx/benmcmorran/course-settings-error 
Fix error when changing course details on split
 2014-08-22 14:47:15 -04:00
Stephen Sanchez
033551416b Updating the platform header styles to match new site styles. 
Putting the new edx header behind a feature flag.
 2014-08-22 18:25:45 +00:00
Sarina Canelake
e57a1551c3 Make Studio and LMS register pages use the same language 2014-08-22 14:23:07 -04:00
Christina Roberts
85ede381c5 Merge pull request #4923 from edx/zub/bugfix/tnl56-dragdropintocollapsedunit 
populate children of unit collapsed drop location
 2014-08-22 13:03:37 -04:00
Sarina Canelake
5c48004f52 Merge pull request #4940 from edx/sarina/082214-translation-update 
Update translations (autogenerated message)
 2014-08-22 12:16:56 -04:00
Sarina Canelake
c11764e9b9 Update translations (autogenerated message) 2014-08-22 12:14:58 -04:00
Alison Hodges
9854c231d6 Merge pull request #4903 from edx/ahodges/doc/DOC263 
Clarify the effect of changing problems
 2014-08-22 11:44:52 -04:00
Alison Hodges
ff162a0297 Clarify the effect of changing problems 2014-08-22 11:38:34 -04:00
Ben McMorran
9cb87cfd61 Reword course rerun notification 2014-08-22 11:35:03 -04:00
cahrens
4946d601d2 Verify children are rendered before allowing drop into collapsed parent. 
TNL-56
 2014-08-22 11:20:13 -04:00
Sarina Canelake
061199cab6 Merge pull request #4933 from Kelketek/jp_authors 
Added Jonathan Piacenti to the AUTHORS file.
 2014-08-22 11:06:09 -04:00