Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
Julia Hansbrough
891465d1b0 Fixed 500ing CSV reports 2014-02-04 16:38:08 +00:00
Carson Gee
8cbe263ca0 Rename of feature AUTH_USE_MIT_CERTIFICATES to AUTH_USE_CERTIFICATES across platform. 
Caution! This is backwards incompatible
 2014-02-04 10:50:48 -05:00
Bertrand Marron
b758c89e4a Prepend theme template paths 
Allow templates override.
 2014-02-04 16:18:04 +01:00
John Jarvis
d279dff9c9 fixing syntax 2014-02-04 09:26:25 -05:00
John Jarvis
442abde030 adding DB_MIGRATION_ENGINE and fixing defaults 2014-02-04 09:24:49 -05:00
John Jarvis
3fe701c037 check for None so an empty string is valid for a password 2014-02-04 09:11:48 -05:00
Calen Pennington
49217ebe8b Allow multiple client-side runtimes on a single page 
Make XBlock client-side runtimes proper classes, so that handlerUrl can
be defined in a per-runtime way, and we can have multiple runtimes on a
single page.

[LMS-1630][LMS-1421][LMS-1517]
 2014-02-04 08:55:36 -05:00
Jason Bau
7ac13bf81e Don't show course start date if it hasn't been set. 
If neither start nor advertised_start has been changed from default
don't show the course start date.

This allows us to accept course registrations for courses whose start
date is yet TBD.
 2014-02-03 16:20:39 -08:00
Dave St.Germain
0f8919a6ba Merge pull request #2441 from edx/dcs/info-remove-title 
Removed extraneous title block that was replacing the breadcrumbs
 2014-02-03 14:28:56 -08:00
Julia Hansbrough
5f325a4b89 Merge pull request #2447 from edx/flowerhack/fix/update-language-settings 
Removed LANGUAGE from devstack settings
 2014-02-03 14:22:25 -08:00
John Jarvis
d28f2f5905 adding check back in 2014-02-03 16:54:54 -05:00
Giulio Gratta
a76e5bd6e2 Merge pull request #2442 from edx/giulio/fix-disabled-about-page-button 
fixing layout/style of disabled register button
 2014-02-03 13:45:44 -08:00
Julia Hansbrough
cd95469b18 Removed LANGUAGE from devstack settings 2014-02-03 21:44:04 +00:00
John Jarvis
693497673a remove check for PASS 2014-02-03 16:42:22 -05:00
Feanil Patel
5e5c59cab2 Merge remote-tracking branch 'origin/release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml.py

Took the changes that were on the release branch.
 2014-02-03 16:39:40 -05:00
Giulio Gratta
1e1826af18 fixing layout/style of disabled register button 2014-02-03 13:17:15 -08:00
Giulio Gratta
5a722b9048 Merge pull request #2436 from edx/giulio/add-og-info-about-pages 
Add OG title and description to course about pages
 2014-02-03 13:02:21 -08:00
Giulio Gratta
879a849eea Add OG title and description to course about pages 2014-02-03 12:36:43 -08:00
Dave St.Germain
ac8eeac798 Removed extraneous title block that was replacing the breadcrumbs 2014-02-03 15:22:25 -05:00
Calen Pennington
a3146cd7aa Merge pull request #2388 from cpennington/initial-languages 
Add initial languages, ready for dark-launch
 2014-02-03 11:52:32 -08:00
John Jarvis
ff7810d777 adding db overrides to aws_migrate.py 2014-02-03 14:49:41 -05:00
jsa
95b87f0683 Allow new response pagination parameters to pass through thread model. 
JIRA: FOR-374
 2014-02-03 13:41:48 -05:00
Calen Pennington
f5ffc94d16 Prep for initial language release 2014-02-03 13:35:56 -05:00
Jay Zoldak
7e075eece1 Merge pull request #2433 from edx/zoldak/fix-tests-unicode 
Mark strings that were causing test failures as unicode
 2014-02-03 10:23:00 -08:00
Adam
f48a456b8c Merge pull request #2429 from edx/adam/fix/login-i18n 
i18n input field on login page (LMS-2159)
 2014-02-03 10:01:22 -08:00
Jay Zoldak
5ab0c9adb5 Mark strings that were causing test failures as unicode 2014-02-03 12:52:45 -05:00
Greg Price
4e1c595472 Merge pull request #2377 from edx/gprice/forum-thread-pagination 
Add pagination of responses to forum threads
 2014-02-03 08:55:20 -08:00
Adam Palay
ca7faaa715 i18n input field on login page (LMS-2159) 2014-02-03 11:21:19 -05:00
Will Daly
eae4adeb9b Merge pull request #2361 from edx/will/bok-choy-upgrade-and-lms-tests 
Bok-choy upgrade, LMS tests, cleanup
 2014-02-03 08:11:03 -08:00
Bertrand Marron
6379ee921a Add '' default to bodyclass in courseware templates 
This prevents from having a 'None' CSS class in the <body> tag when no
css_class is defined for the course.
 2014-02-01 16:18:51 +01:00
Ned Batchelder
ddf377cfb9 Remove unused massemail commands. 2014-02-01 07:41:16 -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
Greg Price
062025eeec Add pagination of repsonses to forum threads 
Users will first be shown the first 25 responses of a viewed thread and
then have the option of loading 100 more at a time until all responses
have been loaded. This mitigates the performance impact of very large
threads by avoiding the need to render and transfer over the network
all content of a large thread at once. It will also allow students with
slower browsers to interact with large threads even if they cannot load
all of the responses.
 2014-01-31 18:17:04 -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
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