diff options
| author | elmot <elmot@vaadin.com> | 2016-04-13 15:01:50 +0300 |
|---|---|---|
| committer | elmot <elmot@vaadin.com> | 2016-04-13 15:32:47 +0300 |
| commit | 980f879176696906c25e985e4f7c8e3bdc04258d (patch) | |
| tree | d781a70e24eef0994ba5d371280e1cf837f94825 /all | |
| parent | f7f5ba596dbba0c2374a6d8ac10e89362cbbaeb5 (diff) | |
| parent | 9b46608f6c645c4289b854e2949bae3b1a2f5147 (diff) | |
| download | vaadin-framework-980f879176696906c25e985e4f7c8e3bdc04258d.tar.gz vaadin-framework-980f879176696906c25e985e4f7c8e3bdc04258d.zip | |
Merge branch 'master' into feature/mavenize
Change-Id: Id7db526d07a14ac259cbb50415bbafd2a7c2ab94
Diffstat (limited to 'all')
| -rw-r--r-- | all/src/main/resources/WebContent/licenses/the-json-license.txt | 20 | ||||
| -rw-r--r-- | all/src/main/templates/release-notes.html | 4 |
2 files changed, 4 insertions, 20 deletions
diff --git a/all/src/main/resources/WebContent/licenses/the-json-license.txt b/all/src/main/resources/WebContent/licenses/the-json-license.txt deleted file mode 100644 index 85380e76a7..0000000000 --- a/all/src/main/resources/WebContent/licenses/the-json-license.txt +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file diff --git a/all/src/main/templates/release-notes.html b/all/src/main/templates/release-notes.html index 4286b3ace0..fc1d69fd24 100644 --- a/all/src/main/templates/release-notes.html +++ b/all/src/main/templates/release-notes.html @@ -140,6 +140,10 @@ cause problems with external libraries compiled against said versions.</li> <li>Declarative format is now using "vaadin-" as a default prefix instead of the "v-" prefix used in 7.5. This default can be changed in deployment configuration.</li> + <li>The annotations @PreserveOnRefresh, @Push, @Theme, @Title, @VaadinServletConfiguration and @Widgetset now use + @Inherited. The annotation is also looked up in extended interfaces for backwards compatibility.</li> + <li>Server-side timings of request processing are only sent to the client when not in production mode. Using the + timings in TestBench tests requires the server not to be in production mode.</li> </ul> <h3 id="knownissues">Known Issues and Limitations</h3> <ul> |