Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,511 Commits 1 Branch 0 Tags
167e2b675bc98037e2fa0ff2f783b04e32e3f4dd
Commit Graph

8622 Commits

Author SHA1 Message Date
Sarina Canelake
91196573e6 Fix small i18n typos 2014-07-22 09:38:32 -04:00
chrisndodge
e9f2801cef Merge pull request #4479 from edx/muhhshoaib/Ex-40-Coupon-discount-value-add-validation 
Fixed the  discount value bug
 2014-07-21 21:48:56 -04:00
Jason Bau
bd03741c79 Merge pull request #4212 from Stanford-Online/ndupoux/fixing-registration-page 
Ndupoux/fixing registration page
 2014-07-21 18:07:10 -04:00
Sarina Canelake
6be3384481 Merge pull request #4431 from edx/split/get_wiki_courses 
Split get_courses_for_wiki impl
 2014-07-21 17:59:19 -04:00
marcotuts
c7d88deb47 Merge pull request #4453 from edx/marco/dashboard-styling-tweaks 
Visual styling adjustments to profile area on Course Dashboard
 2014-07-21 17:50:04 -04:00
Sarina Canelake
d0449cdff2 get_courses_for_wiki return course_keys across all modulestores [LMS-2914] 2014-07-21 17:17:48 -04:00
njdup
770e7aac49 User registration prevents using password as username. 
Some users erroneously set their password as their username with the original layout, because the username field directly followed the password field. Users may be accustomed to the common occurrence of a password confirmation field directly following the password field.
To fix the issue, I did the following:
   - Moved the existing username and real name form fields above the password field.
   - Added a validation in the create_account handler in common/djangoapps/student/views.py, which confirms that the password field does not match the username field.

New tests created to check the added functionality.
 2014-07-21 14:04:48 -07:00
Ned Batchelder
feac1e0b60 Merge pull request #4498 from IONISx/tusbar/fix-dump-grades-unicode 
Fix unicode issue
 2014-07-21 16:10:46 -04:00
Ned Batchelder
00377652e4 Merge pull request #4179 from IONISx/tusbar/remove-course-id-from-title 
Remove course ID from title in course about page
 2014-07-21 13:57:34 -04:00
John Jarvis
7023eb4c19 resolving merge conflicts 2014-07-21 13:42:06 -04:00
Bertrand Marron
602988c39a Fix unicode issue 2014-07-21 16:43:51 +02:00
Muhammad Shoaib
2d41ebe48f removed the discount value bug 
check error handling if the discount value is not an integer
 2014-07-21 09:12:57 -04:00
zubair-arbi
cfa873cc1d ignore MAC meta files on import and also remove any such files from the course 
STUD-1725
 2014-07-21 13:16:00 +05:00
cahrens
77a8660243 ispublic is in active use by Stanford. 2014-07-18 20:28:06 -04:00
Jason Bau
aac0fac3d2 Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs 2014-07-17 15:04:22 -04:00
Renzo Lucioni
adae7c6d95 Merge pull request #4437 from Stanford-Online/giulio/theme-segment-io 
always include GA file
 2014-07-17 14:34:19 -04:00
marco
a129fd4a27 adjusted styling of dashboard profile area to remove heavier gradients and other small cleanups 2014-07-17 14:26:22 -04:00
Jason Bau
fb927dd790 Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register 
fix shib reg from course about page
 2014-07-17 13:53:51 -04:00
Giulio Gratta
77c3d15d20 always include GA file 2014-07-17 10:25:06 -07:00
Jason Bau
be80e0058e Merge pull request #4464 from edx/jbau/remove-branch-setting-cache 
removing thread-local cache for branch_setting
 2014-07-17 13:03:08 -04:00
Jason Bau
f12fa05ae1 removing thread-local cache for branch_setting 2014-07-17 11:05:47 -04:00
Calen Pennington
1607b7fc0d Merge pull request #4445 from cpennington/cross-store-xml-import-export 
Add tests for xml import/export between different modulestores
 2014-07-17 10:55:55 -04:00
Jason Bau
e1fcac93c5 fix shib reg from course about page 2014-07-17 10:51:32 -04:00
Calen Pennington
1bc0b323b1 Explicitly create the AssetKey for all assets coming out of a ContentStore 2014-07-17 10:35:36 -04:00
Chris Dodge
4928fad415 add ability to inspect a cart for the existence of a particular type of item, e.g. PaidCourseRegistration. Only show the 'Shopping Cart' button if there's a PaidCourseRegistration in it. 2014-07-17 00:43:00 -04:00
Sarina Canelake
fba7bb91bd Merge pull request #3718 from jazkarta/idde-bugfix 
Fix a bug in Individual Due Date Extensions (IDDE).
 2014-07-16 11:30:10 -04:00
Sarina Canelake
666f563ee6 Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional 
Make text on register button on About page conditional.
 2014-07-15 16:37:00 -04:00
Chris Rossi
700504c52f Fix a bug in Individual Due Date Extensions (IDDE). 
The IDDE implementation relied on a StudentModule being created for a
particular block in order to set the extended due date on that block.
Since StudentModules seem to be created on demand whenever data is
written to an attribute with Scope.user_state, it meant that if a
homework problem hadn't yet been touched by a student it was possible
that the due date extension wouldn't take effect for that problem, even
if the due date extension was successfully set for the parent unit.

This patch fixes this problem by creating new StudentModules as
necessary in order to make sure extended due dates propogate properly to
all problems in a unit.
 2014-07-15 15:54:55 -04:00
David Adams
aa1b623904 Make text on register button on About page conditional. 
Added a new advanced setting; invitation_only

 If invitation_only display "Enrollment in this course is by invitation only"
 Otherwise, if outside of enrollment period display "Enrollment is Closed"

 This issue is logged at LMS-2670

 Also fixed in this PR is issue LMS-2717; even though the Register button was greyed out,
 clicking it sent one to the registration page.
 2014-07-15 12:51:12 -07:00
Calen Pennington
4986a61877 Merge pull request #4414 from cpennington/fix-get-module-calls 
Fix calls to get_module to not pass course ids as positions
 2014-07-15 12:55:12 -04:00
Sarina Canelake
df8f3bd39e Revert "Pull out edX into variables in password reset email" 
This reverts commit 3a2276b537.
 2014-07-15 10:20:09 -04:00
Calen Pennington
4ded4be700 Fix calls to get_module to not pass course ids as positions 2014-07-15 09:22:04 -04:00
Kevin Luo
adc7c13f45 Fix pending name changes template 
- Strings marked for translation need to be wrapped in quotes to be
string type.
- Update old post function call
- Remove extra close brackets in function definitions
- Wrap href attribute in quotes
- Move square bracket outside of translated text
 2014-07-14 17:04:42 -07:00
cahrens
66173ab9e6 Add "visible_to_staff_only" field to support staff locking in Studio. 
STUD-1875
 2014-07-14 14:46:40 -04:00
Nimisha Asthagiri
7503cc2473 reverting back to migrating the settings in the env files 2014-07-14 11:59:40 -04:00
Nimisha Asthagiri
4859eee23b Move modulestore django settings migration code down into the modulestore layer so it works for all django-based callers. 2014-07-14 11:59:40 -04:00
Nimisha Asthagiri
a218e66d2e auto-migrate old mongo to draft modulestore 2014-07-14 11:58:40 -04:00
Ned Batchelder
c36b17260d Merge pull request #4405 from pdpinch/fix-calc-definition-of-T 
Fixing calculator hint to display correct definition of the constant T
 2014-07-14 11:33:23 -04:00
Stephen Sanchez
0a73d403d7 Merge pull request #4238 from edx/sanchez/TIM-645-File-Upload-Service 
Updating settings and requirements for platform to support file upload
 2014-07-14 09:22:40 -04:00
Sarina Canelake
5edcd969c8 Add new Transifex languages 
Filipino, Marathi, Serbian, Telugu, Uzbek
 2014-07-14 09:19:24 -04:00
clytwynec
1807948f2e Merge pull request #4391 from edx/clytwynec/clean_up_lettuce_output 
Clytwynec/clean up lettuce output
 2014-07-14 09:09:25 -04:00
Peter Pinch
2c8f82f03d Fixing calculator hint to display correct definition of the constant T 2014-07-13 17:35:52 -04:00
Mathew Peterson
cec09be006 Merge pull request #4225 from edx/mathewpeterson/lms-opaque-keys-bugs 
Testing for bugs off master for opaque-keys deprecation
LMS-2753
 2014-07-11 16:53:23 -04:00
Sarina Canelake
cfb7f99c8e Add filter to ignore deprecation warnings by default 
Add filter to only show first occurance of DepWarning
 2014-07-11 15:40:09 -04:00
Mat Peterson
638a1aaec4 Fixed test that hardcoded url to deprecated format 2014-07-11 15:40:08 -04:00
Mat Peterson
4f6088cbd1 Fixed some isinstance errors with opaque-keys 2014-07-11 15:40:08 -04:00
Kevin Luo
3a2276b537 Pull out edX into variables in password reset email 2014-07-11 12:25:54 -07:00
Christine Lytwynec
0581d0c5a1 disabling zendesk in lettuce tests and removing help/feedback lettuce tests in favor of the existing JS ones 2014-07-11 12:01:03 -04:00
Christine Lytwynec
cd580ac247 overriding a few more log levels for acceptance tests 2014-07-11 12:01:03 -04:00
Sarina Canelake
b0170a5c30 Merge pull request #4379 from Stanford-Online/kluo/exclude-browser-translation 
Subsume browser links to variables, to exclude from translation
 2014-07-11 08:44:02 -04:00