Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #4

Open
wants to merge 1,073 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
1073 commits
Select commit Hold shift + click to select a range
cad2c14
improve view order_details
qinghe May 18, 2016
c1ab101
remove product detail in order list
qinghe May 18, 2016
27e4d43
wrap order_items with class="table-responsive"
qinghe May 18, 2016
b986e54
improve dialog css
qinghe May 18, 2016
b80798a
add section flash message
qinghe May 19, 2016
5e9ad15
add section mobile dialog
qinghe May 20, 2016
aa3a324
add param for dialog_close
qinghe May 20, 2016
cc76a62
remove debug info
qinghe May 20, 2016
5a0cc85
improve effect infintedscroll
qinghe May 20, 2016
860d5ce
use ias instead of infintedscroll, because of wiared problem
qinghe May 20, 2016
39bff4f
improve infinated scroll
qinghe May 20, 2016
7695758
disable infinitedscroll spinner
qinghe May 20, 2016
ba82935
retry enable spinner
qinghe May 20, 2016
40ac990
disable spinner
qinghe May 20, 2016
98ee66c
disable spinner
qinghe May 20, 2016
99bf29f
disable spinner finally
qinghe May 20, 2016
bf751cd
upgrade to spree 3-1, add feature related product
qinghe May 21, 2016
17bd17a
complete feature related_products
qinghe May 23, 2016
1f1930f
remove useless migrations
qinghe May 24, 2016
294df98
use related_products_in_taxon instead of relation_type
qinghe May 24, 2016
e398863
fix current_product_tag, current_post_tag
qinghe May 24, 2016
09e0d44
fix related_products pagination
qinghe May 24, 2016
dd6b155
remove byebug from code
qinghe May 24, 2016
8a459a1
fix class namespace
qinghe May 24, 2016
2e49b80
user [].slice instead [].fetch, fetch would cause exception if index …
qinghe May 25, 2016
5cacd4d
add feature sort products
qinghe May 25, 2016
3182eff
fix bug page.ancestors.pluck(:id), ancestors could be array
qinghe May 26, 2016
1091cea
fix spree_variant_options
qinghe May 26, 2016
c516bd4
remove feature global_taxons
qinghe May 30, 2016
942b074
add feature copy_theme to other store
qinghe May 30, 2016
935e553
add feature slider with arrow nav
qinghe May 30, 2016
7a0ae36
add feature pagination style pn
qinghe May 30, 2016
104fd9c
fix bug caused by menu is nil
qinghe May 31, 2016
410b8df
add feature next/previous product
qinghe May 31, 2016
bbb1317
add column page_layouts.data_source_order_by
qinghe May 31, 2016
8f6faa3
fix error for next/previous post
qinghe May 31, 2016
39c007e
add feature edit data_filter, data_source_order_by
qinghe May 31, 2016
98fb205
rename data_source taxon to taxonomy
qinghe May 31, 2016
8065a58
add feature data_source taxon
qinghe May 31, 2016
541bb6b
add feature splash screen
qinghe Jun 2, 2016
d96b8c3
improve related taxa feature
qinghe Jun 3, 2016
2c5efa7
Merge branch 'master' of github.com:RuanShan/spree_abc
qinghe Jun 3, 2016
6480de9
improve feature full screen
qinghe Jun 3, 2016
f4e9340
add feature full_screen
qinghe Jun 4, 2016
117b230
fix build pvalue for backgournd-size
qinghe Jun 7, 2016
16e0ec7
add feature ck_effect_page
qinghe Jun 7, 2016
97d32e5
improve feature ckeditor effect page
qinghe Jun 7, 2016
3e20808
improve feature slider for fullwidth
Jun 7, 2016
4350dad
add params slides for slider
Jun 7, 2016
95861fc
fix slider_scrolling
Jun 7, 2016
b6187e9
fix slider_scrolling
qinghe Jun 7, 2016
628feea
add html set_timeout
qinghe Jun 13, 2016
60aa21b
add feature scerren logo auto enter
qinghe Jun 13, 2016
088657c
enlarge post file max size 20M
qinghe Jun 13, 2016
c13cecb
fix screen logo timeout event
qinghe Jun 13, 2016
59a0199
allow ckeditor tag attribute data
qinghe Oct 11, 2016
1848430
add feature ckeditor a hover effect
qinghe Oct 11, 2016
b0f53af
improve ck_effect a hover.
qinghe Oct 12, 2016
63b1390
improve ckeditor hover effect
qinghe Oct 12, 2016
fae3875
allow ckeditor p style
qinghe Oct 12, 2016
f273d0e
support ckeditor p[id]
qinghe Oct 13, 2016
0a0883f
add seed opacity.rb
qinghe Oct 15, 2016
c032f67
add section product attribute
qinghe Nov 20, 2016
45e5b94
fix product_attribute
qinghe Nov 20, 2016
2f46157
fix bug payment_method.available_on_front_end
qinghe Feb 20, 2017
9fdea9d
upgrade spree
qinghe Feb 21, 2017
449f275
fix tracker.current
qinghe Mar 1, 2017
fdff3a3
add feature spree_theme/file_theme
qinghe Mar 3, 2017
1480e95
fix pingpp missing assets
qinghe Mar 3, 2017
12dd092
fix simple theme
qinghe Mar 3, 2017
f0dee94
fix simple theme
qinghe Mar 3, 2017
08c8319
1. add gem omniauth
qinghe Mar 11, 2017
f5affbb
add wechat config
qinghe Mar 11, 2017
b1ec535
remove soft links
qinghe Mar 11, 2017
5bfd7d7
add *.dalianshops.com into gitignore
qinghe Mar 11, 2017
f89c233
fix task create_links
qinghe Mar 11, 2017
905868b
improve task create_links
qinghe Mar 11, 2017
3fc69b1
improve create sitemap
qinghe Mar 11, 2017
c8961f5
improve create sitemap
qinghe Mar 11, 2017
7d70b66
improve create sitemap
qinghe Mar 11, 2017
b2ee23c
improve page title, support meta_title
qinghe Mar 11, 2017
ea9cf71
add feature product detail
qinghe Mar 13, 2017
80624f8
product properties th valign top
qinghe Mar 15, 2017
4658fc8
fix bug set fullpath after replace @menu
qinghe Jun 7, 2017
da0e845
添加路径调试信息
qinghe Aug 18, 2017
15bf7a7
继续添加调试信息
qinghe Aug 18, 2017
1ca355d
添加更多调试信息
qinghe Aug 18, 2017
b674b79
修正首页产品路径生成不对,无法访问问题。
qinghe Aug 18, 2017
4ac6a5f
add doc threadsafe
qinghe Dec 7, 2017
0209a0a
Merge branch 'master' of github.com:RuanShan/spree_abc
qinghe Dec 7, 2017
b007f4e
doing improve spree_theme
qinghe Dec 7, 2017
46a2dc3
improve multi site for development
qinghe Dec 7, 2017
32e2edc
add application_record.rb
qinghe Dec 13, 2017
12c8bd3
upgrade
qinghe Dec 14, 2017
8a660e1
Merge branch 'master' of github.com:RuanShan/spree_abc
qinghe Dec 14, 2017
032f76e
merge with branch 34
qinghe Dec 16, 2017
6c22b13
update gemfile.lock
qinghe Dec 16, 2017
fe11abc
upgrade master spree3.4
qinghe Dec 16, 2017
424d628
fix missing method
qinghe Dec 16, 2017
5fc1346
add aliyun_oss_sync
qinghe Dec 16, 2017
68b86fe
remove aliyun_oss_sync from gemfile
qinghe Dec 16, 2017
7e5d37f
update gemfile
qinghe Dec 16, 2017
80aae94
fix page.icon
qinghe Dec 16, 2017
bcb1fe3
fix tag page.attribute(:icon)
qinghe Dec 16, 2017
a7dc553
fix aliyun_oss for taxon_ico
qinghe Dec 16, 2017
fa3ecb4
add gem aliyun_sdk
qinghe Dec 17, 2017
a34f045
add belongs_to required: false
qinghe Dec 17, 2017
47cfbbb
fix missing js
qinghe Dec 17, 2017
1206234
add jquery.validate
qinghe Dec 17, 2017
c83f572
add missing files
qinghe Dec 17, 2017
c3c6e64
add tasks
qinghe Dec 17, 2017
654d1d6
fix association
qinghe Dec 18, 2017
df0414b
add template_theme task
qinghe Dec 18, 2017
c4fa290
fix editor
qinghe Dec 18, 2017
c570b21
Merge branch 'master' of github.com:RuanShan/spree_abc
qinghe Dec 18, 2017
89a8c6b
fix template config
qinghe Dec 18, 2017
0dad09e
fix taxon,product friendly_id
qinghe Dec 18, 2017
d7eba96
improve feature reset datasource
qinghe Dec 19, 2017
25026df
remove products order by created_at desc
qinghe Dec 19, 2017
59908b8
bind multi_site_system in gem spree_api
qinghe Dec 19, 2017
63de31d
add missing translation
qinghe Dec 19, 2017
45f2163
fix taxon and products list view
qinghe Dec 19, 2017
2d16f2d
try to fix taxon_products
qinghe Dec 19, 2017
1015191
try to improve specific_taxon
qinghe Dec 23, 2017
1d87a6d
fix iphone safari
qinghe Jan 8, 2018
cfaf8fa
upgrade jquery.firger.16
qinghe Jan 8, 2018
00bf393
sidr support safari touchstart
qinghe Jan 8, 2018
8de0af2
use touchstart instead tap
qinghe Jan 8, 2018
fbc25c0
hide sidr overlay on event tap, instead touchstart.
qinghe Jan 8, 2018
13b701d
fix trigger below a link after hide sidr_overlay
qinghe Jan 8, 2018
097524c
remove debug code
qinghe Jan 8, 2018
c85aac7
fix hide sidr_overlay trigger a below it
qinghe Jan 8, 2018
6202fe4
upgrade turbolinks 5
qinghe Jan 9, 2018
2ff141a
upgrade to turbolinks 5
qinghe Jan 9, 2018
66a31ae
fix infinitescroll
qinghe Jan 9, 2018
f73d4d3
add txt remove-specific-taxon
qinghe Jan 18, 2018
6a4470c
support products order by created_at
qinghe Jan 18, 2018
241f456
fix bug build_searcher_param
qinghe Jan 18, 2018
fb00004
use debug@getstore.cn as exception recepient
qinghe Jan 21, 2018
b2ae3f4
add weixin share feature
qinghe Jan 21, 2018
dddc360
remove wechat_api from template_theme controller
qinghe Jan 21, 2018
420607c
add weixin support
qinghe Jan 21, 2018
f20e4ea
use name weixin instead of wechat
qinghe Jan 21, 2018
93c4ae1
fix weixin_support js path
qinghe Jan 21, 2018
75c0e93
update config wechat
qinghe Jan 21, 2018
e614617
add missing png into precompile
qinghe Jan 21, 2018
cbe5213
add missing file
qinghe Jan 21, 2018
370baa9
fix image path
qinghe Jan 21, 2018
31d27a6
mv g_client_info in head, as well as all.js, turbolink complain about in
qinghe Jan 21, 2018
960d9a8
debug wechat jssdk
qinghe Jan 21, 2018
bcce458
add feature wechat share
qinghe Jan 23, 2018
cfe0480
fix wechat config error
qinghe Jan 23, 2018
f295b10
fix weixin share config
qinghe Jan 23, 2018
9501663
set wechat encrypt_mode false
qinghe Jan 23, 2018
d6f2261
online debug weixin share for design.getstore.cn
qinghe Jan 23, 2018
599075f
update wxshare image size
qinghe Jan 23, 2018
88a5be1
Merge branch 'master' of github.com:RuanShan/spree_abc
qinghe Jan 23, 2018
b954a2f
update noimage/mediaum.png for wechat share
qinghe Jan 23, 2018
f0ebcc1
fix wechat share image
qinghe Jan 23, 2018
b17f977
Merge branch 'master' of github.com:RuanShan/spree_abc
qinghe Jan 23, 2018
8238277
fix bug missing simple_image_url
qinghe Jan 23, 2018
33d3972
weixin share js trubolinks-track=reload
qinghe Jan 23, 2018
9b7858c
fix weixin support
qinghe Jan 23, 2018
8b6c0a3
disable wechat debug
qinghe Jan 23, 2018
24cf5cc
enable api_authorization
qinghe Feb 28, 2018
89bfe43
set Spree::Api::Config.requires_authentication = true
qinghe Feb 28, 2018
d1f0fb6
fix theme duplicate error, caused by current_template_release required
qinghe Feb 28, 2018
ec5eae8
fix original_template_theme bug, which cause incorrect
qinghe Mar 2, 2018
e93956d
try to update files
qinghe Mar 2, 2018
462b732
Merge branch 'master' of github.com:RuanShan/spree_abc
qinghe Mar 2, 2018
1228665
fix param_value bug
qinghe Mar 7, 2018
06fc00a
remve param_value assocation section, it is incorrect
qinghe Mar 7, 2018
e229b35
config ckeditor, enable style of a
qinghe Mar 8, 2018
b7c0433
config.js ckeditor
qinghe Mar 9, 2018
b01d764
fix precompile ckeditor/config.js
qinghe Mar 9, 2018
55a777c
fix ckeditor/config.js
qinghe Mar 9, 2018
7530999
add some links with turbolinks:false in editor
qinghe Mar 10, 2018
2563511
add api sign_in
qinghe Mar 13, 2018
400b48d
add feature custom image size
qinghe Mar 14, 2018
cd28d09
add migration
qinghe Mar 14, 2018
d23128f
improve image_style_param feature
qinghe Mar 14, 2018
6a940b9
rename image_style_param to image_param
qinghe Mar 14, 2018
8adc426
add column effect_param
qinghe Mar 15, 2018
71bedf6
add hover bigger feature
qinghe Mar 15, 2018
6e3db45
add sample for edit page_layout.image_param
qinghe Mar 15, 2018
3b272cb
enable custom aliyun image size, style name start with '@'
qinghe Mar 15, 2018
92c34a9
fix hover effect container css
qinghe Mar 15, 2018
f80c4a5
add section effect_fadein
qinghe Mar 15, 2018
064cbd3
fix effect hover_bigger
qinghe Mar 15, 2018
3f95499
try to fix effect_slider loadding effect
qinghe Mar 19, 2018
130bbf9
Merge branch 'master' of github.com:RuanShan/spree_abc
qinghe Mar 19, 2018
d3195f8
recovery effect_jssor_slider to effect_slider
qinghe Mar 19, 2018
9545c56
try to improve slider
qinghe Mar 21, 2018
1d38378
recompile ckeditor asset
qinghe Apr 23, 2018
095e0d0
try to custom ckeditor
qinghe Apr 23, 2018
789c7a0
fix import ckeditor js twice
qinghe Apr 24, 2018
b244fa8
添加swiper
qinghe Apr 24, 2018
b32c85d
fix section swiper
qinghe Apr 25, 2018
740feb1
fix indexes on friendly_id
qinghe Apr 25, 2018
c63146f
fix migration
qinghe Apr 25, 2018
15c21e3
add missing remove index
qinghe Apr 25, 2018
83b452b
try to extend friendly_id index width
qinghe Apr 25, 2018
bcf4aa4
set slug max lenght is 30
qinghe Apr 25, 2018
09adf60
fix swiper
qinghe Apr 25, 2018
c099297
add missing js for post feature
qinghe Apr 26, 2018
3cfd063
fix edit post taxon
qinghe Apr 27, 2018
d141453
fix admin/posts/edit
qinghe Apr 27, 2018
3ae9bd3
improve editor css
qinghe Apr 27, 2018
f1de3bf
improve editor css
qinghe Apr 27, 2018
3c09309
fix bug update_data_source :taxonomy
qinghe Apr 27, 2018
ecd8042
add date format simple_date
qinghe Apr 27, 2018
366635e
fix post time
qinghe Apr 27, 2018
bbbefe8
add missing date format
qinghe Apr 27, 2018
bb31799
fix missing date format :simple_date
qinghe Apr 27, 2018
2cbef3b
fix typo related_taxa, add feature post detail link
qinghe Apr 27, 2018
a5eab6f
add section post_attribute
qinghe Apr 27, 2018
a151abd
fix bugs
qinghe Apr 27, 2018
4b16976
fix typo this -> self
qinghe Apr 27, 2018
5841103
doing section pagination container
qinghe Apr 27, 2018
da42348
add section container-with-pagination
qinghe Apr 27, 2018
168965d
add pagination container
qinghe Apr 28, 2018
8f1c82f
add post alias_attribute name
qinghe Apr 28, 2018
b792246
add post_tag name
qinghe Apr 28, 2018
39bc31f
add feature post_attribute.attribute_alternative
qinghe Apr 28, 2018
028ccca
fix clickable post cover width bug
qinghe May 2, 2018
a779c16
add theme feature page.alternative
qinghe May 2, 2018
0e1c509
correct attribute placeholder/alternative
qinghe May 2, 2018
cf6ef28
add clickable page attribute 'selected' class
qinghe May 2, 2018
59c639d
add feature ck_effect_jhover
qinghe May 2, 2018
9d3ca71
improve ck_effect_hover feature, support background-image
qinghe May 2, 2018
6dc0263
fix feature ck_effect_hover
qinghe May 2, 2018
a2b49b8
swiper autoplay 3000
qinghe May 3, 2018
8f21dea
fix copy_from_id when copy a template_theme
qinghe May 3, 2018
d852008
enable default site for unknow domain
qinghe May 3, 2018
e388199
enable preview for any shop
qinghe May 3, 2018
f7353ad
fix feature enable preview for each shop
qinghe May 3, 2018
e6517b0
add section piece param backgroun-size
qinghe May 5, 2018
a9cfa23
post 按照创建时间倒序
qinghe May 10, 2018
39c6264
支持百度统计
qinghe Jun 4, 2018
2323352
reload baidu tongji in turbolinks page
qinghe Jun 5, 2018
61cca01
support turblelinks for baidu
qinghe Jun 5, 2018
bbd6bd5
禁止 'X-Frame-Options' => 'SAMEORIGIN'
qinghe Jun 6, 2018
0bcd1ef
test
qinghe Jun 6, 2018
7192a40
set x-frame-options
qinghe Jun 6, 2018
1082e73
delete x-frame-option in action
qinghe Jun 6, 2018
81d1bd6
realdesign 360 推广
qinghe Jun 6, 2018
31225cd
fix ppp
qinghe Oct 27, 2018
9ec271d
update connection
qinghe Nov 26, 2018
a288b22
Merge branch 'master' of github.com:RuanShan/spree_abc
qinghe Nov 26, 2018
c47c578
workers =1, jpos need more memory
qinghe Sep 18, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update connection
  • Loading branch information
qinghe committed Nov 26, 2018
commit 9ec271dbfdda67812c9d0ea5626464faccaee877
2 changes: 1 addition & 1 deletion config/database.yml
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ aliyun_staging:
database: spree_abc_staging
pool: 10
username: root
password:
password: root
socket: /tmp/mysql.sock

production: