UI_Chooseicons #7

Merged
merged 54 commits into from Apr 13, 2016

Projects

None yet

2 participants

@gcofficial
Contributor

No description provided.

gcofficial and others added some commits Mar 4, 2016
@gcofficial gcofficial add I_UI interface fdb3501
@gcofficial gcofficial some tests ed82ae3
@gcofficial gcofficial test 2 846e1fc
@gcofficial gcofficial make some fixes f7161ae
@gcofficial gcofficial upd 7e92732
@gcofficial gcofficial add space 40706d5
@gcofficial gcofficial UPD: style guid fixes 6507bdd
@lolitaofficial lolitaofficial UPD 8d7058b
@gcofficial gcofficial Add: travis things 171a3af
@gcofficial gcofficial Merge branch 'master' of https://github.com/gcofficial/cherry-framework 5bf8de7
@gcofficial gcofficial UPD: travis 4fd5803
@gcofficial gcofficial Add: ui-number 0014acc
@gcofficial gcofficial ADD: ui-collection 3a0169c
@gcofficial gcofficial ADD: required c7d27ef
@gcofficial gcofficial REMOVE: travis 46cdf13
@gcofficial gcofficial Merge remote-tracking branch 'CherryFramework/master' 37d4b8b
@gcofficial gcofficial Merge remote-tracking branch 'CherryFramework/master'
# Conflicts:
#
modules/cherry-ui-elements/inc/ui-elements/ui-media/assets/min/ui-media.
min.js
#	modules/cherry-ui-elements/inc/ui-elements/ui-media/assets/ui-media.js
c656415
@gcofficial gcofficial Travis d1b9256
@gcofficial gcofficial Local travis bcfee80
@gcofficial gcofficial Collection small fix 0a9b5e4
@gcofficial gcofficial ADD: page builder, taxonomy 095edc5
@gcofficial gcofficial UPD: add to ignore ad1d6ca
@gcofficial gcofficial Merge remote-tracking branch 'CherryFramework/master'
# Conflicts:
#
modules/cherry-ui-elements/inc/ui-elements/ui-media/assets/min/ui-media.
min.js
#	modules/cherry-ui-elements/inc/ui-elements/ui-media/assets/ui-media.js
#	modules/cherry-utility/inc/cherry-attributes-utilit.php
#	modules/cherry-utility/inc/cherry-media-utilit.php
#	modules/cherry-utility/inc/cherry-meta-data-utilit.php
72572e1
@gcofficial gcofficial UPD:Fix conflicts 4839b19
@gcofficial gcofficial UPD f999956
@gcofficial gcofficial ignore eb7cce4
@gcofficial gcofficial fix ignore 2638fc4
@gcofficial gcofficial ADD: page-builder, cherry-creator cfbf180
@gcofficial gcofficial Merge remote-tracking branch 'CherryFramework/master'
# Conflicts:
#	modules/cherry-js-core/assets/js/cherry-js-core.js
#	modules/cherry-utility/cherry-utility.php
#	modules/cherry-utility/inc/cherry-attributes-utilit.php
#	modules/cherry-utility/inc/cherry-media-utilit.php
#	modules/cherry-utility/inc/cherry-meta-data-utilit.php
#	modules/cherry-utility/inc/cherry-satellite-utilit.php
eb86c62
@gcofficial gcofficial UPD: Travis fixes 4a9b985
@gcofficial gcofficial UPD dca3ff1
@gcofficial gcofficial UPD: fix taxonomies 32b66ba
@gcofficial gcofficial UPD: new utility 89a94a3
@gcofficial gcofficial UPD: style guide fixes 6a64354
@gcofficial gcofficial ADD: new utilit f4436f0
@gcofficial gcofficial UPD 0b78bb6
@gcofficial gcofficial UPD: some fixes 5746d3b
@gcofficial gcofficial UPD: fix interface load 27d4411
@gcofficial gcofficial ADD, UPD: merging df4461d
@gcofficial gcofficial UPD: travis 3633b11
@gcofficial gcofficial UPD: travis 00bf7ce
@gcofficial gcofficial UPD: merge 12e9eb9
@gcofficial gcofficial ADD: ui-chooseicons 08025a8
@gcofficial gcofficial UPD: cherry-ui-elements.php 081fe51
@gcofficial gcofficial UPD: small fixes 21f982b
@gcofficial gcofficial UPD: merging 02d77a7
@gcofficial gcofficial UPD: fix meta problem b2ea4e0
@gcofficial gcofficial UPD: travis fixes baa41fc
@gcofficial gcofficial UPD: travis fixe 53dabcf
@gcofficial gcofficial UPD: travis fixe 2910e72
@gcofficial gcofficial UPD: travis fixes 88659b6
@gcofficial gcofficial UPD: travis fixes 6e8eab5
@gcofficial gcofficial UPD: merging 619a4ce
@gcofficial gcofficial UPD: travis fixes 4a3172f
@MakhonkoDenis MakhonkoDenis merged commit f10e816 into CherryFramework:develop Apr 13, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@MakhonkoDenis MakhonkoDenis pushed a commit that referenced this pull request Apr 15, 2016
makhonkodenis FIX: Refactoring code #7 da1f441
@MakhonkoDenis MakhonkoDenis pushed a commit that referenced this pull request Apr 18, 2016
makhonkodenis Refactoring code #7 c83bc97
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment