Matthew K. Fu JuYuan b4a2737407 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member ...

Conflicts:
	app/helpers/attribute_fields_helper.rb
	app/views/admin/infos/_form.html.erb
	config/locales/zh_tw.yml

2012-11-16 15:42:39 +08:00

..

ajax_setting.js

Changes for i18n yml

2012-09-24 09:02:45 +08:00

attribute_onoff.js

address field and text field convert

2012-11-15 17:23:39 +08:00

attribute_panel_select.js

address field and text field convert

2012-11-15 17:23:39 +08:00

input_module.js.erb

complete address field. still have javascript issue for fill back and display address ext fields in modal.

2012-11-16 15:36:08 +08:00

jquery.imagesloaded.js

Ray's changes, put the js for upload image component in a separate file

2012-04-24 12:15:32 +08:00

modal-preview.js

171 doesn't have bug with javascript remove log script

2012-10-01 19:05:23 +08:00

permission-checkbox.js

Fix approval setting ajax problem

2012-04-30 00:24:11 +08:00

ploy_input_field.js

complete address field. still have javascript issue for fill back and display address ext fields in modal.

2012-11-16 15:36:08 +08:00

search.js

harry's js fix

2012-10-08 10:11:45 +08:00