Syed Hasan raza
b8477cc77a
Merge pull request #9700 from edx/shr/bug/AN-4509-Unicode-Decode-Error
...
LoggerBackend encoding for json dumps
2015-11-27 14:54:41 +05:00
Syed Hassan Raza
0f67d19a2c
Add logging for UnicodeDecodeError excpetion LoggerBackend
2015-11-27 12:07:03 +05:00
raeeschachar
291a5c35ca
Fixed test create library failing on chrome
2015-11-26 22:33:29 +05:00
Brian Beggs
89a7e42576
Merge pull request #10742 from edx/bbeggs/acceptance-test-migration-fix
...
Migrations will now run during Acceptance tests
2015-11-26 09:34:51 -05:00
Jim Abramson
8f4c2264a1
Merge pull request #10701 from edx/renzo/studio-programs-tab
...
Add Programs tab to Studio
2015-11-25 16:37:34 -05:00
Renzo Lucioni
70d57327eb
Add Programs tab to Studio
...
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
2015-11-25 14:56:50 -05:00
Brian Beggs
40af1987aa
recreating the lettuce cache database
2015-11-25 14:11:54 -05:00
Peter Fogg
497622d4b4
Switch default course mode to 'audit'.
...
ECOM-2972
2015-11-25 11:22:29 -05:00
Saleem Latif
764ceb00c8
Cert Exceptions: View and Edit Exception list
2015-11-25 10:02:52 +05:00
Ahsan Ulhaq
347bfcbb38
Merge pull request #10688 from edx/ahsan/ECOM-2562-Refund-Policy-on-Prof-Ed-Receipts
...
Refund Policy on Prof Ed Receipts
2015-11-25 00:39:50 +05:00
Michael Frey
29b6ccf5e4
Added new Course List API.
2015-11-24 15:54:03 +00:00
Ahsan Ulhaq
bc64c66835
Refund Policy on Prof Ed Receipts
...
ECOM-2562
2015-11-24 17:42:09 +05:00
Ned Batchelder
a7e21bf188
Merge pull request #10707 from edx/ned/fix-pylint-c7630-violations
...
Fix pylint C7630 (literal used as attribute) violations
2015-11-23 16:58:54 -05:00
Ned Batchelder
0872732cf0
Fix pylint C7630 (literal used as attribute) violations
...
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
2015-11-23 15:32:54 -05:00
Christine Lytwynec
c6f4afc9c9
Header a.dropdown --> button.dropdown
2015-11-23 13:51:00 -05:00
Ned Batchelder
f5d0f3ff55
Remove useless pylint suppressions
2015-11-22 07:41:19 -05:00
Ben Patterson
8610b6ded6
Events bok-choy multiprocessing support.
...
Stop clearing the entire mongo collection with every mixin instantiation.
Instead, reset the clock for the particular test.
With this approach, filters must be stricter, for example, according
to username or user id.
2015-11-21 10:42:01 -05:00
Kevin Falcone
80614a2798
Merge branch 'release' into hotfix-2015-11-20-conflict
2015-11-20 13:13:05 -05:00
Kevin Falcone
57a4df73a5
Management commands should no longer access args[]
...
https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/
Django intercepts the 'pull' argument and says "unrecognized arguments pull"
There were no tests for this command, so it wasn't noticed during the
upgrade testing, only once our integration monitoring noticed.
2015-11-19 16:25:49 -05:00
Sarina Canelake
256dc5b6f8
Reword default about page questions
2015-11-19 15:44:54 -05:00
Brian Beggs
141e0a93c7
Merge branch 'master' into dj18-release-merge
2015-11-19 13:36:13 -05:00
Adam Palay
5b5cf7d3b0
Fix login redirect when user is logged out while answering a question (TNL-3789)
2015-11-19 10:28:58 -05:00
Usman Khalid
bc22f592c6
Merge pull request #10664 from edx/usman/regenerate-db-cache
...
Recreate db caches for bokchoy and lettuce
2015-11-19 19:20:21 +05:00
Ben Patterson
0d68cd01bf
Rebalance shard 7.
2015-11-18 15:30:50 -05:00
Usman Khalid
d8fd8ed678
Recreate db caches for bokchoy and lettuce
2015-11-18 21:08:05 +05:00
muhammad-ammar
29acc3acfc
resolve merge conflicts
...
test fixes
2015-11-18 19:13:54 +05:00
muhammad-ammar
8d5f153201
Merge remote-tracking branch 'origin/release' into dj18-release-merge
...
Conflicts:
common/djangoapps/util/testing.py
lms/djangoapps/instructor/views/api.py
lms/djangoapps/teams/tests/test_views.py
openedx/core/djangoapps/programs/models.py
openedx/core/djangoapps/user_api/accounts/tests/test_views.py
requirements/edx/github.txt
2015-11-18 17:53:44 +05:00
raeeschachar
dfa0fe2db7
Fixed Chrome Bok Choy tests
2015-11-18 17:24:22 +05:00
Braden MacDonald
244b8ab9de
Merge pull request #10302 from open-craft/sso-login-unactivated
...
SSO - Allow users to sign in with unactivated accounts (SOL-1324)
2015-11-17 18:37:40 -08:00
wajeeha-khalid
9fcc1c32a1
Merge pull request #10586 from edx/jia/MA-862
...
MA-862; accept application/merge-patch+json for comment/thread update
2015-11-17 11:01:37 +05:00
Braden MacDonald
9ccf78ed06
Add some asserts and explanations, per review
2015-11-16 17:18:54 -08:00
Braden MacDonald
40448e44fa
Address review comments and test failure
2015-11-16 16:11:00 -08:00
Braden MacDonald
f1bfa56884
Clean up integration tests, test logging in without activation
2015-11-16 16:11:00 -08:00
Braden MacDonald
90cdb91391
Allow users to login via third_party_auth even if not activated
2015-11-16 16:10:57 -08:00
Adnan Ghaffar
7dac728ee9
adding fixed tests for chrome
2015-11-16 14:47:12 +05:00
Chris Dodge
02550cb368
Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts
2015-11-13 12:57:10 -05:00
Ben Patterson
f81b7cefc9
Merge pull request #10582 from edx/saleem-latif/SOL-1384
...
saleem-latif/SOL-1384: Refactor certificates bok-choy pages to use PageObject
2015-11-13 12:23:11 -05:00
Diana Huang
b3b1b7e476
Merge pull request #10610 from edx/diana/flaky-pdf-testbook-test-control
...
Start running the PDF Textbook test again.
2015-11-13 10:52:23 -05:00
Diana Huang
de47bcde7e
Start running the PDF Textbook test again.
...
Remove redundant and skipped video test.
2015-11-13 10:02:51 -05:00
Matt Drayer
b932a202d8
Merge pull request #10593 from edx/asadiqbal08/SOL-1385
...
asadiqbal/SOL-1385 Disable "Generate Certs" button until cert is activated
2015-11-13 09:15:18 -05:00
clrux
1587178525
Merge pull request #9974 from edx/clrux/ac-187
...
Video player (1 of 2): refreshing the UI
2015-11-13 08:06:43 -05:00
Saleem Latif
195178aa41
Refactor certificates bok-choy pages to use PageObject
2015-11-13 16:32:13 +05:00
asadiqbal
35d04bff89
SOL-1385
2015-11-13 15:23:02 +05:00
wajeeha-khalid
4ea70aeb19
MA-862; accept application/merge-patch+json for comment/thread update
2015-11-13 12:52:21 +05:00
Chris Rodriguez
78c6a38ca6
LMS: new UI for video player + AFontGarde iconfonts
2015-11-12 16:37:29 -05:00
Saleem Latif
c068bc95cf
Custom 500 error message should only be seen for Preview
2015-11-12 11:31:25 +05:00
Ned Batchelder
e7fcc743c0
More-correct data migrations
...
We need to be sure the migrations will work even in the presence of data
from the future. get_or_create is a problem, because if the data
already exists, there could be more than one record, even if this
migration only creates one.
2015-11-11 09:03:21 -05:00
Davorin Šego
a8cca47cc9
Merge pull request #10455 from edx/search/optimization
...
Search performance (SOL-1030, SOL-1031)
2015-11-11 10:41:33 +01:00
muhammad-ammar
f55f9af891
Fix RemovedInDjango19Warning
2015-11-11 13:58:07 +05:00
Davorin Sego
a62e403ed8
Search optimization
...
Remove filtering by partition, course and user
Rewrite the LMS result processor to use the course blocks api
2015-11-11 09:38:00 +01:00
