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

29961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugeny Kolpakov
4d076fceed Merge pull request #7816 from open-craft/ekolpakov/children-import-fix 
Fixed loosing children in drafts on import
 2015-05-01 20:59:01 +03:00
Will Daly
6ed41b2263 Merge pull request #7885 from edx/will/credit-through-enrollment-api 
Enrollment API course details include credit modes.
 2015-05-01 13:43:54 -04:00
Will Daly
5d16ed46a2 Enrollment API course details include credit modes. 
Credit modes are hidden by default, since the user
isn't allowed to select them on the track selection page.
This commit exposes credit modes through the enrollment
API so that consumers can see that a course has a credit
track.
 2015-05-01 12:36:30 -04:00
E. Kolpakov
6db974c8ee Fixes for course import-export: 
* Updated XBlock hash - new version forces exposes force_dirty method on fields
* Includes Scope.children fields into xml_importer._update_module_location so that they are updated as well.
* Tests for mutable fields xml_importer._update_module_location with mutable fields and children
 2015-05-01 18:36:14 +03:00
Ben Patterson
270ac747ea Merge pull request #7851 from edx/benp/pep8-pycharm-helpers 
Pep8 should ignore pycharm-helpers files on folks' workstations/VMs.
 2015-05-01 10:36:24 -04:00
Will Daly
f6e8ce24af Merge pull request #7879 from edx/will/restore-remember-me 
Add remember me checkbox back to the combined login/registration page
 2015-05-01 09:57:45 -04:00
Ben Patterson
8cd5f42ca9 Merge pull request #7850 from edx/benp/bok-choy-shard-5 
Add bok-choy shards 4 and 5. New default is 'shard 6'
 2015-05-01 09:26:32 -04:00
Ned Batchelder
cc8c7e7ce1 Merge pull request #7880 from edx/ned/pedantic-fix-for-deleting-pyc-files 
Don't delete *.pyc files in the .git directory
 2015-05-01 09:24:23 -04:00
Martyn James
c776272a8f Merge pull request #7654 from edx/mjames/SOL-280 
Index course information alongside courseware
 2015-04-30 23:27:17 -04:00
Ned Batchelder
72c0991005 Don't delete *.pyc fils in the .git directory 
If you have a branch named "remove-all-.pyc", the original code would
clobber it inside the .git directory, because branches become files with
the same name.  This prevents find from looking in .git, saving your
precious oddly named branches.
 2015-04-30 18:17:17 -04:00
Greg Price
c006befdaf Merge pull request #7767 from edx/gprice/discussion-api-topics 
Add discussion topic API
 2015-04-30 18:05:08 -04:00
Ben Patterson
5f0cd587fd Add bok-choy shards 4 and 5. When no shard is specified on a test, it 
will fall in 'shard 6'
 2015-04-30 17:34:24 -04:00
Will Daly
05baddb2a6 Add remember me checkbox back to the combined login/registration page 2015-04-30 17:13:03 -04:00
Adam
af3519ce15 Merge pull request #7835 from edx/release 
Release (DO NOT MERGE)
 2015-04-30 16:24:47 -04:00
Martyn James
b9f1c5db60 Index course information alongside courseware 
Conflicts:
	cms/djangoapps/contentstore/tests/test_courseware_index.py
 2015-04-30 16:05:57 -04:00
Greg Price
ebff94af3f Add discussion topic API 
This is the first stage of the new Discussion API.

JIRA: MA-604
 2015-04-30 14:25:05 -04:00
Sarina Canelake
22d818e0fb Merge pull request #7875 from edx/sarina/20150430-translations-update 
Update translations (autogenerated message)
 2015-04-30 11:59:24 -04:00
Sarina Canelake
78684903f6 Update translations (autogenerated message) 2015-04-30 11:58:39 -04:00
Ahsan Ulhaq
1e5cbbefe1 Merge pull request #7844 from edx/ahsan/AC-97-aria-describedby-broken-id-ref-sign-in-page 
aria-describedby has broken IDref on Sign in email form
 2015-04-30 11:04:49 -04:00
Ned Batchelder
6fd60f21b5 Merge pull request #7358 from edx/ned/add_dunder_init_files 
Add missing __init__.py files
 2015-04-30 10:50:49 -04:00
Christine Lytwynec
7982ad4e16 Merge pull request #7865 from edx/clytwynec/update-flaky-version 
update version of flaky to 2.0.3
 2015-04-30 10:02:28 -04:00
Ned Batchelder
3417672d56 Have to increase the pylint limit now that we examine more files 2015-04-30 09:58:40 -04:00
Awais Qureshi
e465733778 Merge pull request #7811 from edx/awais786/ECOM-1284-re-generate-certs 
ECOM-1284  enabling re-generate certs.
 2015-04-30 18:46:12 +05:00
David Baumgold
372e52bf08 Merge pull request #7792 from edx/commit-hash-for-django-settings-context-processor 
Set explicit git commit hash for django-settings-context-processor
 2015-04-30 09:33:21 -04:00
Ahsan Ulhaq
6d451ccd47 change three line structure to one line 2015-04-30 18:13:27 +05:00
Ahsan Ulhaq
3ec676e61b change indentaion and add new line 2015-04-30 18:13:27 +05:00
Ahsan Ulhaq
734ce5e2fb aria-describedby has broken IDref on Sign in email form 
AC-97
 2015-04-30 18:13:27 +05:00
Ned Batchelder
777be12ada Add missing __init__.py files 2015-04-30 07:43:08 -04:00
Awais
19ab698f4c ECOM-1284 enabling re-generate certs. 2015-04-30 14:15:33 +05:00
zubair-arbi
4d9781aaa7 Merge pull request #7813 from edx/zub/story/ecom-1477-verfication-model-add-itemid 
add location_id field for the Reverification XBlock in VerificationStatu...
 2015-04-30 11:27:22 +05:00
Christine Lytwynec
66c527a7ac update version of flaky to 2.0.3 2015-04-29 14:33:21 -04:00
Adam
f740bdbe84 Merge pull request #7853 from edx/hotfix/2015-04-29 
do garbage collection when dumping memory
 2015-04-29 14:32:16 -04:00
David Baumgold
6eaeddc347 Merge pull request #6712 from edx/update-pytz 
Update pytz to 2015.2
 2015-04-29 13:17:40 -04:00
David Baumgold
22804e4199 Use pytz-compatible versions of ora2 and ease 2015-04-29 12:17:29 -04:00
David Baumgold
3684c083f2 Update pytz to 2015.2 
pytz changed their versioning scheme from using letters to using
numbers. The old scheme is screwing up new versions of pip.
 2015-04-29 12:17:29 -04:00
Daniel Friedman
a19872a8ff Merge pull request #7863 from edx/dan-f/fix-typo 
Correct "shure" to "sure" in a comment
 2015-04-29 16:09:51 +00:00
Daniel Friedman
9e90ec5c0a Correct "shure" to "sure" in a comment 2015-04-29 16:05:43 +00:00
David Baumgold
b8bf9b927f Merge pull request #7861 from edx/db/fix-spelling 
Correct spelling in a comment
 2015-04-29 11:30:32 -04:00
David Baumgold
28c898c395 Correct spelling in a comment 2015-04-29 11:27:07 -04:00
Adam
bc499e3bdc Merge pull request #7725 from edx/adam/add-script-for-hotfix 
add script for generating commands needed for hotfix
 2015-04-29 11:24:57 -04:00
Adam Palay
41a66b521b fix typo in captions js (TNL-2076) 2015-04-29 11:02:26 -04:00
Adam Palay
ff82e5e42e do garbage collection when dumping memory 2015-04-29 10:40:53 -04:00
Will Daly
50e9b43512 Merge pull request #7826 from edx/will/update-reverification-flow-copy 
Update copy on reverification flow.
 2015-04-29 10:38:54 -04:00
Sarina Canelake
aed9ba8a38 Merge pull request #7818 from mcgachey/mcgachey-lti-render 
[LTI Provider] Wiring up LTI views to the courseware template
 2015-04-29 10:34:09 -04:00
Sarina Canelake
cd9ce147d0 Merge pull request #7831 from amir-qayyum-arbisoft/icon_in_set_date 
Fixed cross icon issue on set date dialog inside schedule tab
 2015-04-29 09:47:33 -04:00
zubair-arbi
da94aca522 add location_id field for the Reverification XBlock in VerificationStatus model 
ECOM-1477
 2015-04-29 18:41:30 +05:00
Ben Patterson
5a843b5b99 Pep8 should ignore pycharm-helpers files on folks' workstations/VMs. 
Project-root is the default location for these helper files, and they are being
examined as part of pep8 runs. This change will ensure they are ignored in this case.
 2015-04-29 08:39:45 -04:00
amir-qayyum-arbisoft
3e5e6065e4 fixed cross icon issue on set date dialog inside schedule tab 2015-04-29 15:28:21 +05:00
Ahsan Ulhaq
5a1d180f14 Merge pull request #7790 from edx/ahsan/AC-34-visually-hidden-contents-accessible-via-keyboard 
Visually hidden content accessible through keyboard
 2015-04-29 06:19:41 -04:00
Aamir
dc308d4f28 Merge pull request #7772 from edx/awais786/ECOM-1441-additional-methods 
ECOM-1441 additional methods for skip re-verification links.
 2015-04-29 14:13:10 +05:00