Merge pull request oppia#2471 from oppia/release-2.3.3

Release 2.3.3

AUTHORS

@@ -35,6 +35,7 @@ Estelle Lee <[email protected]>
 Frederik Creemers <[email protected]>
 Google Inc.
 Grace Guo <[email protected]>
+Hamza Chandad <[email protected]>
 Hitesh Sharma <[email protected]>
 Huong Le <[email protected]>
 Jackson Wu <[email protected]>

CHANGELOG

@@ -3,6 +3,54 @@ This file contains a summary of changes to the Oppia code base. For a full chang
     https://github.com/oppia/oppia/commits/master
 
 
+v2.3.3 (9 Sep 2016)
+-------------------
+Splash, About and Donation pages:
+* Update the Donation page.
+* Change splash pages used in experiments.
+* Fix #2400: Change margins and box-shadow on About and Donation page.
+* Fix broken url link to image on donation thanks page.
+* Use static URLs for the images on the Donate and Thanks pages.
+* Fix #2371: Prevent 404 errors when loading images in activity creation modal.
+
+Speed:
+* Cache images served via ImageHandler
+* Add pre-rendering to splash pages.
+* Externalize first party js modules.
+* Handle extension resources
+* Fix #2413: ignore copying python files when generating build directory
+* Fix #2380: remove js inlining from objects/templates
+
+Emails:
+* Fix #2259: Implement mailgun api for sending emails.
+* Fix #2349: Add service for sending feedback email to thread participants.
+
+Dashboard:
+* Add sorting to the creator dashboard.
+* Fix #2244: Fix activity tiles alignment.
+
+Mobile:
+* Fix #2044: User can now open and close the sidebar by swiping right and left.
+* Fix #1799: The explorations are now centered for a non-mobile device.
+
+Library:
+* Fix #2163: handle error due to invalid search cursor being used when searching in the library.
+* Align the tops of the exploration and collection cards on the library page.
+
+Editor, player and interactions:
+* Fix save diff modal not loading sometimes.
+* Modify code REPL rules to do less normalization for snippets.
+* Fix #2311: Add word-wrap for exploration card content.
+* Remove title, goal, and category alertService alerts.
+* Refactor interaction $scope.$parent.submitAnswer.
+* Extract non-inline interaction code from div['.conversation-skin-inline-interaction'].
+
+Misc:
+* Add tests to collection linearizer service
+* Fix #1800: remove unnecessary margins and update responsive breakpoint in Notifications page.
+* Fix #2354: put languages in alphabetical order in language dropdown.
+
+
 v2.3.2 (7 Aug 2016)
 -------------------
 Splash, About and Donation pages:

CONTRIBUTING.md

@@ -63,7 +63,7 @@ Here's how to make a one-off code change. (If you're working on a larger feature
 
 3. **Make a commit to your feature branch.** Each commit should be self-contained and have a descriptive commit message that helps other developers understand why the changes were made.
   * You can refer to relevant issues in the commit message by writing, e.g., "Fixes #105".
-  * In general, code should be formatted consistently with other code around it; we use Google's [Python](https://google.github.io/styleguide/pyguide.html) and [JavaScript](https://google.github.io/styleguide/javascriptguide.xml) style guides as a reference. If you use [Sublime Text](http://www.sublimetext.com/), consider installing the SublimeLinter, [SublimeLinter-jscs](https://github.com/SublimeLinter/SublimeLinter-jscs) and [SublimeLinter-pylint](https://github.com/SublimeLinter/SublimeLinter-pylint) plugins, following the instructions on their respective pages. Please also ensure that your code follows [these additional style rules](https://github.com/oppia/oppia/blob/develop/CONTRIBUTING.md#style-rules).
+  * Please read [these style rules](https://github.com/oppia/oppia/wiki/Coding-style-guide) and ensure that your code follows them. If you use [Sublime Text](http://www.sublimetext.com/), consider installing the SublimeLinter, [SublimeLinter-jscs](https://github.com/SublimeLinter/SublimeLinter-jscs) and [SublimeLinter-pylint](https://github.com/SublimeLinter/SublimeLinter-pylint) plugins, following the instructions on their respective pages.
   * Please ensure that the code you write is well-tested.
   * Before making the commit, start up a local instance of Oppia and do some manual testing in order to check that you haven't broken anything! After that, ensure that the added code has no lint errors and passes all automated tests by running the presubmit script:
 
@@ -90,6 +90,7 @@ Here's how to make a one-off code change. (If you're working on a larger feature
   * Go to your fork on GitHub, select your branch from the dropdown menu, and click "pull request". Ensure that the 'base' repository is the main oppia repo and that the 'base' branch is 'develop'.
   * Add a descriptive title explaining the purpose of the PR (e.g. "Fix #bugnum: add a warning when the user leaves a page in the middle of an exploration."). The "Fix #bugnum: " prefix **must** be included if this PR resolves an issue on the issue tracker.
   * Click "Create pull request". An admin will assign a reviewer to your commit.
+  * After a while, check your PR to see whether the Travis checks have passed. If not, follow the instructions at "[If your build fails...](https://github.com/oppia/oppia/wiki/If-your-build-fails...)".
 5. **Address review comments until all reviewers give LGTM ('looks good to me').**
   * When your reviewer has reviewed the code, you'll get an email. You'll need to respond in two ways:
      * Make a new commit addressing the comments you agree with, and push it to the same branch. Ideally, the commit message would explain what the commit does (e.g. "Fix lint error"), but if there are lots of disparate review comments, it's fine to refer to the original commit message and add something like "(address review comments)".
@@ -115,62 +116,6 @@ Here's how to make a one-off code change. (If you're working on a larger feature
   ```
 
 7. **Celebrate.** Congratulations, you have contributed to Oppia!
- 
-### Style rules
-
-The pre-push hook should take care of most of the style issues (for Python and JavaScript code). However, we follow a few additional rules that aren't baked into the linter. Please adhere to these as well, in order to minimize back-and-forth during review.
-
-General
-- The last character in each file should be a newline. (If you're using Sublime, you can enforce this locally by adding `"ensure_newline_at_eof_on_save": true` to your user preferences file.)
-
-Python
-- There should be two empty lines before any top-level class or function definition.
-- Prefer string interpolation over concatenation -- e.g. prefer:
-
-  ```
-  'My string %s' % varname
-  ```
-over
-
-  ```
-  'My string ' + varname
-  ```
-- When indenting from an open parenthesis ('('), prefer indenting by 4 rather than indenting from the position of the parenthesis. For example, prefer:
-
-  ```
-    my_function_with_a_really_long_name(
-        'abc', 'def', None)
-  ```
-over
-
-  ```
-    my_function_with_a_really_long_name('abc',
-                                        'def',
-                                        None)
-  ```
-- Docstrings should start with """ and end with """. The content of each docstring should be left-aligned. For example:
-
-  ```
-    """Check whether an email message with the same recipient_id,
-    email_subject and (cleaned) email_html_body has been sent in
-    the last DUPLICATE_EMAIL_INTERVAL_MINS.
-    """
-  ```
-- Never use backslashes to end a line. It's hard to tell whether they're escaping newlines, spaces, or something else. Use parentheses instead to break the line up, e.g.:
-
- ```
-     my_variable = (
-         my_very_long_module_name.my_really_long_function_name())
-  ```
-
-JavaScript
-- We are moving away from using underscores as prefixes for variable names, so, in the future, use `var localVariable` and not `var _localVariable`. Instead, we are adopting the convention that anything declared using `var` is private to the controller/service/etc. If you want a variable to be accessible to the controller, declare it on $scope instead.
-
-CSS
-- Within each CSS rule, attributes should be alphabetized (e.g. 'height' before 'margin' before 'top'). This makes it easy to find the value of an attribute if there are lots of them.
-- If the CSS class is oppia-specific, prefix it with `oppia-`. This helps distinguish it from CSS classes used by other third-party libraries. 
-- For directives, include the CSS in the directive template file, similar to what we do in `core/templates/dev/head/components/exploration_summary_tile_directive.html`. (Note that, in this case, all CSS rules should start with the top-level CSS class of the directive, so that they don't affect other elements outside it.) All other CSS should go in `core/templates/dev/head/css/oppia.css`.
-
 
 ### Notes
 

CONTRIBUTORS

@@ -51,6 +51,7 @@ Elizabeth Kemp <[email protected]>
 Estelle Lee <[email protected]>
 Frederik Creemers <[email protected]>
 Grace Guo <[email protected]>
+Hamza Chandad <[email protected]>
 Hitesh Sharma <[email protected]>
 Huong Le <[email protected]>
 Jackson Wu <[email protected]>

README.md

@@ -66,4 +66,3 @@ The Oppia code is released under the [Apache v2 license](https://github.com/oppi
   * Social media: [G+](https://plus.google.com/109898456505810251700/about), [YouTube](https://www.youtube.com/channel/UC5c1G7BNDCfv1rczcBp9FPw), [FB](https://www.facebook.com/oppiaorg), [Twitter](https://twitter.com/oppiaorg)
 
 We also have public chat rooms on Gitter: [https://gitter.im/oppia/oppia-chat](https://gitter.im/oppia/oppia-chat) and the #oppia channel on Freenode IRC. Drop by and say hello!
-

app.yaml

@@ -1,5 +1,5 @@
 application: oppiaserver
-version: 2-3-2
+version: 2-3-3
 runtime: python27
 api_version: 1
 threadsafe: false
@@ -49,6 +49,13 @@ handlers:
   # NB: not minified. TODO(sll): fix.
   static_dir: core/templates/dev/head/css
   secure: always
+# Serve js scripts under core/templates/dev/head. This regex allows
+# us to recursively serve js scripts. "\1" inserts text captured by
+# the capture group in the URL pattern.
+- url: /templates/dev/head/(.*\.(js))$
+  static_files: core/templates/dev/head/\1
+  upload: core/templates/dev/head/(.*\.(js))$
+  secure: always
 - url: /third_party/static
   static_dir: third_party/static
   secure: always
@@ -80,6 +87,14 @@ handlers:
   secure: always
   http_headers:
     Cache-Control: 'no-cache'
+# Serve js scripts for gadgets, interactions, rich_text_components and objects
+# under extensions in dev mode. This regex allows us to recursively serve js
+# scripts under the three specified directories. "\1" and "\2" insert capture
+# groups from the url pattern.
+- url: /extensions/(gadgets|interactions|rich_text_components|objects)/(.*\.(js))$
+  static_files: extensions/\1/\2
+  upload: extensions/(gadgets|interactions|rich_text_components|objects)/(.*\.(js))$
+  secure: always
 - url: /mapreduce/pipeline/images
   static_dir: third_party/gae-mapreduce-1.9.17.0/mapreduce/lib/pipeline/ui/images
   secure: always