Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,853 Commits 1 Branch 0 Tags
1c5e49fc36167ccbdd243f34aaa94e2c8e4c6b7c
Commit Graph

17853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Hansbrough
1c5e49fc36 Fixed duplicate ID attributes in registration & login (LMS-599, LMS-601( 2013-09-17 17:45:10 +00:00
Jay Zoldak
3717df2081 Merge pull request #1020 from edx/zoldak/acceptance-exception-handling 
Zoldak/acceptance exception handling
 2013-09-17 09:51:12 -07:00
Jay Zoldak
fe71ace529 Improve retry logic for Stale Element Exceptions 
Better exception retry logic

Change methods to lambdas
 2013-09-17 12:49:46 -04:00
Jason Bau
cd3063f67d Update CHANGELOG.rst 2013-09-17 08:55:44 -07:00
Jason Bau
41b6b4fc9a Update CHANGELOG.rst 2013-09-17 08:55:30 -07:00
Greg Price
15f620d37d Merge pull request #1003 from edx/gprice/fix-user-profile-links 
Fix a bug in links on forum user profile pages
 2013-09-17 08:26:39 -07:00
chrisndodge
d3dc9d27a8 Merge pull request #1017 from edx/fix/cdodge/parse-start-stop-times 
in XML deserializations, we can get get floats for start/stop times, so ...
 2013-09-17 08:09:51 -07:00
Diana Huang
d191847ff5 Merge branch 'release' 
Conflicts:
	lms/static/sass/views/_verification.scss
 2013-09-17 10:55:22 -04:00
Diana Huang
59c2898e8b Merge pull request #1015 from edx/ormsbee/audit_enroll 
Make sure audit enrollments are really marked audit.
 2013-09-17 07:43:31 -07:00
Chris Dodge
5886118afe in XML deserializations, we can get get floats for start/stop times, so we need to be able to parse those 
add test video with float-based end-time
 2013-09-17 10:38:21 -04:00
Greg Price
9e4b24daa2 Merge pull request #924 from edx/gprice/fix-forum-sidebar-overlap 
Fix forums nav sidebar overlapping content
 2013-09-17 07:22:40 -07:00
David Ormsbee
135f7e3b80 Make sure audit enrollments are really marked audit. 2013-09-17 10:16:22 -04:00
Calen Pennington
5ec6cd85f2 Merge pull request #929 from cpennington/remove-get-sample-state 
Remove unused XModuleDescriptor.get_sample_state method
 2013-09-17 07:01:30 -07:00
chrisndodge
0601761d27 Merge pull request #1000 from edx/fix/cdodge/courseware-index-perf-tweek 
Fix/cdodge/courseware index perf tweek
 2013-09-17 06:50:33 -07:00
Chris Dodge
1a5edcd998 we already have the descriptor, so call get_module_for_descriptor() rather than refecting that subtree which is multiple round-trips to DB 
fix line indents
 2013-09-17 08:15:00 -04:00
Sef Kloninger
45d24b9961 Merge pull request #1011 from edx/jbau/apache-wsgi-fix 
apache lms wsgi fix
 2013-09-16 22:04:37 -07:00
Jason Bau
36085a692d apache lms wsgi fix 2013-09-16 21:46:57 -07:00
Jason Bau
1742f445e0 Merge pull request #1009 from edx/jbau/revert/recent-ora-fixes 
Revert "4 OE/ORA UI fixes to make it easier to use"
 2013-09-16 21:45:56 -07:00
Jason Bau
706b386a57 Revert "4 OE/ORA UI fixes to make it easier to use" 
This reverts commit 3b29d6056e.
 2013-09-16 20:22:18 -07:00
ichuang
61d5c4efc5 Merge pull request #888 from edx/fix/ichuang/add-capital-greek-to-formulaequationinput 
formulaequationinput: add capital greek letters and hbar to calc preview
 2013-09-16 15:04:24 -07:00
ichuang
ab203fb649 hbar only add once 2013-09-16 17:37:56 -04:00
Jay Zoldak
cbbfc41cb0 Merge pull request #995 from edx/zoldak/fix-acceptance 
Simplify retry logic for ui helper functions
 2013-09-16 14:30:58 -07:00
Brian Talbot
259d3124c0 Merge pull request #990 from edx/talbs/verification-sassplaceholders 
Verification: Switch class-based Sass @extend rules to use Sass placeholder syntax
 2013-09-16 13:50:48 -07:00
Jay Zoldak
30b13d3cf1 Improve code clarity and error messages for css selection 2013-09-16 16:49:18 -04:00
Jay Zoldak
2ff056df8c Simplify retry logic for ui helper functions 2013-09-16 16:49:17 -04:00
Jay Zoldak
50f190c55d Merge pull request #1004 from edx/zoldak/skip-cert-tests 
Skip verified cert acceptance tests that upload to s3
 2013-09-16 13:46:26 -07:00
Brian Talbot
c101465fe9 Verification: converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax 2013-09-16 16:18:51 -04:00
Jay Zoldak
6531918af5 Skip verified cert acceptance tests that upload to s3 2013-09-16 16:11:21 -04:00
Greg Price
6296e2dc19 Fix a bug in links on forum user profile pages 
Previously, if a course id contained a '-' character, links from that
page to threads would lead to 404s.
 2013-09-16 15:32:56 -04:00
Diana Huang
cf8b7c6e92 Merge pull request #996 from edx/hotfix-2013-09-16 
Hotfix 2013-09-16
 2013-09-16 12:27:40 -07:00
David Ormsbee
b7836c94d4 Merge pull request #999 from edx/ormsbee/ssl_checking_for_ss 
Handle self-signed cert from Software Secure
 2013-09-16 11:39:46 -07:00
David Ormsbee
4245c229d8 Don't verify SSL cert when submitting to Software Secure (they're using self-signed cert for the moment). 2013-09-16 14:21:03 -04:00
caesar2164
54f103dd45 Merge pull request #993 from edx/giulio/ORA-fixes-squash 
4 OE/ORA UI fixes to make it easier to use
 2013-09-16 11:14:42 -07:00
Brian Talbot
ff492697a9 Merge pull request #998 from edx/talbs/verification-copytweaks 
Verification: Copy/Light UI Pre-Launch Edits
 2013-09-16 11:13:50 -07:00
Brian Talbot
e1d62cb395 Verification: further revises copy per edits/typos noted 2013-09-16 14:13:14 -04:00
Brian Talbot
d600e437d6 Verification: hiding technical help copy when on requirements/prep view 2013-09-16 13:36:03 -04:00
Brian Talbot
c1134acf05 Verification: revises copy and layout of the review step's confirm/next actions UI 2013-09-16 13:36:03 -04:00
Brian Talbot
2680f8dfcc Verification: further revises webcam support w/in browser settings copy 2013-09-16 13:36:03 -04:00
Brian Talbot
9e88be9af1 Verification: removes duplicate course start on receipt view 2013-09-16 13:36:02 -04:00
Brian Talbot
882df8d319 Verification: adds in browser support links, icon-based button help tips, and technical support help info 2013-09-16 13:36:02 -04:00
Brian Talbot
0c61f194de Verification: revises fee/honor code option-based copy 2013-09-16 13:36:02 -04:00
Giulio Gratta
3b29d6056e 4 OE/ORA UI fixes to make it easier to use 
- require confirmation when clicking Open Ended reset button
- require confirmation when submitting Open Ended essay
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
 2013-09-16 10:27:13 -07:00
Will Daly
1c3c9217bd Merge pull request #997 from edx/will/disable-broken-test 
Disabled broken test in master.
 2013-09-16 09:35:00 -07:00
Will Daly
adabef7256 Disabled broken test in master. 2013-09-16 11:32:24 -04:00
Brian Talbot
91f9338e06 Merge pull request #982 from edx/talbs/fix-lms-header 
LMS: FIX - Header Logo and Global Nav Styling
 2013-09-16 07:35:20 -07:00
David Ormsbee
646673ba18 Merge pull request #994 from edx/ormsbee/ss_msg_signing2 
Software Secure message signing pt. 2
 2013-09-16 07:29:29 -07:00
jkarni
fb363fb90b Merge pull request #919 from edx/jkarni/fix/keep-comments 
Make default parser keep comments
 2013-09-16 07:26:44 -07:00
David Ormsbee
99841be604 Update docstring on ssencrypt.body_string to be more useful. 2013-09-16 10:23:31 -04:00
David Ormsbee
ab6018a0e5 Replace signature validation with access-key and add logging around Software Secure callbacks. 2013-09-16 10:07:07 -04:00
David Ormsbee
b1be80b848 Extend message signing code to work with dicts, lists. 2013-09-16 10:07:07 -04:00