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.

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

Nalanda rct3 into Central Master #3200

Merged
merged 102 commits into from
Mar 9, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
c77cbf8
Merge branch 'release-0.12.0' into master
aronasorman Oct 8, 2014
b973ba1
Merge pull request #2537 from learningequality/release-0.12.0
aronasorman Oct 27, 2014
1bd49b9
metadata for 0.12.8
aronasorman Oct 27, 2014
3c4e583
Merge pull request #2742 from mrpau/hotfix/2271-Export-CSV-data-quali…
aronasorman Dec 2, 2014
7f0bba1
Revert "Hotfix/2271 export csv data quality issues"
aronasorman Dec 2, 2014
ac07169
Merge pull request #2747 from learningequality/revert-2742-hotfix/227…
aronasorman Dec 2, 2014
a0333d4
Merge remote-tracking branch 'refs/remotes/upstream/master' into rele…
aronasorman Dec 5, 2014
67d6401
metadata for 0.12.9
aronasorman Dec 5, 2014
21ed722
Merge pull request #2745 from learningequality/release-0.12.0
aronasorman Dec 6, 2014
53567e6
Fix to remove partially watched videos from result of queryset.
cpauya Dec 6, 2014
da74f80
Merge pull request #2768 from mrpau/hotfix/2271-Export-CSV-data-quali…
aronasorman Dec 8, 2014
3027520
add waffle.io badge
waffle-iron Dec 9, 2014
83a75a2
Merge pull request #2773 from waffle-iron/master
aronasorman Dec 9, 2014
f0eb0ec
Revert "waffle.io Badge"
aronasorman Dec 9, 2014
b80482c
Merge pull request #2776 from learningequality/revert-2773-master
aronasorman Dec 9, 2014
4aa9187
Make default uuid generation random (uuid4), not based on counter.
jamalex Dec 19, 2014
5755125
Make counter incrementing more atomic, to avoid race conditions.
jamalex Dec 19, 2014
360555a
Move the old version of get_uuid into the new method, for reference.
jamalex Dec 19, 2014
6abb01b
Tabular reports can now be generated for playlists as well as topics
MCGallaspy Dec 20, 2014
9efbf1a
Merge pull request #2818 from jamalex/fix_uuid_race_conditions
aronasorman Dec 20, 2014
806c2a2
decrease query test # of expected queries threshold, because we're
aronasorman Dec 21, 2014
b880fe4
metadata for v0.12.10
aronasorman Dec 21, 2014
492dd0d
corrected metadata for v0.12.10
aronasorman Dec 21, 2014
dc6ec95
Merge pull request #2820 from learningequality/release-0.12.0
aronasorman Dec 21, 2014
7671556
Don't show unit 100 on unit-switching page.
jamalex Dec 21, 2014
e257ed8
Slight refactor of modal display on unit switching page.
jamalex Dec 21, 2014
78b8e8a
Show loading modal on exam setting page.
jamalex Dec 21, 2014
aabca14
Merge branch 'release-0.12.0' into nalanda-rct3
aronasorman Dec 22, 2014
9830154
increase query login admin passing threshold
aronasorman Dec 22, 2014
9d13607
Login Page Issue Fixed -- Multiple Click on Login link now won't red…
Dec 22, 2014
4c4f377
Ensure test unsetting events are fired even when switching exams.
jamalex Dec 22, 2014
176eae0
Merge pull request #2824 from jamalex/wait_modal_for_test_unsetting
aronasorman Dec 22, 2014
33509ae
Merge pull request #2823 from anuragkanungo/login
aronasorman Dec 22, 2014
445a794
Fix for scope error in #2751.
jamalex Dec 23, 2014
27c91c3
Merge pull request #2827 from jamalex/fix_sprintf_parens
jamalex Dec 23, 2014
060f0e7
Improve robustness as per discussion
MCGallaspy Dec 23, 2014
2f692fb
Refactor some coachreport tests, decouple from display text
MCGallaspy Jan 2, 2015
70881ca
Merge pull request #2819 from MCGallaspy/issue-2808
rtibbles Jan 6, 2015
c268db2
remove g5 501 test
aronasorman Jan 7, 2015
057a2f0
just make g5 501 hidden instead
aronasorman Jan 7, 2015
dacd988
make the g5 501 test reaaally hidden now
aronasorman Jan 7, 2015
ef7fae4
add the grade level when showing the tabular coach report for playlists
aronasorman Jan 8, 2015
2e99b31
Removing the docs folder/ saving the DJANGO-CHANGES
benjaoming Jan 13, 2015
7174d24
New readme for the python-packages folder
benjaoming Jan 13, 2015
32f3f62
documentation links for main README
benjaoming Jan 13, 2015
1a00a14
adding a pretty horizontal bar
benjaoming Jan 13, 2015
f716f2d
moving documentation section above the license section
benjaoming Jan 13, 2015
1c9703a
Merge pull request #2850 from benjaoming/master
aronasorman Jan 13, 2015
5ac345e
Merge pull request #2854 from learningequality/master
aronasorman Jan 15, 2015
7d40f3d
soft delete if log summary count > 1
Jan 21, 2015
1e61002
Added UserLog Summary Todo
Jan 22, 2015
240c706
Merge pull request #2877 from anuragkanungo/nalanda-rct3
jamalex Jan 22, 2015
95ae21e
Student should be redirected to login page if he/she gets looged out …
anuragkanungo Feb 4, 2015
0615773
Merge pull request #2939 from anuragkanungo/nalanda-rct3
aronasorman Feb 4, 2015
3daac46
Added Unit Variable to ExerciseLog Export
anuragkanungo Feb 7, 2015
30758b4
Updated code for unit variable in exercise log
anuragkanungo Feb 7, 2015
5d6a29d
Increased height of exercise name column in exam reports
anuragkanungo Feb 10, 2015
6d7e510
Added Exam Prep Playlists
anuragkanungo Feb 10, 2015
0cef1b9
Added student_testing/data/407.json
anuragkanungo Feb 10, 2015
6c70ea7
Added 15Nov2014 RCT condition check for unit variable
anuragkanungo Feb 10, 2015
8fea95e
Merge pull request #3016 from anuragkanungo/smps_4b_exam_results
aronasorman Feb 10, 2015
318a01a
Merge pull request #3011 from anuragkanungo/exam_topic_width
aronasorman Feb 10, 2015
bf146dc
Merge pull request #3012 from anuragkanungo/playlist
aronasorman Feb 10, 2015
c6402d3
Added Student Mastery/Class Mastery CoachReports
anuragkanungo Feb 11, 2015
c1abb70
RCT Unit Variable comment
anuragkanungo Feb 11, 2015
5105876
Removed Unit Selection Box and Added Class Level Mastery
anuragkanungo Feb 12, 2015
6e6c0f0
correct unit for those we are sure else unit 0
anuragkanungo Feb 12, 2015
26592ee
Added comment why to keep unit variable as 0 for some cases
anuragkanungo Feb 12, 2015
61fb56b
Merge pull request #2958 from anuragkanungo/nalanda-rct3
jamalex Feb 12, 2015
5286833
Code cleanup and renamed report view to exercise_mastery_view
anuragkanungo Feb 13, 2015
af8d016
On Facility Switch remove playlist values from url, to avoid get exer…
anuragkanungo Feb 13, 2015
350a7f5
Fixed minor bugs related to division by zero and exercise selection
anuragkanungo Feb 13, 2015
1c582c2
Moved jquery.js required for dyna-tree persistance to static-libraries
anuragkanungo Feb 13, 2015
66a0248
Refactoring and percentage in float
anuragkanungo Feb 13, 2015
c106ca1
removed extra comma, tests was failing
anuragkanungo Feb 13, 2015
8e5e8e5
Merge pull request #3033 from anuragkanungo/coach_reports
jamalex Feb 20, 2015
bc21a36
Fix 3040, Redirect to login page in case of Unauthorized
anuragkanungo Feb 23, 2015
3bffde5
Used SetGetParam for url
anuragkanungo Feb 24, 2015
5e0b016
Test for redirect unauthorized playlist view request to login page
anuragkanungo Feb 24, 2015
d4c91a2
Added test for unauthorized request to redirect to login page
anuragkanungo Feb 24, 2015
cfb423d
Moved import to top
anuragkanungo Feb 24, 2015
14c8701
Added implicit wait for css selector to be found in selenium test
anuragkanungo Feb 24, 2015
b56a514
Updated implicit wait after selector
anuragkanungo Feb 24, 2015
4ffdb35
Increase implict wait timeout time
anuragkanungo Feb 24, 2015
7c9085b
Merge pull request #3092 from anuragkanungo/nalanda-rct3
aronasorman Feb 25, 2015
b68aadf
Fixing up loadtesting.
rtibbles Feb 27, 2015
618314d
Final tweaks and fixes for loadtesting.
rtibbles Feb 27, 2015
2c5cce4
Fixes up load_testing for nalanda_rct3
rtibbles Feb 27, 2015
b3f28a0
Adds description comment to loadtesting view.
rtibbles Feb 28, 2015
c06bab5
Merge pull request #3149 from rtibbles/load_testing_nalanda
jamalex Feb 28, 2015
dd65adb
Fixes video playback during loadtest
rtibbles Feb 28, 2015
0299599
Merge pull request #3161 from rtibbles/load_testing_video
jamalex Feb 28, 2015
e890a2d
Fixes exercise answering for nalanda-rct3
rtibbles Feb 28, 2015
b289d0f
Merge pull request #3163 from rtibbles/load_testing_video
jamalex Feb 28, 2015
54c23cb
Ignore content/khan folder in git.
jamalex Mar 1, 2015
1509abc
Re-enable motivational features by default for Nalanda.
jamalex Mar 1, 2015
0597547
Fixes and simplification to loadtesting app.
jamalex Mar 1, 2015
a6d62e5
Merge pull request #3165 from jamalex/loadtesting_fix
jamalex Mar 1, 2015
6e8da48
On loadtesting, set a timeout to continue even if page fails.
jamalex Mar 2, 2015
6177f63
Merge pull request #3169 from jamalex/loadtesting_robustness
rtibbles Mar 2, 2015
a5a5b1b
Skip unauthorzied redirect to login test on travis
anuragkanungo Mar 9, 2015
3bbd98e
Merge pull request #3198 from anuragkanungo/nalanda-rct3
anuragkanungo Mar 9, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ writeup/
/content/*.mp4
/content/*.mp4.part
/content/*.srt
/content/khan
/data/logs
/data/i18n
/data/subtitles
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@
Official website: http://kalite.learningequality.org/

---

#### Documentation

* Instructions for installation: [See: INSTALL.md](INSTALL.md)
* Further documentation: [See: our wiki](https://github.com/learningequality/ka-lite/wiki)

---

#### License information:

The KA Lite sourcecode itself is open-source [MIT licensed](http://opensource.org/licenses/MIT), and the other included software and content is licensed as described in the [LICENSE](https://raw.github.com/learningequality/ka-lite/master/LICENSE) file. Please note that KA Lite is not officially affiliated with, nor maintained by, Khan Academy, but rather makes use of Khan Academy's open API and Creative Commons content, which may only be used for non-commercial purposes.
47 changes: 0 additions & 47 deletions docs/BIG-IDEAS-DEMO.md

This file was deleted.

61 changes: 0 additions & 61 deletions docs/DEVELOPMENT.md

This file was deleted.

91 changes: 0 additions & 91 deletions docs/FRONTEND.md

This file was deleted.

Loading