Yarik / kbenergy

10 commits

Merge remote-tracking branch 'origin/master' ...
60c95ec0
```
# Conflicts:
#	frontend/views/layouts/main.php
```
Yarik authored
2017-05-12 18:49:38 +0300
Browse Dir »
Fixes
35b13e82

Yarik authored
2017-05-12 18:48:45 +0300
Browse Dir »
-Some bug fixes
9537a122

Alexey Boroda authored
2017-05-12 18:39:41 +0300
Browse Dir »
-Cabinet ready 2
aa61d143

Alexey Boroda authored
2017-05-12 17:16:18 +0300
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
0a6545c6
```
# Conflicts:
#	frontend/views/account/wishlist.php
```
Alexey Boroda authored
2017-05-12 17:13:11 +0300
Browse Dir »
-Cabinet ready
ac6e2c67

Alexey Boroda authored
2017-05-12 17:10:39 +0300
Browse Dir »
Обратная связь 2
17107850

Eugeny Galkovskiy authored
2017-05-12 17:07:51 +0300
Browse Dir »
Обратная связь 1
28d1e978

Eugeny Galkovskiy authored
2017-05-12 16:41:46 +0300
Browse Dir »
Модалка "вход", плашка "топ" для товаров
88fcbfaf

Eugeny Galkovskiy authored
2017-05-12 16:15:01 +0300
Browse Dir »
-User's data form ready
db63ba79

Alexey Boroda authored
2017-05-12 12:21:42 +0300
Browse Dir »

12 commits

Checkout top
94a1dbd2

Yarik authored
2017-05-11 19:33:04 +0300
Browse Dir »
Merge remote-tracking branch 'origin/master'
b4cb70e0

Alexey Boroda authored
2017-05-11 18:44:35 +0300
Browse Dir »
-User's password change done
fa8dafba

Alexey Boroda authored
2017-05-11 18:44:18 +0300
Browse Dir »
Search
8e13c18c

Yarik authored
2017-05-11 18:33:12 +0300
Browse Dir »
Merge remote-tracking branch 'origin/master'
6c2a03b9

Alexey Boroda authored
2017-05-11 15:58:16 +0300
Browse Dir »
-User's order page in process
6628fe31

Alexey Boroda authored
2017-05-11 15:57:56 +0300
Browse Dir »
Fixed
543f1653

Yarik authored
2017-05-11 15:56:05 +0300
Browse Dir »
Merge remote-tracking branch 'origin/master'
c316e881

Alexey Boroda authored
2017-05-11 14:13:25 +0300
Browse Dir »
-Cabinet started
a337a53b

Alexey Boroda authored
2017-05-11 14:12:35 +0300
Browse Dir »
Merge remote-tracking branch 'origin/master'
358a1aac

Yarik authored
2017-05-11 12:05:41 +0300
Browse Dir »
Callback
977f4921

Yarik authored
2017-05-11 12:05:26 +0300
Browse Dir »
-Blog at main
05f1b3e2

Alexey Boroda authored
2017-05-11 12:03:04 +0300
Browse Dir »

12 commits

Fast buy
e67c95f9

Yarik authored
2017-05-10 18:34:43 +0300
Browse Dir »
Merge remote-tracking branch 'origin/master'
c8dead94

Yarik authored
2017-05-10 17:54:03 +0300
Browse Dir »
Fast buy
6c8e3423

Yarik authored
2017-05-10 17:53:01 +0300
Browse Dir »
Merge remote-tracking branch 'origin/master'
1740bcd4

Alexey Boroda authored
2017-05-10 17:37:40 +0300
Browse Dir »
-Blog ready
b6fc53c2

Alexey Boroda authored
2017-05-10 17:36:57 +0300
Browse Dir »
success modal 1
c4e39677

Eugeny Galkovskiy authored
2017-05-10 17:17:22 +0300
Browse Dir »
-Blog ready without search
3118df3a

Alexey Boroda authored
2017-05-10 16:53:03 +0300
Browse Dir »
уведомление о добавлении товара в корзину ...
78e4d284
```
fixed
```
Eugeny Galkovskiy authored
2017-05-10 13:13:07 +0300
Browse Dir »
Merge remote-tracking branch 'origin/master'
db63f58c

Eugeny Galkovskiy authored
2017-05-10 13:11:07 +0300
Browse Dir »
уведомление о добавлении товара в корзину
7f57ad53

Eugeny Galkovskiy authored
2017-05-10 13:10:22 +0300
Browse Dir »
Merge remote-tracking branch 'origin/master'
3c14407f

Alexey Boroda authored
2017-05-10 12:55:04 +0300
Browse Dir »
-Blog at frontend started
0d55c329

Alexey Boroda authored
2017-05-10 12:54:14 +0300
Browse Dir »

1 commit

3 commits

Merge remote-tracking branch 'origin/master' ...
cd5c4aa4
```
# Conflicts:
#	common/config/bootstrap.php
```
Yarik authored
2017-05-04 16:52:08 +0300
Browse Dir »
Basket
d7374030

Yarik authored
2017-05-04 16:51:13 +0300
Browse Dir »
badge_cart
7c917680

Eugeny Galkovskiy authored
2017-05-04 16:22:35 +0300
Browse Dir »

2 commits

Merge remote-tracking branch 'origin/master'
9838b24c

Yarik authored
2017-05-03 16:08:52 +0300
Browse Dir »
Special pages
8cd678be

Yarik authored
2017-05-03 16:08:40 +0300
Browse Dir »