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

Release 2.4.2 #3357

Merged
merged 194 commits into from
Apr 23, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
194 commits
Select commit Hold shift + click to select a range
90cfdb9
moved classify and classify_string_classifier_rule and their tests fr…
giritheja Jan 26, 2017
68e0d79
minor spelling mistakes
giritheja Jan 26, 2017
679040a
fix lint issues
giritheja Jan 26, 2017
3555657
Merge remote-tracking branch 'upstream/develop' into classifier-services
giritheja Feb 4, 2017
f165ffd
Added get_classifier_from_model method
giritheja Feb 15, 2017
c1f0526
added _save_classifier method
giritheja Feb 15, 2017
c238c91
added get_classifier_from_id method
giritheja Feb 15, 2017
ea494b9
Added to test to verify methods
giritheja Feb 19, 2017
0c5b364
lint issues
giritheja Feb 19, 2017
f748d22
lint issues
giritheja Feb 19, 2017
97bf8bc
added update_classifier method.
giritheja Feb 20, 2017
273522c
added tests to update_classifier method.
giritheja Feb 20, 2017
d1b751c
Added delete_classifier method.
giritheja Feb 20, 2017
a19c10c
added tests to delete_classifier method.
giritheja Feb 20, 2017
ef9ae2c
lint issues
giritheja Feb 20, 2017
c7eecc8
Addressed review comments
giritheja Feb 21, 2017
f6eb4f9
remove image uploader directive from base.html
makoscafee Feb 22, 2017
97bcaa9
Localisation updates from https://translatewiki.net.
translatewiki Feb 23, 2017
679112f
addressed review comments
giritheja Feb 23, 2017
c10606c
addressed review comments
giritheja Feb 27, 2017
357d239
lint issues
giritheja Feb 27, 2017
eb97f1e
last PR which removes all globally unused javascripts
makoscafee Feb 28, 2017
1d4ddb2
Merge branch 'develop' into remove-js-from-basehtml
makoscafee Feb 28, 2017
cdf9898
Image region resizable by clicking and dragging
kirankonduru Mar 1, 2017
fac9f1d
addressed review comments
giritheja Mar 3, 2017
2f17800
Merge remote-tracking branch 'upstream/develop' into classifier-services
giritheja Mar 3, 2017
9d147b4
addressed review comments
giritheja Mar 4, 2017
7ca9288
addressed review comments
giritheja Mar 4, 2017
3ce71a6
addressed review comments
giritheja Mar 5, 2017
0b0897f
lint issues
giritheja Mar 5, 2017
a8787ab
Fix #2039: Allow editors to preview summary tiles (#3069)
Anthony-Alridge Mar 6, 2017
8b8d918
Localisation updates from https://translatewiki.net.
translatewiki Mar 6, 2017
f09f22a
Fixed the alignment of the submit button in teachOppiaModal
poush Mar 7, 2017
7aef879
dev merge conflicts resolve
makoscafee Mar 8, 2017
56e6733
Fix #3122 : Number Fields Bring Up Numeric Mobile Keyboards (#3167)
Mar 8, 2017
d72e6b5
Merge branch 'develop' into translatewiki
seanlip Mar 8, 2017
9bffbdb
addressed review comments
giritheja Mar 8, 2017
d94183e
lint issues
giritheja Mar 8, 2017
cc555d1
Merge pull request #3173 from oppia/translatewiki
wxyxinyu Mar 9, 2017
6ad6c9c
Localisation updates from https://translatewiki.net.
translatewiki Mar 9, 2017
baf05be
Fix #2828: Add IE9 support for sidebar. (#3178)
Oishikatta Mar 9, 2017
f289797
backdrop set to false for teachOppiaModel
poush Mar 10, 2017
93c230a
Added validation to classifier domain
Mar 10, 2017
a669a20
fixed lint issues
giritheja Mar 10, 2017
affd108
Image region resizable code refactor
kirankonduru Mar 10, 2017
efb9976
Fixes part of #3064: pull the directive specific css in corresponding…
1995YogeshSharma Mar 11, 2017
2526e32
Image region resizable code refactor
kirankonduru Mar 11, 2017
ea83634
Image region resizable margin part added
kirankonduru Mar 12, 2017
1d528c2
Image region resize code refactor
kirankonduru Mar 12, 2017
5783a24
Fix part of #2394: Added docstrings in cron.py (#3182)
saeedjassani Mar 12, 2017
37a43ca
Fix part of #2863: Create front-end domain object for Interactions (#…
tjiang11 Mar 12, 2017
c4b24e6
Localisation updates from https://translatewiki.net.
translatewiki Mar 13, 2017
a0975fa
Resize image region code refactor
kirankonduru Mar 13, 2017
82da844
Fix #3099: Clarify error message for Item Selection and Multiple Choi…
FangYo Mar 13, 2017
84ba224
Merge pull request #3144 from kirankonduru/resizeimg
makoscafee Mar 14, 2017
504aa76
Merge branch 'develop' into remove-js-from-basehtml
makoscafee Mar 14, 2017
23dcb46
retained formbuilder.js in base.html
makoscafee Mar 14, 2017
fbf78c3
Merge branch 'remove-js-from-basehtml' of github.com:MAKOSCAFEE/oppia…
makoscafee Mar 14, 2017
d364828
added back formbuilder js in admin.html
makoscafee Mar 14, 2017
4c5a250
Merge pull request #3137 from MAKOSCAFEE/remove-js-from-basehtml
makoscafee Mar 14, 2017
e318485
Fix #3101: Discard-draft Tooltip (#3205)
shaz13 Mar 15, 2017
4d7be26
Fix #3162: set expiration explicitly for files in the build directory…
seanlip Mar 16, 2017
ad7dcb3
Fix broken backend test. (#3208)
seanlip Mar 16, 2017
4ef938d
Localisation updates from https://translatewiki.net.
translatewiki Mar 16, 2017
f3bd9b4
Addressed review comments
giritheja Mar 16, 2017
a56644d
Merge pull request #3212 from oppia/master
seanlip Mar 17, 2017
565f0f3
Merge pull request #3171 from poush/fix3169
anmolshkl Mar 17, 2017
b53b0fe
Fix part of #2863: Create front-end fallback domain object (#3207)
tjiang11 Mar 17, 2017
8985e36
Add a check that user contributions for logged in users exist on the …
wxyxinyu Mar 18, 2017
6d0cb2a
Add test (#3217)
wxyxinyu Mar 19, 2017
9e7f3c7
Fixes #3192: shifted back css of oppia-sidebar-menu-open back to oppi…
1995YogeshSharma Mar 19, 2017
0c10db6
Fix #2394: Add useful docstrings to core/storage/job/gae_models.py (…
sasacocic Mar 19, 2017
30de2d4
Fix #3180: Fixing issues with the teachOppiaModal. (#3181)
anmolshkl Mar 19, 2017
1849498
Add e2e tests for suggestion acceptance on explorations (#3202)
arku Mar 19, 2017
6d8b814
Merge branch 'develop' into translatewiki
seanlip Mar 19, 2017
9d754f8
Fix naming error in PR 3202. (#3220)
seanlip Mar 19, 2017
205785a
Modified classifier_domain to make attributes private and added updat…
giritheja Mar 19, 2017
33133ff
Merge remote-tracking branch 'upstream/develop' into classifier-services
giritheja Mar 19, 2017
5d5c682
lint issues
giritheja Mar 19, 2017
f82284c
Added validate method to LDAStringClassifier
giritheja Mar 19, 2017
cbb956a
lint issues
giritheja Mar 19, 2017
916b4a9
lint issues
giritheja Mar 19, 2017
15470c0
lint issues
giritheja Mar 19, 2017
18e45b4
Add e2e test to visit the links in the about dropdown (#3223)
arku Mar 20, 2017
ed2dfc7
Merge pull request #3222 from oppia/translatewiki
wxyxinyu Mar 20, 2017
d80cde6
Addressed review comments
giritheja Mar 20, 2017
3e63728
changed ClassifierRegistry to Registry
giritheja Mar 20, 2017
1e83b66
addressed review comments
giritheja Mar 20, 2017
96c1a4a
lint issues
giritheja Mar 20, 2017
d709c04
Addressed review comments
giritheja Mar 21, 2017
e8a7b88
Addressed review comments
giritheja Mar 21, 2017
75a4988
Lint issues
giritheja Mar 21, 2017
a1b215e
Fix part of #2863: Create front-end content object factory (#3224)
tjiang11 Mar 22, 2017
2a2d50f
Fixes: footer padding on mobile, #3121 (#3186)
poush Mar 22, 2017
58b8280
Added tests to LDAStringClassifier and added comments in classifier_d…
giritheja Mar 22, 2017
486157c
Updated tests with assertRaisesRegexp and test to test type of elemen…
giritheja Mar 22, 2017
4cca983
lint issues
giritheja Mar 22, 2017
5932b6a
lint issues
giritheja Mar 22, 2017
0ec3551
Fix #2813: Customization arg model is bypassed for interactions that …
arunabh98 Mar 23, 2017
9f0ccde
Fixed Issue #2734 Add i18n to some label in preferences (#3219)
saeedjassani Mar 23, 2017
c2a9166
addressed review comments
giritheja Mar 23, 2017
5eac115
lint issues
giritheja Mar 23, 2017
740c408
lint issues
giritheja Mar 23, 2017
9daac3c
Addressed review comments
giritheja Mar 23, 2017
2d59baa
lint issues
giritheja Mar 23, 2017
93d7649
Fix part of #2394: add docstrings for core/platform/models.py (#3226)
pranavsid98 Mar 23, 2017
91907b9
Remove unnecessary log lines in backend test. (#3230)
seanlip Mar 23, 2017
ce45de2
Fix part of #2863: Create front-end domain object for Rules (#3229)
tjiang11 Mar 23, 2017
95def86
generate source maps into separate files
vojtechjelinek Mar 25, 2017
77d9f20
Merge pull request #3233 from vojtechjelinek/develop
makoscafee Mar 26, 2017
a00ca27
Fix #2400: Oppia-donation card margin corrections (#3214)
shaz13 Mar 26, 2017
edc5d6f
Fix part of #3132: Add missing translation keys to preferences page (…
rohan-gulati Mar 26, 2017
b439118
Fix #3097: Button text does not fit into the buttons in German (#3191)
shaz13 Mar 26, 2017
e808836
Fix#3094: License terms link in image insert does not work (#3236)
shaz13 Mar 27, 2017
1af4bfc
Fix part of #3132: Add missing i18n keys and Hindi translations for c…
rohan-gulati Mar 27, 2017
64af15a
Fix #3131: collection footer and sharing directive added to collectio…
1995YogeshSharma Mar 27, 2017
f608bd1
Fix #2870: Limit exploration cards to screen width to maintain center…
Oishikatta Mar 27, 2017
af1d5d8
Fix #3135: Switch from Static Image Resources By Using Existing Font…
shaz13 Mar 28, 2017
8530045
Fix part of #3047: Collection contents migration (#3209)
wxyxinyu Mar 28, 2017
ee92ff9
moved LDAStringClassifierTest to extensions
giritheja Mar 28, 2017
af7ac93
moved LDAStringClassifierTest to extensions
giritheja Mar 28, 2017
ca539e1
Modified LDAStringClassifierTest class name.
giritheja Mar 28, 2017
cd54976
First draft of ClassifyHandler test
pranavsid98 Mar 29, 2017
3bebb88
Convert GLOBALS to AJAX for collection editor permissions (#3126)
kevinlee12 Mar 29, 2017
5ae40fe
Fix #2985: Introduce collection learner view mobile version (#3197)
Mar 29, 2017
8617638
Changed approach to testing
pranavsid98 Mar 29, 2017
9bb9ca2
Add dependencies to collection editor (#3261)
tjiang11 Mar 29, 2017
a312e8e
Upgrade protractor, karma and karma-jasmine (#3251)
joshuacano Mar 30, 2017
fba82b1
Introduce a promo bar (#3262)
BenHenning Apr 1, 2017
05f6441
Update reader.py
pranavsid98 Apr 1, 2017
2fa3744
Working Handler
pranavsid98 Apr 1, 2017
a151bcc
Minor style changes.
pranavsid98 Apr 1, 2017
679a3f8
Add installation of peer dependency: jasmine-core. (#3266)
seanlip Apr 1, 2017
cf97126
Fix part of #2863: Create outcome object factory (#3260)
tjiang11 Apr 1, 2017
0a2739e
Updated test cases
pranavsid98 Apr 1, 2017
9e40e8c
Lint issues
pranavsid98 Apr 1, 2017
86d6101
Addressing Lint issues
pranavsid98 Apr 1, 2017
7e40361
Removed commented lines
pranavsid98 Apr 2, 2017
7cd4746
Fixed open comments
pranavsid98 Apr 2, 2017
d5ba579
Addressed some changes
pranavsid98 Apr 2, 2017
df9fce3
Fixed Travis Errors
pranavsid98 Apr 2, 2017
2ae8293
Update reader.py
pranavsid98 Apr 3, 2017
c9b9f74
Addressed changes
pranavsid98 Apr 3, 2017
3e358dc
Fix #1852: Transition to ESLint (#3264)
kevinlee12 Apr 3, 2017
149c7c1
Update reader.py
pranavsid98 Apr 3, 2017
ce493a6
Update reader.py
pranavsid98 Apr 3, 2017
d38a30b
Update reader_test.py
pranavsid98 Apr 3, 2017
0ccaf92
Fix part of #2863: Create trigger object (#3273)
tjiang11 Apr 4, 2017
3cf28f2
Fix part of #2394: Added docstrings in summary_services.py (#3263)
domevit Apr 4, 2017
20580dd
Merge pull request #3070 from giritheja/classifier-services
anmolshkl Apr 4, 2017
8310e75
Removed test case
pranavsid98 Apr 4, 2017
4607621
Merge pull request #3255 from pranavsid98/classify_handler_test
anmolshkl Apr 5, 2017
23a8a12
renamed algorithm_ids
pranavsid98 Apr 6, 2017
15bf386
addressed changes, reverted old commit
pranavsid98 Apr 7, 2017
417a00d
Merge pull request #3298 from pranavsid98/renaming_algorithm_id
anmolshkl Apr 8, 2017
ae0939f
Fix #3300: About link will now direct user to the about tab (#3301)
kevinlee12 Apr 8, 2017
8dbf5f6
Update donation page statistics. (#3313)
seanlip Apr 9, 2017
2e2dc79
Only show 'return to collection' when there are no other recommendati…
seanlip Apr 9, 2017
479ca54
Fix overflowing of names in the subscription card. (#3270)
arunabh98 Apr 9, 2017
3914ba1
Fix #3093: Popover of Userhelp button remains constant when the user …
shaz13 Apr 9, 2017
eb05933
Fix #3293: Introduction of a static maintenance page (#3308)
BenHenning Apr 10, 2017
a93ad1b
Routine update of translations. (#3316)
seanlip Apr 10, 2017
078801c
Fix #2018: make toast z-index lower than navbar z-index (#3320)
wxyxinyu Apr 10, 2017
bd8b7a2
Fix collection migration job to use non-strict validation (#3317)
wxyxinyu Apr 10, 2017
615ce1d
Related video fix (#3321)
shaz13 Apr 10, 2017
f055a50
fixed validate()
pranavsid98 Apr 10, 2017
fec572f
fixes
pranavsid98 Apr 10, 2017
e088b9c
Addressed EOF errors
pranavsid98 Apr 10, 2017
cab029e
constants refactor
vojtechjelinek Apr 10, 2017
1f3676c
constants refactor
vojtechjelinek Apr 10, 2017
37317cf
Fix #2936: Limit the length of goal description in explorations. (#3274)
shaz13 Apr 11, 2017
334a147
Fixed bool property in validate()
pranavsid98 Apr 12, 2017
77acf50
Update LDAStringClassifier.py
pranavsid98 Apr 12, 2017
8871e74
Addressed Lint
pranavsid98 Apr 12, 2017
1699502
Constants reafctor
vojtechjelinek Apr 12, 2017
31e24f5
Fix #1774: Changed color combination required for visibility of remin…
shivanXI Apr 12, 2017
88607ac
Fix part of #2863: Create ParamChange object factory (#3302)
tjiang11 Apr 12, 2017
09279d0
Refactoring : removed 'role' variable from GET request used in editor…
1995YogeshSharma Apr 12, 2017
cd82f8e
Merge pull request #3322 from pranavsid98/fix_validate_method
anmolshkl Apr 13, 2017
ebb9644
New test
vojtechjelinek Apr 13, 2017
3c2f2fb
Fix #3318: Style fixes for collection card in creator dashboard (#3330)
shaz13 Apr 13, 2017
7f65d6d
Removed s
vojtechjelinek Apr 13, 2017
d776c72
Assert change
vojtechjelinek Apr 13, 2017
bd8d148
add dependency (#3334)
tjiang11 Apr 14, 2017
82813b0
Merge pull request #3323 from vojtechjelinek/constants-refactor
vojtechjelinek Apr 14, 2017
5c4accb
Fix#2160 Introduce first version of tests involving deleting explorat…
shivanXI Apr 14, 2017
4f5213f
Fixes #3028: Add confirmation modal dialog for clearing image and reg…
juansaba Apr 15, 2017
20392eb
Add new collection schema version for collection_contents migration (…
wxyxinyu Apr 17, 2017
749d4d2
Fix create exploration button terminology in collection editor. (#3350)
arunabh98 Apr 20, 2017
c6042c7
Remove generic error message when trying to publish a collection cont…
arunabh98 Apr 20, 2017
9318f57
Add error message for unsupported image formats. (#3349)
arunabh98 Apr 20, 2017
297163a
Fix role indicator
wxyxinyu Apr 22, 2017
8910cd8
Add new contributors to AUTHORS, CONTRIBUTORS and about.html
wxyxinyu Apr 23, 2017
678f75e
Bump the version number to v2.4.2 and update the changelog
wxyxinyu Apr 23, 2017
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
Prev Previous commit
Next Next commit
Addressed review comments
  • Loading branch information
giritheja committed Feb 21, 2017
commit c7eecc8048f00d7722b85a30f5e5c85a3d78085e
12 changes: 3 additions & 9 deletions core/domain/classifier_services.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

"""Services for classifier models"""

from core.domain import classifier_registry
from core.domain import classifier_domain
from core.domain import classifier_registry
from core.domain import exp_domain
from core.domain import interaction_registry
from core.platform import models
Expand Down Expand Up @@ -125,7 +125,7 @@ def classify_string_classifier_rule(state, normalized_answer):


def get_classifier_from_model(classifier_model):
"""Returns a classifier domian object given a classifier model loaded
"""Returns a classifier domain object given a classifier model loaded
from datastore.
"""
return classifier_domain.Classifier(
Expand All @@ -148,7 +148,7 @@ def get_classifier_by_id(classifier_id):


def _create_classifier(classifier):
"""Creates classifier model in the datastoer given a classifier
"""Creates classifier model in the datastore given a classifier
domain object.
"""
classifier_models.ClassifierModel.create(
Expand All @@ -162,13 +162,7 @@ def _save_classifier(classifier_model, classifier):
"""Updates classifier model in the datastore given a classifier
domain object.
"""
classifier_model.exp_version_when_created = (
classifier.exp_version_when_created)
classifier_model.state_name = classifier.state_name
classifier_model.algorithm_id = classifier.algorithm_id
classifier_model.cached_classifier_data = (
classifier.cached_classifier_data)
classifier_model.data_schema_version = classifier.data_schema_version
classifier_model.put()


Expand Down
3 changes: 0 additions & 3 deletions core/domain/classifier_services_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ def test_retrieval_of_classifiers(self):
self.assertEqual(classifier.exp_id, exp_id)
self.assertEqual(classifier.state_name, state)


def test_update_of_classifiers(self):
"""Test the update_classifier method."""
exp_id = u'1'
Expand All @@ -120,7 +119,6 @@ def test_update_of_classifiers(self):
self.assertEqual(classifier.exp_id, exp_id)
self.assertEqual(classifier.state_name, test_state)


def test_deletion_of_classifiers(self):
"""Test the delete_classifier method."""
exp_id = u'1'
Expand All @@ -132,4 +130,3 @@ def test_deletion_of_classifiers(self):
with self.assertRaisesRegexp(Exception, (
"No classifier found for the classifer's id.")):
classifier_services.get_classifier_by_id(classifier_id)