Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nalanda rct3 into Central Master #3200

Merged
merged 102 commits into from
Mar 9, 2015
Merged

Nalanda rct3 into Central Master #3200

merged 102 commits into from
Mar 9, 2015

Conversation

anuragkanungo
Copy link
Contributor

No description provided.

aronasorman and others added 30 commits October 8, 2014 16:00
@aronasorman
Merge branch 'release-0.12.0' into master
c77cbf8
@aronasorman
Merge pull request #2537 from learningequality/release-0.12.0
b973ba1 
Release 0.12.8
@aronasorman
metadata for 0.12.8
1bd49b9
@aronasorman
Merge pull request #2742 from mrpau/hotfix/2271-Export-CSV-data-quali…
3c4e583 
…ty-issues

Hotfix/2271 export csv data quality issues
@aronasorman
Revert "Hotfix/2271 export csv data quality issues"
7f0bba1
@aronasorman
Merge pull request #2747 from learningequality/revert-2742-hotfix/227…
ac07169 
…1-Export-CSV-data-quality-issues

Revert "Hotfix/2271 export csv data quality issues"
@aronasorman
Merge remote-tracking branch 'refs/remotes/upstream/master' into rele…
a0333d4 
…ase-0.12.0
@aronasorman
metadata for 0.12.9
67d6401
@aronasorman
Merge pull request #2745 from learningequality/release-0.12.0
21ed722 
0.12.9
@cpauya
Fix to remove partially watched videos from result of queryset.
53567e6
@aronasorman
Merge pull request #2768 from mrpau/hotfix/2271-Export-CSV-data-quali…
da74f80 
…ty-issues

Fix to remove partially watched videos from result of queryset.
@waffle-iron
add waffle.io badge
3027520
@aronasorman
Merge pull request #2773 from waffle-iron/master
83a75a2 
waffle.io Badge
@aronasorman
Revert "waffle.io Badge"
f0eb0ec
@aronasorman
Merge pull request #2776 from learningequality/revert-2773-master
b80482c 
Revert "waffle.io Badge"
@jamalex
Make default uuid generation random (uuid4), not based on counter.
4aa9187
@jamalex
Make counter incrementing more atomic, to avoid race conditions.
5755125
@jamalex
Move the old version of get_uuid into the new method, for reference.
360555a
@MCGallaspy
Tabular reports can now be generated for playlists as well as topics
6abb01b
@aronasorman
Merge pull request #2818 from jamalex/fix_uuid_race_conditions
9efbf1a 
Fix UUID race conditions
@aronasorman
decrease query test # of expected queries threshold, because we're
806c2a2 
needing less queries now to compute the uuid
@aronasorman
metadata for v0.12.10
b880fe4
@aronasorman
corrected metadata for v0.12.10
492dd0d
@aronasorman
Merge pull request #2820 from learningequality/release-0.12.0
dc6ec95 
Release 0.12.10
@jamalex
Don't show unit 100 on unit-switching page.
7671556
@jamalex
Slight refactor of modal display on unit switching page.
e257ed8
@jamalex
Show loading modal on exam setting page.
78b8e8a
@aronasorman
Merge branch 'release-0.12.0' into nalanda-rct3
aabca14 
Conflicts:
	kalite/distributed/tests/browser_tests/query_tests.py
	kalite/version.py
@aronasorman
increase query login admin passing threshold
9830154
Login Page Issue Fixed -- Multiple Click on Login link now won't red…
9d13607 
…irect to login page if you are logged in
anuragkanungo and others added 26 commits February 23, 2015 19:46
@anuragkanungo
Fix 3040, Redirect to login page in case of Unauthorized
bc21a36
@anuragkanungo
Used SetGetParam for url
3bffde5
@anuragkanungo
Test for redirect unauthorized playlist view request to login page
5e0b016
@anuragkanungo
Added test for unauthorized request to redirect to login page
d4c91a2
@anuragkanungo
Moved import to top
cfb423d
@anuragkanungo
Added implicit wait for css selector to be found in selenium test
14c8701
@anuragkanungo
Updated implicit wait after selector
b56a514
@anuragkanungo
Increase implict wait timeout time
4ffdb35
@aronasorman
Merge pull request #3092 from anuragkanungo/nalanda-rct3
7c9085b 
Fix 3040, Redirect to login page in case of Unauthorized
@rtibbles
Fixing up loadtesting.
b68aadf
@rtibbles
Final tweaks and fixes for loadtesting.
618314d
@rtibbles
Fixes up load_testing for nalanda_rct3
2c5cce4
@rtibbles
Adds description comment to loadtesting view.
b3f28a0
@jamalex
Merge pull request #3149 from rtibbles/load_testing_nalanda
c06bab5 
Load testing nalanda
@rtibbles
Fixes video playback during loadtest
dd65adb
@jamalex
Merge pull request #3161 from rtibbles/load_testing_video
0299599 
Fixes video playback during loadtest
@rtibbles
Fixes exercise answering for nalanda-rct3
e890a2d
@jamalex
Merge pull request #3163 from rtibbles/load_testing_video
b289d0f 
Fixes exercise answering for nalanda-rct3
@jamalex
Ignore content/khan folder in git.
54c23cb
@jamalex
Re-enable motivational features by default for Nalanda.
1509abc
@jamalex
Fixes and simplification to loadtesting app.
0597547
@jamalex
Merge pull request #3165 from jamalex/loadtesting_fix
a6d62e5 
Loadtesting fix for Nalanda
@jamalex
On loadtesting, set a timeout to continue even if page fails.
6e8da48
@rtibbles
Merge pull request #3169 from jamalex/loadtesting_robustness
6177f63 
On loadtesting, set a timeout to continue even if page fails.
@anuragkanungo
Skip unauthorzied redirect to login test on travis
a5a5b1b
@anuragkanungo
Merge pull request #3198 from anuragkanungo/nalanda-rct3
3bbd98e 
Skip unauthorzied redirect to login test on travis
jamalex added a commit that referenced this pull request Mar 9, 2015
@jamalex
Merge pull request #3200 from learningequality/nalanda-rct3
abb207c 
Nalanda rct3 into Central Master
@jamalex jamalex merged commit abb207c into central-master Mar 9, 2015
@jamalex jamalex removed the has PR label Mar 9, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@anuragkanungo @jamalex @aronasorman @cpauya @waffle-iron @MCGallaspy @rtibbles @benjaoming