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

25266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
jmclaus
15cbd1944c Merge pull request #4745 from stvstnfrd/circuit/clean 
Remove JavaScript variables from global namespace
 2014-08-25 11:56:28 -04: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
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
Ben McMorran
e933c9fe18 Fix error when changing course details on split 2014-08-22 10:22:57 -04:00
Jonathan Piacenti
9058375d85 Added Jonathan Piacenti to the AUTHORS file. 2014-08-22 13:42:57 +00:00
Sarina Canelake
9b1301df05 Merge pull request #4927 from mitocw/cg/add_missing_endif 
Add missing endif in crystallography mako template
 2014-08-22 09:20:46 -04:00
frances botsford
7260094ef3 Merge pull request #4145 from IONISx/tusbar/rewrite-password-reset-templates 
Make use of django_main for password_reset templates
 2014-08-22 08:06:29 -04:00
muhammad-ammar
4815adb641 Merge pull request #4869 from edx/ammar/bok-choy-video-transcript-tests-batch2 
Bok-Choy Video Transcript Tests Batch 2
 2014-08-22 15:39:27 +05:00
Oleg Marshev
62821c3e54 Merge pull request #4920 from edx/oleg/allow-one-group-in-configuration 
Allow one group in a group configuration (BLD-1223)
 2014-08-22 12:51:26 +03:00
Oleg Marshev
7506a479c6 Allow one group in a group configuration. 2014-08-22 11:52:35 +03:00
Waheed Ahmed
c12535c509 Merge pull request #4850 from edx/waheed/stud2096-fix-export-with-old-ora 
Fix export course with old ORA components.
 2014-08-22 13:47:46 +05:00
Waheed Ahmed
9a05f27cc6 Merge pull request #4922 from edx/waheed/lms11228-fix-instructor-dash-analytics-count 
Fixed analytics counts on instructor dashboard.
 2014-08-22 13:47:24 +05:00
Muhammad Ammar
75a0d52472 Bok-Choy Video Transcript Tests Batch 2 2014-08-22 07:28:48 +00:00
Waheed Ahmed
f686e7d0b9 Passed cls=EdxJSONEncoder on json.dumps to fix save, edit and import. 
STUD-2096
 2014-08-22 12:23:46 +05:00
Waheed Ahmed
b98fe5bf1e Fixed analytics counts on instructor dashboard. 
LMS-11228
 2014-08-22 12:22:29 +05:00
Andy Armstrong
3ac3a3152a Merge pull request #4913 from edx/andya/handle-component-errors 
Fix Studio to gracefully handle xblock JavaScript errors
 2014-08-21 18:20:16 -04:00
Andy Armstrong
d451c3e91d Fix Studio to gracefully handle xblock JavaScript errors 
TNL-46

I've changed Studio to catch JavaScript errors when rendering xblocks, log the error, but to then continue as normal. This means that the user is still able to interact with the xblock to delete, duplicate etc. This seems reasonable as the xblock is only rendered as a WYSIWYG representation so if it isn't fully interactive that shouldn't be a big problem.
 2014-08-21 17:31:19 -04:00
Ben McMorran
30fc0441d1 Merge pull request #4782 from edx/reruns/ui 
Reruns/ui
 2014-08-21 16:57:00 -04:00
Renzo Lucioni
fa2154a694 Merge pull request #4893 from edx/web-analytics/pass-ga-cookie 
Re-use GA cookie when sending server-side events to Segment.io
 2014-08-21 16:28:06 -04:00
Jesse Zoldak
3efc384fa5 Merge pull request #4926 from edx/zoldak/update-bok 
Update bok-choy version
 2014-08-21 16:16:34 -04:00