[QGIS Commit] [qgis/Quantum-GIS] 7298e7: Add html annotations

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 7298e739082a14a0953df438c0f2bf51218317f4
      https://github.com/qgis/Quantum-GIS/commit/7298e739082a14a0953df438c0f2bf51218317f4
  Author: Nathan Woodrow <woodrow.nathan at gmail.com>
  Date:   2012-09-02 (Sun, 02 Sep 2012)

  Changed paths:
    M src/app/CMakeLists.txt
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    A src/app/qgshtmlannotationdialog.cpp
    A src/app/qgshtmlannotationdialog.h
    M src/app/qgsmaptoolannotation.cpp
    A src/app/qgsmaptoolhtmlannotation.cpp
    A src/app/qgsmaptoolhtmlannotation.h
    M src/gui/CMakeLists.txt
    A src/gui/qgshtmlannotationitem.cpp
    A src/gui/qgshtmlannotationitem.h
    M src/ui/qgisapp.ui

  Log Message:
  -----------
  Add html annotations


  Commit: a61a15bb1e90abe667e3f0d2e9bf4bc076f5b46a
      https://github.com/qgis/Quantum-GIS/commit/a61a15bb1e90abe667e3f0d2e9bf4bc076f5b46a
  Author: Nathan Woodrow <woodrow.nathan at gmail.com>
  Date:   2012-09-02 (Sun, 02 Sep 2012)

  Changed paths:
    M python/core/qgsexpression.sip
    M src/core/qgsattributeaction.cpp
    M src/core/qgsexpression.cpp
    M src/core/qgsexpression.h
    M src/gui/qgshtmlannotationitem.cpp
    M src/gui/qgsmaptip.cpp

  Log Message:
  -----------
  Move expression text replace to QgsExpression

    - Update actions, html map tips, and annotations


  Commit: 5a0d2f5863c696a043dfc41db3b4b49d2f33409e
      https://github.com/qgis/Quantum-GIS/commit/5a0d2f5863c696a043dfc41db3b4b49d2f33409e
  Author: Nathan Woodrow <woodrow.nathan at gmail.com>
  Date:   2012-09-02 (Sun, 02 Sep 2012)

  Changed paths:
    M src/gui/qgshtmlannotationitem.cpp

  Log Message:
  -----------
  expose layer to javacript


Compare: https://github.com/qgis/Quantum-GIS/compare/cbdafbc39857...5a0d2f5863c6