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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Price
b99dca987e Merge pull request #6131 from edx/gprice/fix-paver-test-js 
Fix paver test_js task to work without -p flag
 2014-12-03 16:58:18 -05:00
Akiva Leffert
66f41e1d9f Make static URLs absolute in handouts, updates, and about for mobile API 
JIRA: MA-147
 2014-12-03 16:25:48 -05:00
christopher lee
b89113e114 Revert "Make static URLs absolute in handouts, updates, and about for mobile API" 
This reverts commit fb6579abfdb6fc9fb8bc9233554ff5c6e9215659.
 2014-12-03 16:24:27 -05:00
Akiva Leffert
1088855d0b Make static URLs absolute in handouts, updates, and about for mobile API 
JIRA: MA-147
 2014-12-03 16:18:39 -05:00
Brian Talbot
8d947f0215 LMS: revising styling of calculator tooltip content 2014-12-03 16:09:07 -05:00
Brian Talbot
a9daaff17b LMS: revising semantic markup of calculator tooltip content 2014-12-03 16:08:33 -05:00
Calen Pennington
e01ffcc27e Merge pull request #6129 from cpennington/fewer-queries-in-field-data-cache 
Don't query for the user every time in FieldDataCache, just use the user_id instead
 2014-12-03 16:08:24 -05:00
stephensanchez
f993a48490 Only allow users who turned 13 before this year began to opt in. 2014-12-03 20:36:28 +00:00
Greg Price
bc41b65c18 Fix paver test_js task to work without -p flag 2014-12-03 14:55:18 -05:00
christopher lee
3c99912213 Merge branch 'release' 2014-12-03 14:46:40 -05:00
Ben Patterson
c09f0ea4c0 Merge pull request #6080 from edx/benp/find-deprecated-tracker 
Enforce pylint violation when using old event tracker.
 2014-12-03 14:03:58 -05:00
Christopher Lee
fd2891edc9 Merge pull request #6128 from edx/adam/fix-upgrade-text 
fix typo on course payment page (ECOM-714)
 2014-12-03 11:04:49 -05:00
Calen Pennington
14e6f3cc2b Don't query for the user every time in FieldDataCache, just use the user_id instead 2014-12-03 11:00:03 -05:00
Adam Palay
c0b87d87ab fix typo on course payment page (ECOM-714) 2014-12-03 10:52:34 -05:00
Will Daly
f0e6cdd3d7 Merge pull request #6110 from edx/will/email-opt-in-analytics 
Add management command to create the email opt-in list.
 2014-12-03 09:20:47 -05:00
Sarina Canelake
c74b05e978 Merge pull request #5917 from edx/sarina/fix-i18n 
Fix Solutions i18n issues
 2014-12-03 08:03:14 -05:00
Will Daly
f40447b3c8 If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page. 2014-12-03 08:00:33 -05:00
Will Daly
61ecae9871 Add management command to create the email opt-in list. 2014-12-03 07:54:38 -05:00
Brandon DeRosier
046e295322 Change has_course_access definition and doc string 
- has_course_access renamed to has_course_author_access for clarity
- Changed doc string to clearly state that it determines whether or not
  a user has write access to a course
 2014-12-02 22:08:58 -05:00
Sarina Canelake
dc972eb2d6 Add additional context for translators 2014-12-02 20:56:08 -05:00
Sarina Canelake
6539a6e0fc Keep closing lines of email together for translation purposes 2014-12-02 20:56:07 -05:00
Sarina Canelake
98b9fb09cd Fix dashboard i18n 2014-12-02 20:56:07 -05:00
Brandon DeRosier
bdc64a7c70 Moved has_course_access from CMS to student.auth (common) 2014-12-02 19:36:38 -05:00
Christine Lytwynec
97d357cd16 Merge pull request #6121 from edx/clytwynec/revert-not-editable-mode 
Revert "Do not install requirements from github.txt in editable mode"
 2014-12-02 17:01:13 -05:00
Will Daly
84301e7698 Merge pull request #6070 from edx/will/verified-messaging-per-course 
Student verification status
 2014-12-02 16:08:25 -05:00
Christine Lytwynec
d852bc9251 Revert "Do not install requirements from github.txt in editable mode" 
This reverts commit 61cf1d6edb.

Conflicts:
	requirements/edx/github.txt
 2014-12-02 15:52:53 -05:00
AlasdairSwan
500a33db58 Merge pull request #6115 from edx/alasdair/email-opt-out 
Added styles for email opt in/out checkbox label
 2014-12-02 14:27:20 -05:00
AlasdairSwan
96afb82dbd Added styles for email opt in/out checkbox label 2014-12-02 11:50:31 -05:00
Clinton Blackburn
46d5593201 Merge pull request #6105 from edx/clintonb/oidc-administrator-claim 
Added OAuth2 Permissions Scope Handler
 2014-12-02 11:11:15 -05:00
Clinton Blackburn
5a561f81d4 Added OAuth2 Permissions Scope Handler 
This scope offers a simple claim, administrator, that is true iff the user is a superuser.
 2014-12-02 11:08:44 -05:00
Jesse Zoldak
1cf9a3a0a0 Merge pull request #6112 from edx/zoldak/fix-pep8 
Fix pep8 violations in some tests
 2014-12-02 09:53:08 -05:00
Shrhawk
94d3d236fe Merge pull request #6113 from Shrhawk/shr/bug/TNL-590-encode-error-fixing-pep-8 
Remove extra line
 2014-12-02 19:49:19 +05:00
AlasdairSwan
962dc221d4 ECOM-677 ECOM-678 styled the new messages 2014-12-02 09:43:57 -05:00
Will Daly
464dfcfabc Show student verification status on the dashboard. 2014-12-02 09:42:24 -05:00
Jesse Zoldak
e26a0c4308 Fix pep8 violations in some tests 2014-12-02 09:39:23 -05:00
Syed Hassan Raza
9aff1d5718 Remove extra line 2014-12-02 19:37:09 +05:00
Jesse Zoldak
17379f4079 Merge pull request #6078 from edx/zoldak/modulestore-test-refactor 
Clean up all modulestore testcases
 2014-12-02 08:53:41 -05:00
Shrhawk
0f3bce02a0 Merge pull request #5888 from Shrhawk/shr/bug/TNL-590-encode-error 
Handle Unicode for Incoming Keys
 2014-12-02 17:53:47 +05:00
Jesse Zoldak
121b31309d Small fixes to modulestore test refactoring 2014-12-02 07:09:37 -05:00
Jesse Zoldak
bf3b87bc64 Clean up all modulestore testcases 
Move modulestore config for tests to an importable location
Disable pylnt warning for lms imports in common tests
Refactor all testcases that loaded all xml courses
TE-610
TE-489
 2014-12-02 07:09:36 -05:00
Jesse Zoldak
8c946f8b37 Merge pull request #6104 from edx/zoldak/heartbeat-mock-tests 
Mock the modulestore for the heartbeat tests
 2014-12-02 06:51:31 -05:00
Muhammad Ammar
927249bcdc Merge pull request #6085 from edx/ammar/update-advance-config 
Update AWS Configuration for ORA1 Problem Creation
 2014-12-02 15:35:57 +05:00
Jesse Zoldak
6f1bccd565 Mock the modulestore for the heartbeat tests 2014-12-01 20:18:08 -05:00
David Baumgold
9b241fe565 Merge pull request #6098 from edx/db/remove-unused-envs 
removed dev_ike and dev_shared_preview
 2014-12-01 18:51:33 -05:00
Renzo Lucioni
28186e233c Merge pull request #6062 from edx/renzo/email-opt-in 
Updating the marketing iframe, courseware views, and student views for email opt-in
 2014-12-01 17:22:49 -05:00
Renzo Lucioni
8961ec4f35 Update the student views to accept the email_opt_in parameter 
Includes tests checking that the student views integrate with the profile API as expected.
 2014-12-01 15:57:40 -05:00
Greg Price
7d6dd565db Merge pull request #6102 from edx/gprice/js-test-port 
Add paver option to specify js-test-tool port
 2014-12-01 15:43:35 -05:00
AlasdairSwan
142c38ed43 Merge pull request #6103 from edx/alasdair/ECOM-691-footer-updates 
ECOM-691 cleaned up spacing and updated title for about section
 2014-12-01 14:52:20 -05:00
David Baumgold
970a83d41e removed dev_ike and dev_shared_preview 2014-12-01 14:03:45 -05:00
Stephen Sanchez
de1c054187 Merge pull request #6079 from edx/sanchez/logistration-opt-in 
Hooking the logistration page into the new HTTP endpoint for email opt in
 2014-12-01 13:57:36 -05:00