Skip to content

Commit

Permalink
Merge branch 'release/1.6' into issue/668
Browse files Browse the repository at this point in the history
* release/1.6: (284 commits)
  Change log entry for #471
  Resolved merge issue after 1.6 > this branch
  Fixed strings not escaped properly after merge of 1.6 into this branch
  Added change log item for #411 fix
  Change log item added for #757
  Sentence closure & spacing
  Do not pass more then 3 params to remove_filter
  Refactor give_show_goal_progress function
  i18n sucurity: escaping translation strings #471
  Add template for give goals shortcode
  Add give_get_template function
  Remove testing code
  Remove code from get_data function
  Add form id abd form title csv column to export donation history csv
  Period for proper doc block
  i18n: replace esc_attr() with esc_attr__() #781
  Corrects capitalization for proper localization
  i18n: replace esc_html() with esc_html__() #781
  Gulp after merge
  Fix issue with non-RTL Donation Information table th not being aligned to left
  ...

Resolved Conflicts:
	includes/admin/class-give-settings.php
  • Loading branch information
Devin Walker committed Jul 26, 2016
2 parents 5915174 + 938e267 commit 90448a0
Show file tree
Hide file tree
Showing 148 changed files with 7,226 additions and 5,204 deletions.
160 changes: 93 additions & 67 deletions assets/css/give-admin.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/css/give-admin.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit 90448a0

Please sign in to comment.