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

29395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zia Fazal
cc04bb990e Add new gating logic to restrict users from accessing courseware when an entrance exam is required 
- added entrance exam check on course info
- staff can by pass gating and added tests
- refined gating logic
- changes after rebasing with Asad's branch
- check ENTRANCE_EXAMS feature is enabled
- updated test to reflect new logic
- catering anonymous user in entrance exam permission
- fixed broken tests
- change after feedback on 16/3
- fix for a broken test
- created new entrance_exams module
- fixed quality error and improved test coverage
- put get_required_content back in milestones helper
- Refactored entrance exams logic
- Refactored tabs logic
- Fixed broken unit test
- changes after feedback from dan-f on 3/27
- removed unnecessary user.is_anonymous check
- Addressed PR feedback
- Addressed commit-specific feedback
- Rework guard clauses
- Add coverage for course info case
 2015-03-31 12:12:04 -04:00
Sarina Canelake
092c86e097 Merge pull request #7520 from louyihua/fix-studio-name 
Fix two missing replacements of {studio_name}
 2015-03-31 10:40:58 -04:00
louyihua
2c75b5d725 Fix two missing replacements of {studio_name} 
Located in ```howitworks.html``` and ```import.html```.
 2015-03-31 13:04:54 +08:00
frances botsford
10d58d3644 Merge pull request #7507 from edx/frances/base-gray-a11y 
Make LMS base gray AA compliant
 2015-03-30 17:20:17 -04:00
Calen Pennington
9ec94cf3d2 Merge pull request #7504 from cpennington/xblock-duration-histogram 
Record durations of xblock views and handlers
 2015-03-30 14:28:00 -04:00
Calen Pennington
b6e1e25b93 Record durations of xblock views and handlers 2015-03-30 12:10:32 -04:00
Martyn James
2e380c7110 Merge pull request #7435 from edx/mjames/SOL-499 
Update course_publish event actions - Logged SOL-611 for follow up work
 2015-03-30 11:32:33 -04:00
Sarina Canelake
13b43a96ff Merge pull request #7513 from johnespinosa/patch-2 
Add John Espinosa to AUTHORS
 2015-03-30 10:25:56 -04:00
Sarina Canelake
f6a70d4924 Merge pull request #7511 from louyihua/fix-studio-name 
Fix error when STUDIO_NAME uses non-ascii characters
 2015-03-30 10:25:31 -04:00
Christine Lytwynec
41d7d52bc6 Merge pull request #7515 from edx/clytwynec/lms-onload-beacon 
Fix code comment showing in rendered page
 2015-03-30 10:03:22 -04:00
Sarina Canelake
f0fa88bea0 Merge pull request #7514 from edx/sarina/20150330-update-translations 
Update translations (autogenerated message)
 2015-03-30 09:10:10 -04:00
Sarina Canelake
5a04a38106 Update translations (autogenerated message) 2015-03-30 09:09:31 -04:00
Christine Lytwynec
b33edbc060 Fix code comment showing in rendered page 2015-03-30 09:05:28 -04:00
Waqas Khalid
01bdfb125e Merge pull request #7403 from edx/waqas/tnl1717-discussion-404 
View discussion of user profile return 404
 2015-03-30 14:36:25 +05:00
johnespinosa
f5b7dd3dd1 Add John Espinosa to AUTHORS 
Added Myself To The Authors List
 2015-03-30 05:35:03 +02:00
louyihua
9d3b65282e Fix error when STUDIO_NAME uses non-ascii characters 
The replacement strings need to be unicode, so that when STUDIO_NAME contains non-ascii characters python can handle it correctly without raising exceptions.
Also, the value of STUDIO_SHORT_NAME can be read from cms.env.json.
 2015-03-28 21:47:59 +08:00
Adam
dad4b673e2 Merge pull request #7505 from edx/release 
Release
 2015-03-27 16:46:33 -04:00
chrisndodge
f441671ca0 Merge pull request #7428 from stvstnfrd/env/course/display 
Override COURSE_*_VISIBILITY_PERMISSION from ENV_TOKENS
 2015-03-27 16:41:42 -04:00
Christine Lytwynec
4d6c47c456 Merge pull request #7503 from edx/clytwynec/lms-onload-beacon 
onload performance beacon for LMS pages
 2015-03-27 16:28:30 -04:00
Frances Botsford
72e9b82480 make base gray AA compliant 2015-03-27 16:20:04 -04:00
Martyn James
70819203f8 Merge pull request #7443 from edx/mjevtic/SOL-336 
Fixed flaky test(s) - SOL-336 - merging updates
 2015-03-27 14:58:25 -04:00
Sarina Canelake
68ba17867f Merge pull request #7496 from open-craft/studio-display-name-consistency 
Consistently use display_name_with_default in Studio
 2015-03-27 14:57:22 -04:00
Adam
0c31da2a15 Merge pull request #7501 from edx/hotfix/2015-03-27 
update ORA2 to fix TNL-1758
 2015-03-27 14:33:35 -04:00
Ned Batchelder
33361a05e4 Merge pull request #7490 from edx/ned/dont-put-test-data-in-working-tree 
Don't use the working tree as storage for test-created files.
 2015-03-27 11:30:04 -04:00
Christine Lytwynec
06b3110ea0 onload performance beacon for LMS pages 2015-03-27 11:08:25 -04:00
Clinton Blackburn
9a8ecc65a7 Removed invalid kwarg 2015-03-27 10:37:04 -04:00
Adam Palay
cb9c89e168 update ORA2 to fix TNL-1758 2015-03-27 10:35:46 -04:00
marjev
29bceffcea Fixed flaky test(s) - (SOL-336) 2015-03-27 14:48:36 +01:00
John Eskew
c5e198f754 Merge pull request #7469 from edx/jeskew/datadog_events_vs_compat 
Squashed and tests passed - merging.
 2015-03-26 17:19:00 -04:00
Braden MacDonald
19bd7005e6 Consistently use display_name_with_default in Studio 2015-03-26 13:24:11 -07:00
John Eskew
34adb256a6 Add datadog counters everywhere a "VS[compat]" comment exists. 
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
 2015-03-26 16:18:15 -04:00
Ben Patterson
5615f0bfed Merge pull request #7494 from edx/benp/flag-cohort-test-flaky 
Fix empty promise. It was always evaluating to true.
 2015-03-26 13:55:04 -04:00
Christopher Lee
4423510807 Merge pull request #7480 from edx/clee/MA-169_MA-77 
Clee/ma 169 ma 77
 2015-03-26 13:31:49 -04:00
Adam
c2dcbd70d1 Merge pull request #7492 from edx/release 
Release
 2015-03-26 12:56:41 -04:00
christopher lee
e8dfac091b MA-77 Auto VAL clone course 
MA-77 Automatically adds the course id to the videos in VAL
when a course is rerun.
 2015-03-26 12:36:43 -04:00
Ben Patterson
93068e0a36 Merge pull request #7439 from edx/benp/add-markdown-tests 
Benp/add markdown tests
 2015-03-26 12:28:47 -04:00
Ben Patterson
dae5cdfceb Fix empty promise. It was always evaluating to true. 
This addresses TNL-1808 (and likely other flaky tests
in this area).
 2015-03-26 12:27:30 -04:00
David Baumgold
c856b6dc64 Merge pull request #7457 from edx/db/openedx-logo-on-edx.org 
"Powered by Open edX" logo on edx.org footer
 2015-03-26 11:44:01 -04:00
Adam
a374419079 Merge pull request #7489 from edx/hotfix/2015-03-26 
default discussion modules' discussion_id field to xblock's UNIQUE_FIELD...
 2015-03-26 11:38:46 -04:00
Ben Patterson
b03c4eca63 Opening wiki editor should be extracted into a method. 2015-03-26 11:05:55 -04:00
Ben Patterson
6e2e40cc14 Add course wiki acceptance tests. 2015-03-26 11:05:55 -04:00
Sarina Canelake
d66bb883ac Fix footer stylings for RTL 2015-03-26 10:15:51 -04:00
Brian Talbot
67168869f5 Adjust styling for Open edX footer details 2015-03-26 10:15:51 -04:00
David Baumgold
8abfe4a850 Put Open edX logo in CMS footer 2015-03-26 10:14:37 -04:00
David Baumgold
89252ec12d Put Open edX logo in LMS edx.org footer 2015-03-26 10:14:37 -04:00
Ned Batchelder
84f6e11830 Don't use the working tree as storage for test-created files. 2015-03-26 09:38:09 -04:00
Christine Lytwynec
9edda95096 Merge pull request #7481 from edx/clytwynec/flaky-mathjax 
update bokchoy with fix for TNL-1770
 2015-03-26 08:57:11 -04:00
Adam Palay
43abe399f1 default discussion modules' discussion_id field to xblock's UNIQUE_FIELD (TNL-1771) 2015-03-26 08:49:21 -04:00
Christine Lytwynec
3a8716a36f update bokchoy with fix for TNL-1770 2015-03-25 17:02:10 -04:00
David Baumgold
609b114443 Merge pull request #7475 from edx/adjust-indentation 
Fix whitespace
 2015-03-25 15:58:01 -04:00