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

8832 Commits

Author SHA1 Message Date
Greg Price
eaa93bf615 Hide comments in marked answers in forum questions 
A link to show the comments appears in their place.
 2014-08-29 15:59:33 -04:00
Greg Price
ec482c0dc2 Allow authors of forum questions to mark answers 
Co-authored-by: jsa <jsa@edx.org>
 2014-08-29 15:59:32 -04:00
Greg Price
a3703fbf79 Refactor a small amount of forum permission code 2014-08-29 15:59:32 -04:00
Greg Price
c23a27bac4 Add post type control to forum new post form 
Also change server to pass post type through to the comments service.
 2014-08-29 15:59:32 -04:00
Greg Price
2e30874180 Add post type indicators to forum sidebar nav 
The previously existing checkmark for threads with endorsed responses is
removed, as it is mostly redundant.
 2014-08-29 15:59:32 -04:00
Greg Price
aaa2f35336 Change endorsement UI for forum question threads 
Responses to question threads can be "marked as answer" instead of
"endorsed".
 2014-08-29 15:59:32 -04:00
Greg Price
182ae7aeb0 Add endorsement info to marked answers in forum 
Co-authored-by: jsa <jsa@edx.org>
 2014-08-29 15:59:31 -04:00
Greg Price
10063a3120 Distinguish forum thread types in rendering 
Each thread's type is now included in its post details, and question
threads have marked answers shown immediately below the body of the
initial post.
 2014-08-29 15:59:31 -04:00
Greg Price
7470e60004 Unify forum thread views (and templates) 2014-08-29 15:59:31 -04:00
Greg Price
ab2b7f344d Clean up dead forums front-end code 2014-08-29 15:59:31 -04:00
Greg Price
8d2211a698 Handle question posts from comments service 2014-08-29 15:59:31 -04:00
Greg Price
854621be60 Update forum new post form 
Add help text to several fields, update visual styling, and make it
appear in the right-hand pane of the discussion tab instead of sliding
down from the top.

Co-authored-by: jsa <jsa@edx.org>
Co-authored-by: marco <marcotuts@gmail.com>
 2014-08-29 15:59:31 -04:00
Stephen Sanchez
20a66ee2ef The main django template needs header and footer feature flags. 2014-08-29 15:38:28 +00:00
Waheed Ahmed
2e88e33847 Refactor verify course id decorator and fixed tests. 2014-08-29 16:05:33 +05:00
Jason Bau
87068c41ae Merge pull request #5012 from edx/jbau/fix-contained-in-order 
change PaidCourseRegistration.contained_in_order
 2014-08-28 15:05:42 -07:00
Sarina Canelake
64c94cf3cf Merge pull request #4686 from Stanford-Online/stv/i18n/gettext 
Monkey patch 'django.utils.translation'
 2014-08-28 17:39:51 -04:00
Will Daly
fe3472cb7c Merge pull request #5013 from edx/will/ecom-113 
ECOM-113: Already verified page sometimes displays the incorrect price
 2014-08-28 15:19:11 -04:00
Jason Bau
63cfcd3de4 change PaidCourseRegistration.contained_in_order 
now handles cases where the order has both a PaidCourseRegistration
and a CertificateItem
 2014-08-28 11:27:07 -07:00
Will Daly
83bfb17807 Use new-style course locators consistently when setting the donation amount in the session 
Update devstack settings to use new CyberSource API
 2014-08-28 13:55:31 -04:00
chrisndodge
173952481f Merge pull request #4984 from edx/cdodge/fix-white-label-footers 
be sure to just use the Open edX footer.html when we're running a white ...
 2014-08-28 13:38:38 -04:00
Stephen Sanchez
739ee04fad Merge pull request #4979 from edx/sanchez/update-login-button-styles 
Updating LMS Login button to line up SASS with Drupal Login button
 2014-08-28 10:50:54 -04:00
Waheed Ahmed
50535ac8a8 Merge pull request #5004 from edx/waheed/lms11249-fix-typo-on-id-verfication 
Fixed typo on student id verification.
 2014-08-28 19:31:24 +05:00
Waheed Ahmed
bedb8830f6 Fixed typo on student id verification. 
LMS-11249
 2014-08-28 18:33:07 +05:00
stv
86633df3db Monkey patch 'django.utils.translation' 
Modify Django's translation library, such that the gettext family of
functions return an empty string when attempting to translate a
falsey value. This overrides the default behavior [0]:
> It is convention with GNU gettext to include meta-data as the
> translation for the empty string.

This patch provides a holistic solution to replace the current piecemeal
approach [1][2].

Affected Methods:
    - gettext
    - ugettext

[0] https://docs.python.org/2.7/library/gettext.html#the-gnutranslations-class
[1] bad803e451
[2] https://github.com/edx/edx-platform/pull/4653
 2014-08-27 15:27:34 -07:00
Calen Pennington
0e7e266a5b Push bulk_write_operations up into ModuleStoreRead, and rename to remove reference to writes 2014-08-27 16:29:48 -04:00
Don Mitchell
e624ff3b04 Make path_to_location use bulk_write_operation for performance. 2014-08-27 16:29:47 -04:00
Calen Pennington
3672c9a292 Make find_matching_* work during split bulk operations 2014-08-27 16:29:47 -04:00
Calen Pennington
e7ce41061e Improve debuggability when call-count numbers don't match up 2014-08-27 16:29:47 -04:00
Stephen Sanchez
ac162dbaf0 Merge pull request #4994 from edx/sanchez/aws_social_link_overrides 
Adding social media link overrides for AWS.
 2014-08-27 13:34:54 -04:00
Adam
0c47a74b45 Merge pull request #4784 from edx/adam/track-bulk-email-memory 
Adam/track bulk email memory
 2014-08-27 12:53:13 -04:00
jmclaus
21c4cc73a9 Merge pull request #4919 from edx/jmclaus/serving_fonts_through_platform 
Serving Fonts through Platform Assets
 2014-08-27 11:38:54 -04:00
Will Daly
a03baee25c Merge pull request #4976 from edx/will/ecom-128 
Embargo based on country code in the user's profile.
 2014-08-27 11:24:26 -04:00
Stephen Sanchez
9186f39eb6 Adding social media link overrides for AWS. 2014-08-27 15:23:12 +00:00
Adam Palay
22a8ce39e2 add tracking for memory usage in creating subtasks (LMS-6488) 2014-08-27 11:12:52 -04:00
jmclaus
037abb6d50 Replace reference to Google OpenSans with edX-hosted OpenSans 2014-08-27 10:34:53 -04:00
Will Daly
31a6566110 Embargo based on country code in the user's profile. 2014-08-27 08:51:45 -04:00
Waheed Ahmed
57bc5c9314 Modified request method for change enrollment and bulk beta modify access on instructor dashboard. 
LMS-11266
 2014-08-27 13:20:04 +05:00
Chris Dodge
04d3a5723b be sure to just use the Open edX footer.html when we're running a white label on edx.org 2014-08-26 17:11:58 -04:00
Don Mitchell
9c946f2245 djpyfs is installed app not middleware 2014-08-26 14:38:55 -04:00
Stephen Sanchez
78046b5dc0 Updating the Login button to have the same hover style as Drupal 2014-08-26 18:30:32 +00:00
Don Mitchell
4465b26a43 Use opaque_keys w/ model vars not parsing of url 
to generate url.
LMS-11209
 2014-08-25 18:07:37 -04:00
Piotr Mitros
b166503749 Merge pull request #4889 from edx/danielli/pyfs 
Adds pyfilesystem service from XBlocks to edx-platform
 2014-08-25 16:37:46 -04:00
Sarina Canelake
eb84832849 Merge pull request #4325 from edx/victor/update-activation-email-text 
Update activation email text
 2014-08-25 13:43:18 -04:00
Don Mitchell
0976f8031f Merge pull request #4931 from edx/reruns/check_answer 
Fix check and show answer for split
 2014-08-25 13:10:28 -04:00
swdanielli
8378422f3d code clean 2014-08-25 12:25:03 -04:00
swdanielli
504a7a21ba add pyfs service 2014-08-25 12:25:03 -04:00
Victor Shnayder
26d975c2f4 Update activation email text 
Make it more active.  Adds a separate section for edX.org-specific copy,
because it's hard to make it generic.

LMS-11084
 2014-08-25 12:09:47 -04:00
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx. 
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
 2014-08-25 15:33:43 +00:00
Don Mitchell
4d701bebef Fix check and show answer for split 
LMS-11237
 2014-08-25 10:29:50 -04:00
Stephen Sanchez
b3f4ce2312 Merge pull request #4879 from edx/sanchez/update-platform-header 
Updating the platform header styles to match new site styles.
 2014-08-25 09:57:14 -04:00