Yarik / ecreators

30 Dec, 2016

11 commits

Merge remote-tracking branch 'origin/master'
423c02d3

Yarik authored
2016-12-30 15:06:50 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
0eff1ddc

Alexey Boroda authored
2016-12-30 15:06:26 +0200
Browse Dir »
-Total
d12a1030

Alexey Boroda authored
2016-12-30 15:06:19 +0200
Browse Dir »
Admin
aa22879e

Yarik authored
2016-12-30 15:06:15 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
f9e2ff5e
```
# Conflicts:
#	frontend/controllers/CabinetController.php
```
Yarik authored
2016-12-30 14:57:13 +0200
Browse Dir »
-Kind of ready
7af4d34d

Alexey Boroda authored
2016-12-30 14:56:32 +0200
Browse Dir »
Creative roles
885e52f4

Yarik authored
2016-12-30 14:53:35 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
669a8f62
```
# Conflicts:
#	frontend/controllers/CabinetController.php
```
Alexey Boroda authored
2016-12-30 14:31:33 +0200
Browse Dir »
-Reports
3ebbbaa9

Alexey Boroda authored
2016-12-30 14:29:22 +0200
Browse Dir »
Creative roles
3fd7d43c

Yarik authored
2016-12-30 14:27:14 +0200
Browse Dir »
Migration
51ca23d7

Yarik authored
2016-12-30 12:47:53 +0200
Browse Dir »

29 Dec, 2016

2 commits

Merge remote-tracking branch 'origin/master'
02aafad3

Alexey Boroda authored
2016-12-29 14:02:36 +0200
Browse Dir »
-Added columns
7e633825

Alexey Boroda authored
2016-12-29 13:40:36 +0200
Browse Dir »

28 Dec, 2016

9 commits

Merge remote-tracking branch 'origin/master'
c96be096

Yarik authored
2016-12-28 14:21:53 +0200
Browse Dir »
Play count
a9f0427e

Yarik authored
2016-12-28 14:21:48 +0200
Browse Dir »
-Last
de0f55ab

Alexey Boroda authored
2016-12-28 14:05:24 +0200
Browse Dir »
-Royalty and table
00b29a46

Alexey Boroda authored
2016-12-28 13:55:55 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
e5923f6e

Yarik authored
2016-12-28 13:09:54 +0200
Browse Dir »
Forms
3533e4e9

Yarik authored
2016-12-28 13:09:48 +0200
Browse Dir »
-Update ready
9e523ea9

Alexey Boroda authored
2016-12-28 12:52:09 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
26726891

Yarik authored
2016-12-28 12:01:52 +0200
Browse Dir »
Users
cab22f38

Yarik authored
2016-12-28 12:01:46 +0200
Browse Dir »

27 Dec, 2016

18 commits

-List ready
aebb725c

Alexey Boroda authored
2016-12-27 20:02:07 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
512dbac4

Alexey Boroda authored
2016-12-27 19:32:21 +0200
Browse Dir »
-Delete action added
0d91ef5d

Alexey Boroda authored
2016-12-27 19:32:15 +0200
Browse Dir »
first commit on new server
62e4514d

Administrator authored
2016-12-27 19:31:44 +0200
Browse Dir »
Html
caf85dfb

Yarik authored
2016-12-27 18:49:00 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
a5a4487e

Yarik authored
2016-12-27 18:36:48 +0200
Browse Dir »
Property
43cb22d0

Yarik authored
2016-12-27 18:36:43 +0200
Browse Dir »
-Alter migration
be900c94

Alexey Boroda authored
2016-12-27 18:35:19 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
28855799
```
# Conflicts:
#	frontend/controllers/CabinetController.php
#	frontend/models/IntellectualProperty.php
```
Yarik authored
2016-12-27 18:16:11 +0200
Browse Dir »
Property
b73541b6

Yarik authored
2016-12-27 18:14:18 +0200
Browse Dir »
-Greed ready
fb0f9630

Alexey Boroda authored
2016-12-27 18:09:54 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
faa56fa2
```
# Conflicts:
#	frontend/views/cabinet/index.php
```
Alexey Boroda authored
2016-12-27 17:27:34 +0200
Browse Dir »
-Form ajax ready
dcfb3d5c

Alexey Boroda authored
2016-12-27 17:26:18 +0200
Browse Dir »
Layout
563c7f76

Yarik authored
2016-12-27 17:25:04 +0200
Browse Dir »
Layout
7f0970a7

Yarik authored
2016-12-27 17:24:17 +0200
Browse Dir »
Merge
d840497c

Yarik authored
2016-12-27 16:26:35 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
6d90918c
```
# Conflicts:
#	frontend/views/cabinet/index.php
```
Yarik authored
2016-12-27 16:24:00 +0200
Browse Dir »
-First commit
fb900d40

Alexey Boroda authored
2016-12-27 16:17:09 +0200
Browse Dir »