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
Carson Gee
681b9a5ea7
Remove anonymous caching when SSL is enabled
2015-04-30 10:50:19 -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
zubair-arbi
9edec96fb8
update django admin for 'verify_student' app
2015-04-30 18:02:24 +05:00
Ned Batchelder
777be12ada
Add missing __init__.py files
2015-04-30 07:43:08 -04:00
zubair-arbi
96d4a895f0
add 'get_attempts' method for 'ReverificationService'
2015-04-30 15:50:12 +05: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
Christine Lytwynec
a78743acfb
rename string formatting variable
2015-04-29 14:12:55 -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
Awais Jibran
6e6aa036e7
Switching between discussion threads take focus to bottom of the page.
...
TNL-1530
2015-04-29 20:28:52 +05: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
Awais
860467e7d2
ECOM-1441 additional methods for skip re-verification links.
2015-04-29 12:17:15 +05:00
Matt Drayer
7b3bcef155
Merge pull request #7820 from edx/mattdrayer/SOL-475
...
Fix for SOL-475 (double exam grader bug)
2015-04-28 16:24:07 -04:00
Calen Pennington
a1c0773c4d
Move entry_point down into XModule/XModuleDescriptor so that 'xmodule.v1' only applies to XModules, not pure XBlocks with the XModuleMixin
2015-04-28 15:33:04 -04:00
Akiva Leffert
d7d60bc563
Merge pull request #7837 from edx/aleffert/structure-indentation
...
Fix indentation for course structure API example
2015-04-28 15:24:43 -04:00
Christine Lytwynec
9b8062020b
set unique dirs for test reports
2015-04-28 14:59:35 -04:00
Chris
d9e13d22b8
Merge pull request #7763 from edx/clrux/sequence-nav-button-icons
...
Changing sequence nav buttons from images to icon fonts
2015-04-28 14:05:38 -04:00
Akiva Leffert
f6401c1640
Fix indentation for course structure API example
2015-04-28 13:56:40 -04:00
Matt Drayer
c6ecf2551e
Fix for SOL-475 (double exam grader bug)
...
- Remove grader(s) upon deletion of existing entrance exam
- Remove grader(s) upon addition of new entrance exam
2015-04-28 12:49:03 -04:00
Sarina Canelake
6eda3ef758
Merge pull request #7672 from edx/feanil/new_mailchimp_sync
...
Update Mailchimp sync scripts to be within platform
2015-04-28 11:55:23 -04:00
Chris Rodriguez
74ce5cbb87
Changing sequence nav buttons from images to icon fonts
2015-04-28 11:04:16 -04:00
Phil McGachey
854c9637f1
[LTI Provider] Addressing review comments
2015-04-28 10:35:44 -04:00
