Advertisement
Guest User

Untitled

a guest
Jul 25th, 2017
78
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.06 KB | None | 0 0
  1. From git.notamedia.ru:um
  2. * branch master -> FETCH_HEAD
  3. Updating 1ff2e53..727cc60
  4. Fast-forward
  5. um/en/ajax/map.php | 2 +-
  6. um/en/ajax/map_detail.php | 2 +-
  7. um/en/index.php | 3 +-
  8. .../components/nota/base/templates/houses/map.php | 3 +-
  9. .../nota/base/templates/monuments/map.php | 3 +-
  10. .../components/nota/base/templates/museums/map.php | 3 +-
  11. .../nota/base/templates/personalities/detail.php | 4 +-
  12. .../nota/base/templates/personalities/map.php | 3 +-
  13. .../nota/base/templates/places/detail.php | 3 +-
  14. .../components/nota/base/templates/places/map.php | 3 +-
  15. .../components/nota/base/templates/quests/map.php | 3 +-
  16. .../components/nota/base/templates/routes/map.php | 4 +-
  17. .../house.detail/templates/v2/component_epilog.php | 6 +-
  18. .../templates/.default/component_epilog.php | 6 +-
  19. .../templates/egip_v2/component_epilog.php | 84 +++++
  20. .../templates/egip_v2/lang/en/template.php | 4 +
  21. .../templates/egip_v2/lang/ru/template.php | 4 +
  22. .../person.detail/templates/egip_v2/template.php | 226 +++++++++++++
  23. .../templates/egip_v2/component_epilog.php | 69 ++++
  24. .../templates/egip_v2/lang/en/template.php | 15 +
  25. .../templates/egip_v2/lang/ru/template.php | 15 +
  26. .../templates/egip_v2/result_modifier.php | 29 ++
  27. .../places.detail/templates/egip_v2/template.php | 351 ++++++++++++++++++++
  28. .../nota/routes.detail/templates/v2/author.php | 6 +-
  29. .../templates/v2/component_epilog.php | 6 +-
  30. .../routes.detail/templates/v2/include/en_map.php | 177 ++++++++++
  31. .../nota/routes.detail/templates/v2/template.php | 6 +-
  32. .../templates/map_egip/component_epilog.php | 2 +
  33. .../templates/map_egip/lang/en/template.php | 4 +
  34. .../templates/map_egip/lang/ru/template.php | 4 +
  35. .../routes.list/templates/map_egip/template.php | 320 ++++++++++++++++++
  36. .../templates/en_egip/lang/en/template.php | 7 +
  37. .../templates/en_egip/lang/ru/template.php | 7 +
  38. .../templates/en_egip/template.php | 32 ++
  39. .../templates/egip-map-detail/component_epilog.php | 2 +
  40. .../templates/egip-map-detail/images/houses.png | Bin 0 -> 239 bytes
  41. .../templates/egip-map-detail/images/monuments.png | Bin 0 -> 256 bytes
  42. .../templates/egip-map-detail/images/museums.png | Bin 0 -> 219 bytes
  43. .../templates/egip-map-detail/images/quests.png | Bin 0 -> 311 bytes
  44. .../templates/egip-map-detail/images/routes.png | Bin 0 -> 319 bytes
  45. .../egip-map-detail/images/territories.png | Bin 0 -> 310 bytes
  46. .../templates/egip-map-detail/lang/en/template.php | 4 +
  47. .../templates/egip-map-detail/lang/ru/template.php | 4 +
  48. .../unique.map/templates/egip-map-detail/script.js | 125 +++++++
  49. .../unique.map/templates/egip-map-detail/style.css | 97 ++++++
  50. .../templates/egip-map-detail/template.php | 93 +++++
  51. .../templates/egip_map_v2/component_epilog.php | 2 +
  52. .../templates/egip_map_v2/lang/en/template.php | 4 +
  53. .../templates/egip_map_v2/lang/ru/template.php | 4 +
  54. .../unique.map/templates/egip_map_v2/script.js | 125 +++++++
  55. .../unique.map/templates/egip_map_v2/style.css | 21 ++
  56. .../unique.map/templates/egip_map_v2/template.php | 125 +++++++
  57. .../nota/unique.map/templates/json_v2/template.php | 160 +++++++++
  58. um/local/php_interface/include/constants.php | 4 +-
  59. 54 files changed, 2163 insertions(+), 23 deletions(-)
  60. create mode 100644 um/local/components/nota/person.detail/templates/egip_v2/component_epilog.php
  61. create mode 100644 um/local/components/nota/person.detail/templates/egip_v2/lang/en/template.php
  62. create mode 100644 um/local/components/nota/person.detail/templates/egip_v2/lang/ru/template.php
  63. create mode 100644 um/local/components/nota/person.detail/templates/egip_v2/template.php
  64. create mode 100644 um/local/components/nota/places.detail/templates/egip_v2/component_epilog.php
  65. create mode 100644 um/local/components/nota/places.detail/templates/egip_v2/lang/en/template.php
  66. create mode 100644 um/local/components/nota/places.detail/templates/egip_v2/lang/ru/template.php
  67. create mode 100644 um/local/components/nota/places.detail/templates/egip_v2/result_modifier.php
  68. create mode 100644 um/local/components/nota/places.detail/templates/egip_v2/template.php
  69. create mode 100644 um/local/components/nota/routes.detail/templates/v2/include/en_map.php
  70. create mode 100644 um/local/components/nota/routes.list/templates/map_egip/component_epilog.php
  71. create mode 100644 um/local/components/nota/routes.list/templates/map_egip/lang/en/template.php
  72. create mode 100644 um/local/components/nota/routes.list/templates/map_egip/lang/ru/template.php
  73. create mode 100644 um/local/components/nota/routes.list/templates/map_egip/template.php
  74. create mode 100644 um/local/components/nota/unique.map.detail/templates/en_egip/lang/en/template.php
  75. create mode 100644 um/local/components/nota/unique.map.detail/templates/en_egip/lang/ru/template.php
  76. create mode 100644 um/local/components/nota/unique.map.detail/templates/en_egip/template.php
  77. create mode 100644 um/local/components/nota/unique.map/templates/egip-map-detail/component_epilog.php
  78. create mode 100644 um/local/components/nota/unique.map/templates/egip-map-detail/images/houses.png
  79. create mode 100644 um/local/components/nota/unique.map/templates/egip-map-detail/images/monuments.png
  80. create mode 100644 um/local/components/nota/unique.map/templates/egip-map-detail/images/museums.png
  81. create mode 100644 um/local/components/nota/unique.map/templates/egip-map-detail/images/quests.png
  82. create mode 100644 um/local/components/nota/unique.map/templates/egip-map-detail/images/routes.png
  83. create mode 100644 um/local/components/nota/unique.map/templates/egip-map-detail/images/territories.png
  84. create mode 100644 um/local/components/nota/unique.map/templates/egip-map-detail/lang/en/template.php
  85. create mode 100644 um/local/components/nota/unique.map/templates/egip-map-detail/lang/ru/template.php
  86. create mode 100644 um/local/components/nota/unique.map/templates/egip-map-detail/script.js
  87. create mode 100644 um/local/components/nota/unique.map/templates/egip-map-detail/style.css
  88. create mode 100644 um/local/components/nota/unique.map/templates/egip-map-detail/template.php
  89. create mode 100644 um/local/components/nota/unique.map/templates/egip_map_v2/component_epilog.php
  90. create mode 100644 um/local/components/nota/unique.map/templates/egip_map_v2/lang/en/template.php
  91. create mode 100644 um/local/components/nota/unique.map/templates/egip_map_v2/lang/ru/template.php
  92. create mode 100644 um/local/components/nota/unique.map/templates/egip_map_v2/script.js
  93. create mode 100644 um/local/components/nota/unique.map/templates/egip_map_v2/style.css
  94. create mode 100644 um/local/components/nota/unique.map/templates/egip_map_v2/template.php
  95. create mode 100644 um/local/components/nota/unique.map/templates/json_v2/template.php
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement