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
Alison Hodges
4ecd0458ce Merge pull request #4935 from edx/ahodges/doc/DOC914 
Removed grading and drag'n'drop
 2014-08-26 15:16:05 -04:00
Don Mitchell
40d68c7a29 Merge pull request #4974 from edx/bug/djpyfs 
Bug/djpyfs
 2014-08-26 14:45:50 -04:00
Alison Hodges
b39b0772e8 release notes initial draft 2014-08-26 14:42:00 -04:00
Don Mitchell
9c946f2245 djpyfs is installed app not middleware 2014-08-26 14:38:55 -04:00
Stephen Sanchez
78046b5dc0 Updating the Login button to have the same hover style as Drupal 2014-08-26 18:30:32 +00:00
Se Won Jang
11d260910f Implemented Validation for Course Advanced Setting 
This commit adds validation for course advanced settings. Currently when course
administrators make invalid changes in the Settings/Advanced Settings tab,
they're not notified through a new modal window of the list of invalid settings
changes.

* Extending CourseMetadata
    - Previously, we only had update_from_json method in CourseMetadata.py,
      and it was only validating one field every POST request.
    - Now we have validate_and_update_from_json method that encapsulates the
      functionality of update_from_json into a validation call
    - To avoid discrepancy of validation standards between modules, validation
      uses the from_json method implemented to each field in xblock.

* Different Response in advanced settings ajax requests
    - After receiving a POST ajax request, course.py calls
      validate_and_update_from_json, and sends a json object of either:
        1) valid course metadata model
        2) error objects

* Error Messages shown in validation-error-modal
    - error objects passed through ajax are shown in a separate modal.
 2014-08-26 11:24:38 -07:00
Sarina Canelake
9e27ff41b9 Merge pull request #4972 from open-craft/doc-byte-sized-tasks 
doc-byte-sized-tasks: Add link to the byte-sized tasks in CONTRIBUTING
 2014-08-26 13:52:49 -04:00
Don Mitchell
709012e361 Merge pull request #4965 from edx/split/lms_bugs 
Split/lms bugs
 2014-08-26 13:23:25 -04:00
Xavier Antoviaque
3459ee2f50 doc-byte-sized-tasks: Add link to the byte-sized tasks in CONTRIBUTING 
Thanks to @adampalay, we now have a list of byte-sized tasks, which are
useful for new contributors who want a gentle introduction to the
platform. This PR adds a link to the tasks tagged as byte-sized in the
public tracker.
 2014-08-26 18:22:17 +02:00
David Ormsbee
9a1687ab29 Facebook auth support. 2014-08-26 15:38:54 +00:00
Frances Botsford
b371783e63 login, registration, and dashboard page changes for third-party auth 2014-08-26 15:38:54 +00:00
Ben Patterson
f5f4326ba9 Merge pull request #4969 from edx/benp/fix-js-tests 
Pin coffee-script version to 1.6.1.

1.6.3 is causing some issues.
 2014-08-26 11:15:47 -04:00
Tim Babych
f347847755 Merge pull request #4973 from edx/tim/single-group-is-ok 
Update test_group_configuration_validation on single group allowed
 2014-08-26 17:29:37 +03:00
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
Tim Babych
df9f80ffaf Add test for at least one group before saving a group configuration 2014-08-26 16:24:01 +03:00
zubair-arbi
2ce1540a9d update/cleanup code + move verify_ordering and drag method to studio utils 2014-08-26 18:19:24 +05:00
zubair-arbi
b6a2330631 add tests for drag and drop unit into collapsed subsection on course outline page 2014-08-26 18:19:23 +05: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
Ben Patterson
5b7633366e Pin coffee-script version to 1.6.1. 2014-08-25 21:39:51 -04:00
Don Mitchell
49ed732824 JS regex's need to escape special chars 
LMS-11260
 2014-08-25 18:07:37 -04:00
Don Mitchell
4465b26a43 Use opaque_keys w/ model vars not parsing of url 
to generate url.
LMS-11209
 2014-08-25 18:07:37 -04: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
Alison Hodges
a921b47c30 release notes tweaks 2014-08-25 11:44:52 -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