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

25762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lduarte1991
bb4cfaba03 Annotation Tools: Adding Try-Catch for anonyous_student_id issue in staging 
- changed message and added i18n
 2014-09-17 13:00:37 -04:00
chrisndodge
3943bbd7e9 Merge pull request #5260 from edx/cdodge/remove-edx-footer-for-microsites 
For microsites, since we don't have a footer override yet for django tem...
 2014-09-17 12:07:37 -04:00
Chris Dodge
8e1d0f7f23 For microsites, since we don't have a footer override yet for django templates, remove the footer all together 2014-09-17 10:52:04 -04:00
Ned Batchelder
2d05ffacdf Revert "username and email request for lti module" 
This reverts commit 3f159ea52b.
 2014-09-17 07:24:52 -04:00
John Eskew
d1d3a69e62 Merge pull request #5252 from edx/adam/fix-wiki-footer 
Merging.
 2014-09-17 07:23:54 -04:00
Adam Palay
d4b6780751 rename footer files for wiki 2014-09-16 16:28:16 -04:00
Jim Abramson
32a45e1978 Merge pull request #5227 from edx/jsa/tnl153 
allow TAs to select the cohort of new posts.
 2014-09-16 12:46:13 -04:00
jsa
eef28a4f25 allow TAs to select the cohort of new posts. 
TNL-153
 2014-09-16 12:44:41 -04:00
chrisndodge
7593ad3a01 Merge pull request #5050 from edx/muhhshoaib/Ex-74-registration-code-redemption 
Ex-74 Registration Code redemption
 2014-09-16 11:58:42 -04:00
Piotr Mitros
5b61a53439 Merge pull request #5215 from edx/pmitros/pyfilesystem-vpc-fixup 
Pyfilesystem fix for AWS. pyfs has broken logic which did not work with AWS roles-based auth. This removes that logic.
 2014-09-16 11:44:35 -04:00
Jesse Zoldak
f31768b690 Merge pull request #5207 from edx/waheed/tnl284-fix-flaky-test 
Fixed bok choy flaky test for studio.
 2014-09-16 11:41:13 -04:00
chrisndodge
9d683ed171 Merge pull request #5245 from edx/asadiqbal08/Fix_production_issue 
EX-81 / Ex-84 changes
 2014-09-16 11:17:40 -04:00
Sarina Canelake
8f6eedec3f Merge pull request #5247 from edx/sarina/09162014-translation-update 
Update translations (autogenerated message)
 2014-09-16 10:56:19 -04:00
Sarina Canelake
b618516dc1 Update translations (autogenerated message) 2014-09-16 10:54:09 -04:00
Piotr Mitros
98ef21a9cb Pyfilesystem fix for AWS 2014-09-16 09:45:42 -04:00
asadiqbal08
47cd0f3e62 EX-81 / Ex-84 changes 2014-09-16 18:43:48 +05:00
Don Mitchell
651ee94515 Merge pull request #5232 from edx/split/asset_charset 
Update github for asset char
 2014-09-16 09:40:06 -04:00
Don Mitchell
6a26e9c186 Update github for asset char 
LMS-11380
 2014-09-16 09:05:38 -04:00
Ben Patterson
b7b4760074 Merge pull request #5175 from edx/benp/solano2-jstest-failure 
TE-468 JS test: Use the correct array for validating onSeek logs
 2014-09-16 08:09:41 -04:00
Waheed Ahmed
8efa9daec1 Fixed bok choy flaky test for studio. 
TNL-284
 2014-09-16 16:04:08 +05:00
Muhammad Shoaib
739d2f0906 Ex-74 Registration Code redemption 
fix the translation issues

added a check if a user is already registered in a course. Changed the messages

added course depth=0 and removed pep8 violations
 2014-09-16 07:48:21 +00:00
chrisndodge
23531e8966 Merge pull request #5220 from edx/cdodge/dont-redirect-to-dashboard-when-having-and-empty-dashboard 
only redirect to dashboard if user has course enrollments, otherwise rem...
 2014-09-15 22:06:13 -04:00
Mark Hoeber
c6bbae3903 Merge pull request #5126 from edx/markhoeber-doc408 
Updated Files & Uploads template help
 2014-09-15 22:03:11 -04:00
Chris Dodge
50cdd2b087 only redirect to dashboard if user has course enrollments, otherwise remain on the course catalog page (aka homepage or root) 
update lettuce test to match new expected behavior

add Jason's feedback

only apply new redirect logic for microsites

switch to use a feature flag to determine whether to support redirect behavior
 2014-09-15 20:52:44 -04:00
Mark Hoeber
77311e03c9 Updated Files & Uploads template help 
To include size warning of 10 MB.  Also updated styling on existing learn more
links
 2014-09-15 20:14:33 -04:00
Don Mitchell
032ff1cd61 Merge pull request #5200 from edx/split/lms-11396 
Updating active_versions should not send old and new
 2014-09-15 16:44:10 -04:00
Alison Hodges
bc952d4868 Merge pull request #5225 from edx/ahodges/doc/glossary_adds 
Ahodges/doc/glossary adds
 2014-09-15 16:40:29 -04:00
Alison Hodges
c41fab6208 Quick add for Wendy & Anant post webinar 2014-09-15 16:40:03 -04:00
Jason Bau
eab1d739be Merge pull request #5203 from Stanford-Online/kluo/fix-unicode-email 
Convert unicode emails to byte strings for CSV grade reports
 2014-09-15 13:32:55 -07:00
Don Mitchell
8d368eda13 Merge pull request #5201 from edx/split/lms-11395 
Split/lms 11395
 2014-09-15 16:31:03 -04:00
Don Mitchell
043c08bf5b Updating active_versions should not send old and new 
but just use old to get query info.
LMS-11396
 2014-09-15 16:02:53 -04:00
Don Mitchell
7090ef6588 Ensure deleting a direct only removes it from published 
as well as draft
LMS-11395
 2014-09-15 16:00:02 -04:00
Don Mitchell
040b1c3da5 Merge pull request #5197 from edx/reruns/count_queries 
Explain query counts
 2014-09-15 15:57:11 -04:00
Don Mitchell
6568463513 Merge pull request #5223 from edx/bug/lms-11361 
Bug/lms 11361
 2014-09-15 15:25:26 -04:00
Sarina Canelake
1e1fc127e2 Merge pull request #5214 from edx/sarina/update-i18n-tooling 
Sarina/update i18n tooling
 2014-09-15 14:39:15 -04:00
Sarina Canelake
95a9ca131a Merge pull request #5148 from lduarte1991/lduarte-harvardx-pr24 
Annotation Tools: Give staff/instructors full permissions (bug fix)
 2014-09-15 14:25:19 -04:00
Kevin Luo
7627d34339 Remove unicode conversion of email since it should always be unicode 2014-09-15 10:58:09 -07:00
Don Mitchell
bf0c4f5185 Don't let destructive loc change 
leak out to callers.
Also, use the return from update_item rather than assume
it was just side effecting.
LMS-11361
 2014-09-15 13:47:07 -04:00
Sarina Canelake
363ef77e5d LTR i18n tooling 2014-09-15 13:46:06 -04:00
Sarina Canelake
49d069dd9e RTL i18n tooling 2014-09-15 13:46:06 -04:00
Jesse Zoldak
fcae6b5763 Merge pull request #5219 from edx/zoldak/disable-annotation-test 
Disable intermittently failing annotation acceptance test TNL-353
 2014-09-15 13:23:34 -04:00
Jesse Zoldak
b7ad5c5382 Merge pull request #5218 from edx/zoldak/disable-test-video-controls 
skip intermittently failing test TNL-392
 2014-09-15 13:07:31 -04:00
Jesse Zoldak
76517de87d Disable intermittently failing annotation acceptance test TNL-353 2014-09-15 12:23:47 -04:00
Jesse Zoldak
a1eb44d9c6 skip intermittently failing test TNL-392 2014-09-15 12:13:06 -04:00
Piotr Mitros
78ed5c2c54 Merge pull request #5194 from edx/pmitros/pyfs-convention-cleanup 
Clean up conventions for underscores vs. dashes in config setting.
 2014-09-15 12:08:20 -04:00
Don Mitchell
4c3b4a59b4 Merge pull request #5208 from edx/split/misc_fixups 
Split/misc fixups
 2014-09-15 11:18:25 -04:00
Sarina Canelake
a08ca41579 Merge pull request #5210 from edx/sarina/09152014-translation-update 
Update translations (autogenerated message)
 2014-09-15 10:15:31 -04:00
Renzo Lucioni
1fbccdaa20 Merge pull request #5183 from edx/renzo/new-audit-track-selection 
Prepare track selection page for new audit track
 2014-09-15 10:09:26 -04:00
Sarina Canelake
ba500b5e70 Update translations (autogenerated message) 2014-09-15 10:02:39 -04:00
Waqas Khalid
81e297a677 Merge pull request #5032 from mlkwaqas/waqas/tnl148-reset-newpost-form-on-cancel 
Forums new post form should reset state when user cancels
 2014-09-15 18:53:56 +05:00