Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,871 Commits 1 Branch 0 Tags
40deaa509ee4e4ef05d155884a72aee8ec38b2fd
Commit Graph

20871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
40deaa509e Clean up strings in the ErrorModule 2014-02-03 11:56:10 -05:00
Will Daly
cac57a5110 Merge pull request #2420 from edx/will/fix-sure-install-failure 
Pinned version of sure library
 2014-02-02 15:50:03 -08:00
Will Daly
89c029d281 Pinned version of sure library 2014-02-02 18:17:45 -05:00
Will Daly
e70ff435fa Merge pull request #2411 from edx/will/fix-docs-build 
Added sphinx_rtd_theme to requirements
 2014-02-02 15:03:01 -08:00
Will Daly
577c77f080 Added sphinx_rtd_theme to requirements 2014-02-01 14:34:24 -05:00
Mark Hoeber
01c9db10b8 Merge pull request #2409 from edx/markhoeber/documentation/fix-data-config 
Markhoeber/documentation/fix data config
 2014-02-01 07:00:11 -08:00
Mark Hoeber
390c93c637 removed imports 2014-02-01 09:57:20 -05:00
Mark Hoeber
b26983f0b3 Fixed config file 2014-02-01 09:53:05 -05:00
Mark Hoeber
8ac32e8691 Merge pull request #2407 from edx/markhoeber/documentation/combineopenended 
Added combineopenended statuses
 2014-02-01 06:31:34 -08:00
Mark Hoeber
2cb2e2c52a Added combineopenended statuses 
cleaned up config file as well
 2014-02-01 09:30:35 -05:00
Jason Bau
51e6d5fb68 Merge pull request #2386 from edx/jbau/fix-title-stanford-theme 
fix main.html template -- <title> was eating everything
 2014-01-31 16:31:12 -08:00
Sarina Canelake
77ac415840 Merge pull request #2398 from edx/sarina/improve-translator-docs 
Improve i18n translator documentation
 2014-01-31 16:03:00 -08:00
Sarina Canelake
41b665d7eb Improve i18n translator documentation 2014-01-31 18:59:20 -05:00
Giulio Gratta
a7048f92a0 Merge pull request #2394 from edx/giulio/highlight-notification-checkbox 
Make notification checkbox more obvious
 2014-01-31 15:00:09 -08:00
Julia Hansbrough
cac83948b1 Merge pull request #2156 from edx/flowerhack/feature/basic-reverify-flow 
Follow-On Verification
 2014-01-31 14:51:16 -08:00
Giulio Gratta
90e9938e66 Make notification checkbox more obvious 
- Clarify checkbox description wording
- Wrap checkbox and envelope icon in div to make it stand out
- Added styling for wrapper div
- Wrap label element around div to allow clicking the envelope to activate the checkbox
- Indented HTML and fixed if wrapping issue
 2014-01-31 14:37:44 -08:00
Julia Hansbrough
17869c5eee Midcourse reverification: i18n fixes 
Fixed i18n in templates
 2014-01-31 22:20:33 +00:00
Julia Hansbrough
e50ef39bee Midcourse reverification: Events 2014-01-31 22:20:33 +00:00
Frances Botsford
63a22ad0e5 PR review changes for LMS reverification 2014-01-31 22:20:32 +00:00
Julia Hansbrough
69b5b033fd Midcourse reverifications: dismissal banner 
Added a banner that students can use to dismiss the "you have failed reverification" message.  Also, removed unused code, wired up the sidebar for design
 2014-01-31 22:20:32 +00:00
Jay Zoldak
c01ea9020c Merge pull request #2400 from edx/zoldak/unicode-fixes-release 
Make code safe for unicode course ids
 2014-01-31 14:16:18 -08:00
Frances Botsford
436a1ec7f6 downstairs fixxup on lms reverification 2014-01-31 22:11:57 +00:00
Julia Hansbrough
3aa80654cb Midcourse reverification: fixing broken tests 
Also, refactored code representing ReverifyInfo
 2014-01-31 22:08:09 +00:00
Frances Botsford
86588c492b added notification styles for re-verification and general on LMS 2014-01-31 22:08:09 +00:00
Julia Hansbrough
3e1519c62a Midcourse reverification: increased quality 
Also, removed an unused template
 2014-01-31 22:08:09 +00:00
Frances Botsford
5aea466093 styling complete on reverify dash 2014-01-31 22:08:08 +00:00
Julia Hansbrough
0b7594178b Moved reverification windows into common 
Added verification sidebar, banner for major courseware sections, quality & test improvements
 2014-01-31 22:08:08 +00:00
Frances Botsford
003d82345f adjusting style and html for re-verification on lms 2014-01-31 22:06:37 +00:00
Julia Hansbrough
bf210398e6 Tests and cleanup 
Improved tests, fixed javascript for photocapture, removed extraneous photocapture code, added time & course numbers to templates for design
 2014-01-31 21:48:36 +00:00
Frances Botsford
6c7d715e0e re-verification dashboard styles 2014-01-31 21:48:35 +00:00
Jay Zoldak
9c4a9d8f64 Make code safe for unicode course ids 2014-01-31 16:35:56 -05:00
Julia Hansbrough
85030467ed Skeleton for follow-on verification behavior 
Quick-and-dirty end-to-end flow, functional for at least the case of one course in need of re-verification.

Ready for design to start taking a look; still needs tests and code cleanup
 2014-01-31 21:08:24 +00:00
Ned Batchelder
65997d0f6e Merge pull request #2288 from jazkarta/pluggable-mako-templates 
Make mako template lookups pluggable.
 2014-01-31 12:28:35 -08:00
David Baumgold
7fd63801f2 Merge pull request #2395 from edx/db/translate-tooltips 
translate component tooltips
 2014-01-31 11:58:15 -08:00
David Baumgold
aa105d7a58 translate component tooltips 2014-01-31 14:17:22 -05:00
David Baumgold
597474955b tabs to spaces 2014-01-31 14:15:44 -05:00
Chris Rossi
0a1ed11daa Make mako template lookups pluggable. 
This code adds the ability to add Mako template lookup directories on
the fly, allowing third party add-ons to contribute their own Mako templates.
A new API function for registering Mako templates is introduced::

    from edxmako import add_lookup

    add_lookup('main', '/path/to/templates')

    # Or, specify a package to lookup using pkg_resources.  This will
    # add the 'templates' directory inside the current package:
    add_lookup('main', 'templates', package=__name__)
 2014-01-31 13:55:36 -05:00
srpearce
b95d71ff46 Merge pull request #2390 from edx/markhoeber/documentation/google-hangouts 
Markhoeber/documentation/google hangouts
 2014-01-31 10:51:15 -08:00
Sylvia Pearce
5df7a62b42 Correct a few typos 2014-01-31 13:49:46 -05:00
Will Daly
73cc15fce5 Merge pull request #2389 from edx/will/stabilize-ora-ai-test 
Increase timeout for ORA get feedback promise in bok-choy test.
 2014-01-31 08:11:09 -08:00
David Baumgold
437a389d3c Merge pull request #2378 from glowe/fix-testing-document-link 
Fix link to testing document.
 2014-01-31 08:02:41 -08:00
frances botsford
c938c0adfa Merge pull request #2369 from tusbar/tabindex-login 
Prevent from tabbing on lostpassword link in login page
 2014-01-31 07:46:04 -08:00
Jay Zoldak
9cfd649c08 Merge pull request #2137 from abdoosh00/feature/unicode 
Unicode changes to support R to L script
 2014-01-31 06:48:01 -08:00
Mark Hoeber
48d2b20fdd New chapter for instant hangouts 2014-01-31 09:46:12 -05:00
Will Daly
a8a96d3a44 Increase timeout for ORA get feedback promise in bok-choy test. 2014-01-31 09:11:31 -05:00
chrisndodge
7dbec60829 Merge pull request #2384 from edx/chrisndodge/wire-in-aws-settings 
wire in env settings into aws.py for session inactivity timeouts
 2014-01-31 04:00:57 -08:00
Usman Khalid
6b346a30de Merge pull request #2275 from edx/usman/lms1494-progress-page-value-errors 
For capa modules if weight is 0 don't try to create Progress objects.
 2014-01-31 02:18:16 -08:00
Usman Khalid
ef07e1ed15 For capa if weight is 0 don't try to create Progress objects. 
LMS-1494
 2014-01-31 14:30:51 +05:00
Ned Batchelder
593e8d23db Merge pull request #2385 from edx/ned/fix-pathological-po-growth 
Fix pathological po growth
 2014-01-30 19:45:51 -08:00
Jason Bau
7399d5171f get rid of the <title> conditional altogether 2014-01-30 17:33:42 -08:00