This website requires JavaScript.
38b7e4cc50
SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions.
2014-12-01 11:23:29 -05:00
fb013272b8
Wrap full name placeholder in quotes to deal with spaces
2015-01-05 15:34:32 -05:00
c7ede0df4b
fixing pep8 violations
2015-01-05 16:19:26 -05:00
3127ac2b6c
mock html_to_text for tests
2015-01-05 15:31:13 -05:00
cdf346ecfa
Merge pull request #6453 from edx/adam/fix-delete-orphans-handler
2015-01-05 15:34:58 -05:00
e9e1d35060
ECOM-869 Update copy and hide supplementary content wrapper and requirement blocks if user is inactive
2015-01-05 11:50:13 -05:00
7837607ca9
only recusively delete modules if all their parents are marked for deletion (PLAT-333)
2014-12-11 12:48:35 -05:00
90e0a2d1c0
Merge pull request #6448 from edx/ned/update-codejail
2015-01-05 13:13:40 -05:00
fdc5f2433d
Merge pull request #6278 from edx/sarina/finish-pr-5863
2015-01-05 12:49:28 -05:00
0be8ab3aab
Merge pull request #6406 from edx/alasdair/logistration-2.0
2015-01-05 12:48:32 -05:00
a2c7b03cb9
Update CodeJail to get better status code when CPU limit is exceeded.
2015-01-05 12:32:11 -05:00
c55e64603e
Merge pull request #6440 from mlkwaqas/waqas/tnl1016-dual-vote-count-forum
2015-01-05 22:08:23 +05:00
a80c09a9f2
Fix edX name hardcoded in password reset email
2014-11-06 11:38:00 +00:00
a64f375b78
Add Julien Romagnoli to Authors
2014-11-11 00:45:40 +00:00
a434207076
ECOM-783 updated logistration in light of redesign
2014-12-18 14:39:03 -05:00
97fea1ba26
Update Pillow to 2.7.0
2015-01-05 11:08:18 -05:00
e7be2f7311
Discussion thread response show dual vote count
2014-12-17 16:59:38 +05:00
4571930b12
Change tests so they show failures better.
2014-11-04 20:26:38 -05:00
8d57756312
Merge pull request #6438 from edx/sarina/20150105-translations-update
2015-01-05 10:39:33 -05:00
5f17781d39
Merge pull request #6428 from edx/shoppingcart-improve-i18n
2015-01-05 10:35:38 -05:00
cd76ac9cf1
Merge pull request #6380 from edx/i18n-password-reset-confirm
2015-01-05 10:35:20 -05:00
39dac9952b
Improve i18n for shopping cart registration code redemption page
2015-01-01 17:53:35 -05:00
41c5c3a949
Update translations (autogenerated message)
2015-01-05 10:18:59 -05:00
ada4626b4a
Merge pull request #6436 from edx/usman/ora-rc-2015-01-05
2015-01-05 20:10:30 +05:00
25bdf70e78
Better i18n on the password reset page
2014-12-24 15:22:23 -05:00
ec6b2b397c
Merge pull request #6276 from edx/ned/add-schoolyourself-xblock
2015-01-05 10:06:14 -05:00
ef3444be76
Add the SchoolYourself XBlock
2014-12-16 14:31:34 -05:00
20220dc3eb
Merge pull request #6418 from edx/translate-placeholder-text
2015-01-05 09:21:03 -05:00
0dbfd174e2
Merge pull request #6097 from edx/jeskew/fix_exception_on_fill_run
2015-01-05 09:03:56 -05:00
b13eef8859
Update edx-ora2 to release-2015-01-05T12.24.
2015-01-05 17:31:00 +05:00
9a3bee90b1
Delete unused problem doc files
2015-01-04 20:17:46 -05:00
279e2e8200
Merge pull request #6432 from open-craft/annual-test-failures
2015-01-02 17:48:45 -05:00
877e231c7a
Fix two tests failing on January 1, 2015
2015-01-02 12:24:52 -08:00
91a4796216
Merge pull request #6196 from edx/muhhshoaib/WL-168
2015-01-01 10:00:06 -05:00
4589a97676
Merge pull request #6427 from edx/will/ecom-849
2014-12-31 13:20:54 -08:00
f6b2b52c6d
Add docstring info for test suite properties.
2014-09-18 16:49:34 -04:00
f1f7125d66
rename test method.
2014-09-18 15:55:32 -04:00
a01fbefcf2
Refactor default_store logic in paver test_bokchoy
2014-09-17 12:48:54 -04:00
4203c1e545
Use disabled property to prevent IE9 users from clicking disabled buttons
2014-12-31 15:17:07 -05:00
23da87f078
Merge pull request #6414 from edx/alasdair/decoupled-verified-state-copy-cleanup
2014-12-31 14:40:15 -05:00
35ec36116c
Merge pull request #6424 from edx/remove-useless-i18n
2014-12-31 14:25:27 -05:00
400efdf153
Merge pull request #6421 from edx/will/ecom-850
2014-12-31 11:04:28 -08:00
c183831b43
Merge pull request #6423 from edx/will/ecom-864
2014-12-31 11:03:34 -08:00
0ac14dce79
Merge pull request #6410 from edx/will/decouple-verified-ab-test
2014-12-31 10:39:49 -08:00
598dc0ebd6
No point using translation for a string consisting only of a replacement.
2014-11-26 12:37:44 +00:00
c15adf9cd9
Set attempting_upgrade session flag in the new payment flow
2014-12-31 12:03:17 -05:00
01814c3983
Hide verification messaging if the user has an active verification
2014-12-31 13:01:56 -05:00
854c28f779
Merge pull request #6422 from edx/revert-6419-testeng/jenkins_revisited
2014-12-31 12:26:15 -05:00
519d55585c
Revert "Testeng/jenkins revisited"
2014-12-31 12:25:54 -05:00
686905d9a2
ECOM-811 design and layout changes
2014-12-23 14:13:37 -05:00
7011e2c278
Merge pull request #6419 from edx/testeng/jenkins_revisited
2014-12-31 11:40:29 -05:00
2018acbce3
use pip-accel if it is available, get .pip/download-cache from S3
2014-12-18 17:24:32 -05:00
55ad5b4dcd
Merge pull request #6417 from edx/no-translate-target-blank
2014-12-31 10:18:43 -05:00
92622f12a7
Merge pull request #6373 from edx/improve-i18n-receipt-page
2014-12-31 09:42:05 -05:00
609f642059
Placeholder text should be translated
2014-12-31 09:27:52 -05:00
4dd265a380
target="_blank" should not be translated
2014-12-31 09:16:43 -05:00
5a437b396e
WL-168 When redeeming a Registration Code in the shopping cart, the user should be redirect to the Registration Code Redemption page
2014-12-09 16:05:47 +05:00
20c356bd89
Merge pull request #6400 from Shrhawk/shr/bug/TNL-998-orphaned-form-label
2014-12-31 12:23:14 +05:00
77c68b7dbd
Merge pull request #6037 from edx/cdodge/microsite-aware-session-middleware
2014-12-30 23:43:24 -05:00
19c43725dd
Merge pull request #6393 from edx/remove-useless-gettext
2014-12-30 21:25:17 -05:00
a2760ecc8e
HTML should not be i18ned
2014-12-29 14:47:36 -05:00
863bdc1712
When fill_in_run() fails, handle failure instead of exception.
2014-12-01 10:01:49 -05:00
a90f7ab1bf
Enter the new verification / payment flow using a GET param
2014-12-29 16:33:42 -08:00
234691e446
Merge pull request #6396 from edx/will/ecom-848
2014-12-30 10:54:12 -08:00
2eab51ab26
Merge pull request #4786 from aboudreault/inline-discusssion-cohorting
2014-12-30 13:11:37 -05:00
cbfb6a8290
Do not escape HTML in verify/payment error messages
2014-12-29 15:27:09 -08:00
487bac519e
Merge pull request #6364 from edx/alasdair/decoupled-verified
2014-12-30 10:45:45 -05:00
c28bed2b6d
Merge pull request #6376 from edx/improve-i18n-dashboard-course-listing
2014-12-30 10:18:39 -05:00
8eb484c109
ECOM-811 design and layout changes
2014-12-23 14:13:37 -05:00
4ec0295bab
Improve i18n on the LMS dashboard course listing page
2014-12-24 11:38:57 -05:00
08e90d2e99
Better i18n for credit card charge failures
2014-12-24 15:17:45 -05:00
fe1d244900
Respond to review comments
2014-12-29 10:46:57 -05:00
90e4de5c02
Pull HTML out of i18n'ed string
2014-12-24 15:02:10 -05:00
2043c4d91b
Improve i18n on shoppingcart receipt page
2014-12-24 11:17:46 -05:00
55052c1aaf
Change label for value TNL-998
2014-12-30 15:19:35 +05:00
4020313e22
Merge pull request #4845 from edx/danielli/recommender
2014-12-29 20:59:31 -05:00
b009ac8f41
testcases for RecommenderXBlock
2014-08-14 16:50:29 -04:00
612d8db58a
Merge pull request #6394 from edx/aria-labelledby
2014-12-29 17:04:27 -05:00
908e85e079
role=dialog
2014-12-29 14:59:34 -05:00
a3572bdbf8
Should be aria-labelledby
2014-12-29 14:48:58 -05:00
7d8a977990
Merge pull request #6336 from edx/cdodge/wl-171-record-enrollment-ids
2014-12-29 13:55:07 -05:00
de8ac6ae3a
Merge pull request #6377 from edx/will/hook-up-receipt
2014-12-29 10:33:47 -08:00
c68426c390
Redirect from old receipt page
2014-12-24 13:51:01 -05:00
8ad7a64f98
when enrolling a student from a PaidCourseRegistration or a RegistrationCode redemption, then note the CourseEnrollment id in the respective tables
2014-12-19 15:49:09 -05:00
b80b347ed0
Make SessionMiddleware Microsite aware
2014-11-24 12:11:09 -05:00
d4de932c2b
Merge pull request #6386 from edx/cdodge/WL-137-normalize-user-profile-meta-column
2014-12-29 11:16:27 -05:00
34d200ffd5
allow for student profile downloads to query into 'meta' field in the UserProfile json blob
2014-12-28 23:45:33 -05:00
5855587a96
Merge pull request #6379 from edx/improve-i18n-courseware-page
2014-12-27 18:02:55 -05:00
6e4ccfb7bd
Added Jasmine tests for always_cohort_inline_discussions.
2014-12-22 18:36:25 +00:00
68fcdcc030
Add always_cohort_inline_discussions in course settings
2014-08-11 16:02:28 -04:00
db331b7fa9
Merge pull request #6382 from edx/zoldak/fix-master
2014-12-26 12:41:50 -05:00
6122f9c9ee
Revert "Better i18n for credit card charge failures"
2014-12-26 09:10:01 -05:00
619a5ea3eb
Better i18n for credit card charge failures
2014-12-24 15:17:45 -05:00
dff919efb2
Improve i18n for courseware page
2014-12-24 14:56:28 -05:00
75cfcd7292
Set EDX_PLATFORM_REVISION to unknown if not in a git repo.
2014-12-22 16:58:10 -05:00
64fb434dbf
Merge pull request #6330 from edx/cdodge/filter-unpurchased-coupons
2014-12-24 13:22:49 -05:00
d97bf059bb
Merge pull request #6366 from edx/christina/fix-editing-bug
2014-12-23 17:04:57 -05:00
6846e25bbb
Revert #6192 . It was causing a JS error on devstack.
2014-12-23 16:13:20 -05:00
fa6299cf61
Merge pull request #6309 from edx/db/edx-studio-as-format-string
2014-12-23 15:41:03 -05:00
320941e850
Add settings comment about STUDIO_NAME and STUDIO_SHORT_NAME
2014-12-23 13:31:40 -05:00
Marco Morales