Administrator / test_3

5 commits

test
766bd93b

Yarik authored
2016-02-05 18:03:08 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
8ac2f37e
```
# Conflicts:
#	backend/web/js/option.js
#	frontend/views/accounts/general.php
#	frontend/views/layouts/admin.php
```
Yarik authored
2016-02-05 16:28:10 +0200
Browse Dir »
test
fa67310a

Yarik authored
2016-02-05 16:24:38 +0200
Browse Dir »
test
5f49082a

Yarik authored
2016-02-05 16:20:03 +0200
Browse Dir »
add Vitaliy's widgets
f0f915df

Administrator authored
2016-02-05 16:19:21 +0200
Browse Dir »

10 commits

Merge remote-tracking branch 'origin/master'
04b7173a

Yarik authored
2016-02-04 16:30:05 +0200
Browse Dir »
test
f6a2a0d5

Yarik authored
2016-02-04 16:11:57 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
3c71c462

Administrator authored
2016-02-04 15:48:51 +0200
Browse Dir »
add Vitaliy's widgets
01a3e990

Administrator authored
2016-02-04 15:48:39 +0200
Browse Dir »
test
4f1adc01

Yarik authored
2016-02-04 15:06:11 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
df45665b

Yarik authored
2016-02-04 14:33:48 +0200
Browse Dir »
test
f819c230

Yarik authored
2016-02-04 14:26:47 +0200
Browse Dir »
add Vitaliy's widgets
ea8c5991

Administrator authored
2016-02-04 14:26:00 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
cea1aeb3

Yarik authored
2016-02-04 11:06:06 +0200
Browse Dir »
add Vitaliy's widgets
bf9aa90f

Administrator authored
2016-02-04 10:21:02 +0200
Browse Dir »

7 commits

test
eacb83cc

Yarik authored
2016-02-03 16:48:04 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
d04fea85

Administrator authored
2016-02-03 15:40:40 +0200
Browse Dir »
add Vitaliy's widgets
ab6d9045

Administrator authored
2016-02-03 15:40:26 +0200
Browse Dir »
test
e9013fc3

Yarik authored
2016-02-03 15:39:41 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
84a35097

Yarik authored
2016-02-03 10:48:44 +0200
Browse Dir »
test
51e0a262

Yarik authored
2016-02-03 10:43:59 +0200
Browse Dir »
add Vitaliy's widgets
06d508f3

Administrator authored
2016-02-03 10:42:51 +0200
Browse Dir »

1 commit

add field v.1
29b842c0

Administrator authored
2016-02-02 00:36:04 +0200
Browse Dir »

3 commits

Merge remote-tracking branch 'origin/master' ...
3d163909
```
# Conflicts:
#	frontend/controllers/AccountsController.php
```
Yarik authored
2016-01-29 16:35:37 +0200
Browse Dir »
test
7fc05ac5

Yarik authored
2016-01-29 16:32:26 +0200
Browse Dir »
add field v.1
70abf3e7

Administrator authored
2016-01-29 16:11:31 +0200
Browse Dir »

8 commits

test
9845be03

Yarik authored
2016-01-28 17:28:49 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
6af40417

Administrator authored
2016-01-28 16:54:41 +0200
Browse Dir »
test
fbdb1f1c

Yarik authored
2016-01-28 16:32:31 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
045e74ac

Administrator authored
2016-01-28 11:07:43 +0200
Browse Dir »
test
bdee266b

Yarik authored
2016-01-28 10:57:21 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
61afd72b
```
Conflicts:
	frontend/views/layouts/main.php
```
Administrator authored
2016-01-28 10:43:54 +0200
Browse Dir »
test
97fb6489

Yarik authored
2016-01-28 10:41:06 +0200
Browse Dir »
firs page
2ff00662

Administrator authored
2016-01-28 10:38:11 +0200
Browse Dir »

3 commits

firs page
8e7a541c

Administrator authored
2016-01-27 16:06:44 +0200
Browse Dir »
firs page
bcd66c2d

Administrator authored
2016-01-27 14:36:52 +0200
Browse Dir »
firs page
6e1510b2

Administrator authored
2016-01-27 11:08:23 +0200
Browse Dir »

3 commits

firs page
89758aeb

Administrator authored
2016-01-26 14:25:37 +0200
Browse Dir »
firs page
0ae6f109

Administrator authored
2016-01-26 13:55:19 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
88def988

Administrator authored
2016-01-26 12:38:02 +0200
Browse Dir »