Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [root@JJMQ003 winestyle]# git log
- commit 7113a9ab9e9ce2003ab999959fdc6d8fc2e6817d
- Merge: 08f1f1c 8d0a493
- Author: Andrey Koteiko <andrei.koteiko@gmail.com>
- Date: Fri Apr 27 18:58:17 2018 +0300
- akoteyko_iss8326_duble_title2
- commit 8d0a4934e5a09c60996f4be167f56c685ad0af56
- Author: a.koteyko <andre_k@tut.by>
- Date: Fri Apr 27 18:53:04 2018 +0300
- akoteyko_iss8326_duble_title2. Перенос в новую ветку
- commit 08f1f1c19d4fe308ac7538d967438d2c48219a02
- Merge: 1418a70 1cb9148
- Author: aleksanova <aleksanova.94@mail.ru>
- Date: Fri Apr 27 18:28:48 2018 +0300
- aaleksanova_iss9483_generate_price_list
- commit 1cb9148e3d6fca3705ed4c239684c5d0c7900f5d
- Author: a.aleksanova <aaleksanova@localhost.localdomain>
- Date: Fri Apr 27 17:30:11 2018 +0300
- aaleksanova_iss9483_generate_price_list. Минификация
- commit df673465aec1e0a3a63ba57191d0f540929724cb
- :...skipping...
- commit 7113a9ab9e9ce2003ab999959fdc6d8fc2e6817d
- Merge: 08f1f1c 8d0a493
- Author: Andrey Koteiko <andrei.koteiko@gmail.com>
- Date: Fri Apr 27 18:58:17 2018 +0300
- akoteyko_iss8326_duble_title2
- commit 8d0a4934e5a09c60996f4be167f56c685ad0af56
- Author: a.koteyko <andre_k@tut.by>
- Date: Fri Apr 27 18:53:04 2018 +0300
- akoteyko_iss8326_duble_title2. Перенос в новую ветку
- commit 08f1f1c19d4fe308ac7538d967438d2c48219a02
- Merge: 1418a70 1cb9148
- Author: aleksanova <aleksanova.94@mail.ru>
- Date: Fri Apr 27 18:28:48 2018 +0300
- aaleksanova_iss9483_generate_price_list
- commit 1cb9148e3d6fca3705ed4c239684c5d0c7900f5d
- Author: a.aleksanova <aaleksanova@localhost.localdomain>
- Date: Fri Apr 27 17:30:11 2018 +0300
- aaleksanova_iss9483_generate_price_list. Минификация
- commit df673465aec1e0a3a63ba57191d0f540929724cb
- Merge: 7900486 1418a70
- :...skipping...
- commit 7113a9ab9e9ce2003ab999959fdc6d8fc2e6817d
- Merge: 08f1f1c 8d0a493
- Author: Andrey Koteiko <andrei.koteiko@gmail.com>
- Date: Fri Apr 27 18:58:17 2018 +0300
- akoteyko_iss8326_duble_title2
- commit 8d0a4934e5a09c60996f4be167f56c685ad0af56
- Author: a.koteyko <andre_k@tut.by>
- Date: Fri Apr 27 18:53:04 2018 +0300
- akoteyko_iss8326_duble_title2. Перенос в новую ветку
- commit 08f1f1c19d4fe308ac7538d967438d2c48219a02
- Merge: 1418a70 1cb9148
- Author: aleksanova <aleksanova.94@mail.ru>
- Date: Fri Apr 27 18:28:48 2018 +0300
- aaleksanova_iss9483_generate_price_list
- commit 1cb9148e3d6fca3705ed4c239684c5d0c7900f5d
- Author: a.aleksanova <aaleksanova@localhost.localdomain>
- Date: Fri Apr 27 17:30:11 2018 +0300
- aaleksanova_iss9483_generate_price_list. Минификация
- commit df673465aec1e0a3a63ba57191d0f540929724cb
- Merge: 7900486 1418a70
- Author: aleksanova <aleksanova.94@mail.ru>
- Date: Fri Apr 27 17:45:10 2018 +0300
- merge master to aaleksanova_iss9483_generate_price_list
- :...skipping...
- commit 7113a9ab9e9ce2003ab999959fdc6d8fc2e6817d
- Merge: 08f1f1c 8d0a493
- Author: Andrey Koteiko <andrei.koteiko@gmail.com>
- Date: Fri Apr 27 18:58:17 2018 +0300
- akoteyko_iss8326_duble_title2
- commit 8d0a4934e5a09c60996f4be167f56c685ad0af56
- Author: a.koteyko <andre_k@tut.by>
- Date: Fri Apr 27 18:53:04 2018 +0300
- akoteyko_iss8326_duble_title2. Перенос в новую ветку
- commit 08f1f1c19d4fe308ac7538d967438d2c48219a02
- Merge: 1418a70 1cb9148
- Author: aleksanova <aleksanova.94@mail.ru>
- Date: Fri Apr 27 18:28:48 2018 +0300
- aaleksanova_iss9483_generate_price_list
- commit 1cb9148e3d6fca3705ed4c239684c5d0c7900f5d
- Author: a.aleksanova <aaleksanova@localhost.localdomain>
- Date: Fri Apr 27 17:30:11 2018 +0300
- aaleksanova_iss9483_generate_price_list. Минификация
- commit df673465aec1e0a3a63ba57191d0f540929724cb
- Merge: 7900486 1418a70
- Author: aleksanova <aleksanova.94@mail.ru>
- Date: Fri Apr 27 17:45:10 2018 +0300
- merge master to aaleksanova_iss9483_generate_price_list
- # Conflicts:
- # includes/display/HTMLHead.php
- :...skipping...
- commit 7113a9ab9e9ce2003ab999959fdc6d8fc2e6817d
- Merge: 08f1f1c 8d0a493
- Author: Andrey Koteiko <andrei.koteiko@gmail.com>
- Date: Fri Apr 27 18:58:17 2018 +0300
- akoteyko_iss8326_duble_title2
- commit 8d0a4934e5a09c60996f4be167f56c685ad0af56
- Author: a.koteyko <andre_k@tut.by>
- Date: Fri Apr 27 18:53:04 2018 +0300
- akoteyko_iss8326_duble_title2. Перенос в новую ветку
- commit 08f1f1c19d4fe308ac7538d967438d2c48219a02
- Merge: 1418a70 1cb9148
- Author: aleksanova <aleksanova.94@mail.ru>
- Date: Fri Apr 27 18:28:48 2018 +0300
- aaleksanova_iss9483_generate_price_list
- commit 1cb9148e3d6fca3705ed4c239684c5d0c7900f5d
- Author: a.aleksanova <aaleksanova@localhost.localdomain>
- Date: Fri Apr 27 17:30:11 2018 +0300
- aaleksanova_iss9483_generate_price_list. Минификация
- commit df673465aec1e0a3a63ba57191d0f540929724cb
- Merge: 7900486 1418a70
- Author: aleksanova <aleksanova.94@mail.ru>
- Date: Fri Apr 27 17:45:10 2018 +0300
- merge master to aaleksanova_iss9483_generate_price_list
- # Conflicts:
- # includes/display/HTMLHead.php
- commit 7900486430b6fa7e396bf583fb8b18c058c40549
- Author: a.aleksanova <aaleksanova@localhost.localdomain>
- :...skipping...
- commit 7113a9ab9e9ce2003ab999959fdc6d8fc2e6817d
- Merge: 08f1f1c 8d0a493
- Author: Andrey Koteiko <andrei.koteiko@gmail.com>
- Date: Fri Apr 27 18:58:17 2018 +0300
- akoteyko_iss8326_duble_title2
- commit 8d0a4934e5a09c60996f4be167f56c685ad0af56
- Author: a.koteyko <andre_k@tut.by>
- Date: Fri Apr 27 18:53:04 2018 +0300
- akoteyko_iss8326_duble_title2. Перенос в новую ветку
- commit 08f1f1c19d4fe308ac7538d967438d2c48219a02
- Merge: 1418a70 1cb9148
- Author: aleksanova <aleksanova.94@mail.ru>
- Date: Fri Apr 27 18:28:48 2018 +0300
- aaleksanova_iss9483_generate_price_list
- commit 1cb9148e3d6fca3705ed4c239684c5d0c7900f5d
- Author: a.aleksanova <aaleksanova@localhost.localdomain>
- Date: Fri Apr 27 17:30:11 2018 +0300
- aaleksanova_iss9483_generate_price_list. Минификация
- commit df673465aec1e0a3a63ba57191d0f540929724cb
- Merge: 7900486 1418a70
- Author: aleksanova <aleksanova.94@mail.ru>
- Date: Fri Apr 27 17:45:10 2018 +0300
- merge master to aaleksanova_iss9483_generate_price_list
- # Conflicts:
- # includes/display/HTMLHead.php
- commit 7900486430b6fa7e396bf583fb8b18c058c40549
- Author: a.aleksanova <aaleksanova@localhost.localdomain>
- Date: Fri Apr 27 16:42:48 2018 +0300
- :...skipping...
- commit 7113a9ab9e9ce2003ab999959fdc6d8fc2e6817d
- Merge: 08f1f1c 8d0a493
- Author: Andrey Koteiko <andrei.koteiko@gmail.com>
- Date: Fri Apr 27 18:58:17 2018 +0300
- akoteyko_iss8326_duble_title2
- commit 8d0a4934e5a09c60996f4be167f56c685ad0af56
- Author: a.koteyko <andre_k@tut.by>
- Date: Fri Apr 27 18:53:04 2018 +0300
- akoteyko_iss8326_duble_title2. Перенос в новую ветку
- commit 08f1f1c19d4fe308ac7538d967438d2c48219a02
- Merge: 1418a70 1cb9148
- Author: aleksanova <aleksanova.94@mail.ru>
- Date: Fri Apr 27 18:28:48 2018 +0300
- aaleksanova_iss9483_generate_price_list
- commit 1cb9148e3d6fca3705ed4c239684c5d0c7900f5d
- Author: a.aleksanova <aaleksanova@localhost.localdomain>
- Date: Fri Apr 27 17:30:11 2018 +0300
- aaleksanova_iss9483_generate_price_list. Минификация
- commit df673465aec1e0a3a63ba57191d0f540929724cb
- Merge: 7900486 1418a70
- Author: aleksanova <aleksanova.94@mail.ru>
- Date: Fri Apr 27 17:45:10 2018 +0300
- merge master to aaleksanova_iss9483_generate_price_list
- # Conflicts:
- # includes/display/HTMLHead.php
- commit 7900486430b6fa7e396bf583fb8b18c058c40549
- Author: a.aleksanova <aaleksanova@localhost.localdomain>
- Date: Fri Apr 27 16:42:48 2018 +0300
- aaleksanova_iss9483_generate_price_list. Правка
- commit d1451a8668218c7933679a6130334d888fca7a22
- Author: a.aleksanova <aaleksanova@localhost.localdomain>
- Date: Fri Apr 27 16:11:54 2018 +0300
- aaleksanova_iss9483_generate_price_list. Добавлена возможность генерации прайс-листа со страниц каталога и админки
- commit 1418a704fb6a98639c319010d76b23caa95eba57
- Merge: b2c9141 5151219
- Author: Anna <moony_cadaver@mail.ru>
- Date: Fri Apr 27 14:26:25 2018 +0300
- anna_iss9130_new_wine_refers
- commit 5151219623e526f82f48baf6f75084862bdad37e
- Merge: ac458d9 b2c9141
- Author: Anna <moony_cadaver@mail.ru>
- Date: Fri Apr 27 14:25:06 2018 +0300
- Merge branch 'master' into anna_iss9130_new_wine_refers
- commit b2c914196b477316945b76cbd9f73cad9f0c9e44
- Merge: 404777e aa01a07
- Author: Alexander <allsilaevex@gmail.com>
- Date: Fri Apr 27 14:02:26 2018 +0300
- Merge branch 'asilaev_iss9487_logistics_payments_statistics_bugfix_2'
- commit aa01a0775d87f9b55591fd11a9a57cdc60c5fb37
- Merge: 673cfaa 404777e
- Author: Alexander <allsilaevex@gmail.com>
- Date: Fri Apr 27 14:02:19 2018 +0300
- Merge branch 'master' into asilaev_iss9487_logistics_payments_statistics_bugfix_2
- commit 673cfaa117f6f6ffd6ec92b0a689a836028901c2
- Author: Alexander <allsilaevex@gmail.com>
- Date: Fri Apr 27 14:00:07 2018 +0300
- asilaev_iss9487_logistics_payments_statistics_bugfix_2. Исправление бага.
- commit ac458d9f23eef0175d53d5039aa2e168c736a4f5
- Author: a.strok <astrok@localhost.localdomain>
- Date: Fri Apr 27 13:57:49 2018 +0300
- anna_iss9130_new_wine_refers Добавлены запросы для ln_cache_products.
- commit 4f7bba458af14afaf71ff2989efba8d8491e276e
- Merge: a59dfcc 404777e
- Author: Anna <moony_cadaver@mail.ru>
- Date: Fri Apr 27 13:28:44 2018 +0300
- Merge branch 'master' into anna_iss9130_new_wine_refers
- commit 404777e18a720de16812cf310299dd9b22be8d45
- Merge: 3406e27 fd82599
- Author: Anna <moony_cadaver@mail.ru>
- Date: Fri Apr 27 12:29:14 2018 +0300
- anna_iss9056_trappist_beer
- commit fd82599189b38b22ddc54fcc8e9368cffdb07712
- Merge: 0fc39b1 3406e27
- Author: Anna <moony_cadaver@mail.ru>
- Date: Fri Apr 27 12:26:45 2018 +0300
- Merge branch 'master' into anna_iss9056_trappist_beer
- commit 0fc39b12de20b7b1c6fd04b398d48d19145ea66b
- Author: a.strok <astrok@localhost.localdomain>
- Date: Fri Apr 27 12:24:58 2018 +0300
- anna_iss9056_trappist_beer Дополнительные правки по сео.
- commit 3406e27f5304145c12b0b7ac2645f417615911fb
- Author: testmaster <testmaster@localhost.localdomain>
- Date: Fri Apr 27 12:19:19 2018 +0300
- 9468, 9470, 9489 - сообщения о праздниках
- commit 8ac4740d3f163480994d72afb27ec1ea24193890
- Merge: 13188c8 884cb46
- Author: Anna <moony_cadaver@mail.ru>
- Date: Fri Apr 27 10:53:49 2018 +0300
- Merge branch 'master' into anna_iss9056_trappist_beer
- commit 884cb461fa119966ec21a33bea5478251420e9de
- Merge: 3db31fd cbe8564
- Author: Andrey Koteiko <andrei.koteiko@gmail.com>
- Date: Fri Apr 27 09:12:40 2018 +0300
- akoteyko_iss6438_link_wishlist6
- commit cbe8564e36c94d81cdbb8378190a03b601dc4a11
- Merge: 79f9fed 3db31fd
- Author: Andrey Koteiko <andrei.koteiko@gmail.com>
- Date: Fri Apr 27 09:12:08 2018 +0300
- слив мастера в akoteyko_iss6438_link_wishlist6
- commit 3db31fd522e3d517b63db7ca0258bb2f3245ced5
- Merge: 9bbc1da 50ced02
- Author: Andrey Koteiko <andrei.koteiko@gmail.com>
- Date: Fri Apr 27 09:03:57 2018 +0300
- akoteyko_iss9346_new_type_cennik3
- commit 50ced02d7b8c2ceac4eb817bf72058986814da24
- Author: a.koteyko <andre_k@tut.by>
- Date: Fri Apr 27 09:00:26 2018 +0300
- akoteyko_iss9346_new_type_cennik3 автоподбор размера шрифта у цены
- commit 498aba60a843726b5fa7cae8755aeef1783ddd53
- Author: a.koteyko <andre_k@tut.by>
- Date: Fri Apr 27 08:51:10 2018 +0300
- akoteyko_iss9346_new_type_cennik3 автоподбор размера шрифта у цены
- commit c7c96ac97fbdd43260f8bc3e587bf8ade4f495a3
- Author: a.koteyko <andre_k@tut.by>
- Date: Fri Apr 27 03:42:16 2018 +0300
- akoteyko_iss9346_new_type_cennik3 автоподбор размера шрифта у цены
- commit 79f9fed0ff09512f77b65d56fe2fcc67c5f45b30
- Author: a.koteyko <andre_k@tut.by>
- Date: Fri Apr 27 02:20:35 2018 +0300
- akoteyko_iss6438_link_wishlist6 избранное правки
- commit a59dfcc839edd304cc4583ad6e86ec9ffb1551d3
- Merge: aa90c4d 9bbc1da
- Author: Anna <moony_cadaver@mail.ru>
- Date: Thu Apr 26 20:28:38 2018 +0300
- Merge branch 'master' into anna_iss9130_new_wine_refers
- commit 9bbc1da4b56240437da02b567c22b0a80e0ed112
- Merge: 56cc97a 6926b4b
- Author: Anna <moony_cadaver@mail.ru>
- Date: Thu Apr 26 17:24:24 2018 +0300
- anna_iss9199_nonalco_wine_catalog
- commit 6926b4b925fa27afaf66a9c411296c4c2f53069a
- Merge: c287dc1 56cc97a
- Author: Anna <moony_cadaver@mail.ru>
- Date: Thu Apr 26 17:23:09 2018 +0300
- Merge branch 'master' into anna_iss9199_nonalco_wine_catalog
- commit 56cc97aca98b7a5d2c7e3d09ba304ee636e73598
- Merge: 64572c8 2b6079d
- Author: Anna <moony_cadaver@mail.ru>
- Date: Thu Apr 26 16:13:14 2018 +0300
- anna_iss8258_seo_categories_all
- commit 2b6079ded43e7614b4c0e02c8ae5b3580afb8d7e
- Author: a.strok <astrok@localhost.localdomain>
- Date: Thu Apr 26 16:10:22 2018 +0300
- anna_iss8258_seo_categories_all Правка пробелов в коде.
- commit aae6ade1ffb32231b6900a9c029a06229acc3859
- Merge: 2c3b786 64572c8
- Author: Anna <moony_cadaver@mail.ru>
- Date: Thu Apr 26 16:01:17 2018 +0300
- Merge branch 'master' into anna_iss8258_seo_categories_all
- commit 64572c880063e01e04a829aec7a8bd6d7619b882
- Merge: 3681c74 747eb72
- Author: Alexander <allsilaevex@gmail.com>
- Date: Thu Apr 26 15:58:37 2018 +0300
- Merge branch 'asilaev_iss9487_logistics_payments_statistics_bugfix'
- commit 747eb72e9b69a90cf3cec7e59d435ac23e3456f5
- Merge: b0de0be 3681c74
- Author: Alexander <allsilaevex@gmail.com>
- Date: Thu Apr 26 15:58:21 2018 +0300
- Merge branch 'master' into asilaev_iss9487_logistics_payments_statistics_bugfix
- commit b0de0be62f5b92f0d1964fb818c2012fe0f3f1de
- Author: Alexander <allsilaevex@gmail.com>
- Date: Thu Apr 26 15:55:44 2018 +0300
- asilaev_iss9487_logistics_payments_statistics_bugfix. Детализация оплаты в маршрутах.
- commit 166f2d89f580199672de010b7fd63c538684597b
- Author: Alexander <allsilaevex@gmail.com>
- Date: Thu Apr 26 15:54:23 2018 +0300
- Исправление опечатки в конфиге.
- commit 3681c742b89dac910410b28af3bf94a08e6badc3
- Author: testmaster <testmaster@localhost.localdomain>
- Date: Thu Apr 26 15:16:54 2018 +0300
- 9481. Новый помощник в бутике
- commit a9273f939e4cddcd79d153a33655b81f2ef88eeb
- Merge: 67c36ab 0318829
- Author: gartur_local <a.gubichev@neymart.ru>
- Date: Thu Apr 26 15:11:42 2018 +0300
- gartur_iss9497_disableChangeSupplier
- commit b4a159069509971f5e2321cff641c44a4cc1ef7e
- Author: Alexander <allsilaevex@gmail.com>
- Date: Thu Apr 26 15:07:16 2018 +0300
- Правки статистики по поездкам.
- commit 03188291b54149025fa28b563551264ad6ddee0f
- Author: Artur <a.gubichev@neymart.ru>
- Date: Thu Apr 26 15:06:07 2018 +0300
- gartur_iss9497_disableChangeSupplier убрал сброс поставщика-склада при отмене заказа
- commit c287dc1664f08ae85a57b596f544cf2614445529
- Merge: 4c39cf2 67c36ab
- Author: Anna <moony_cadaver@mail.ru>
- Date: Thu Apr 26 13:59:49 2018 +0300
- Merge branch 'master' into anna_iss9199_nonalco_wine_catalog
- commit 4c39cf21fd62dfc0caffeeceb3bb645178abe271
- Author: a.strok <astrok@localhost.localdomain>
- Date: Thu Apr 26 13:47:55 2018 +0300
- anna_iss9199_nonalco_wine_catalog Новый раздел "Безалкогольное вино": доработка сео.
- commit 67c36abee858053d7f185d701cf5f6d31e564f55
- Merge: 8be3ac6 d40ddc2
- Author: Alexander <allsilaevex@gmail.com>
- Date: Thu Apr 26 13:28:07 2018 +0300
- Merge branch 'asilaev_iss9493_rights_to_change_statuses_bugfix'
- commit d40ddc2664d436f04ea7fc77cc9f87bf4c56c428
- Author: Alexander <allsilaevex@gmail.com>
- Date: Thu Apr 26 13:27:23 2018 +0300
- asilaev_iss9493_rights_to_change_statuses_bugfix. Исправление бага со статусами в логистике.
- commit 29608799434988f82236b0380ed64e858c4abb40
- Author: a.strok <astrok@localhost.localdomain>
- Date: Thu Apr 26 11:36:39 2018 +0300
- anna_iss9199_nonalco_wine_catalog Новый раздел "Безалкогольное вино".
- commit 8be3ac690084ae439e67970ff8eda296e47f0164
- Merge: 31c5918 5725b00
- Author: Anna <moony_cadaver@mail.ru>
- Date: Thu Apr 26 11:07:43 2018 +0300
- anna_iss9343_optimize_lnnavtree
- commit 5725b001995e956234482ef57ce7c575855e69a2
- Author: Anna <moony_cadaver@mail.ru>
- Date: Thu Apr 26 10:37:36 2018 +0300
- merge master into anna_iss9343_optimize_lnnavtree
- commit 928f53665a2ce3cac2a4aa34f6ad2f363891e690
- Merge: 4746115 31c5918
- Author: Anna <moony_cadaver@mail.ru>
- Date: Thu Apr 26 10:37:16 2018 +0300
- Merge branch 'master' into anna_iss9343_optimize_lnnavtree
- commit 474611569f3449824e9f1db678306a4874131713
- Author: a.strok <astrok@localhost.localdomain>
- Date: Thu Apr 26 01:38:09 2018 +0300
- anna_iss9343_optimize_lnnavtree Оптимизация запроса для lnnavtree.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement