Commit Graph

248 Commits

Author SHA1 Message Date
MickeyKay 86e64b007c Test comment 2015-05-12 13:56:17 -07:00
MickeyKay 65d0ea44a6 Update README.md. 2.0.0 2015-05-11 17:18:36 -07:00
MickeyKay d6115d0fae Update README.md. 2015-05-11 17:18:02 -07:00
MickeyKay 880e8c6f50 Bump version to 2.0.0! Woot! 2015-05-11 17:17:19 -07:00
MickeyKay dfe92cbbf3 Fix merge conflict. 2015-05-11 17:16:18 -07:00
MickeyKay 2b989d7424 Fix merge conflict. 2015-05-11 17:15:53 -07:00
MickeyKay 8a6adb7400 Fix whitespace. 2015-05-11 17:13:51 -07:00
MickeyKay 7e666d0bb9 Fixed merge conflicts from feature/trestle-settings. 2015-05-11 17:11:29 -07:00
MickeyKay 1bb6537455 Complete switch over to Trestle settings. archive/feature/trestle-settings 2015-05-11 17:09:22 -07:00
MickeyKay c7055b91ac Merge branch 'dev' of github.com:MickeyKay/trestle into dev 2015-04-30 16:12:35 -07:00
MickeyKay 67996d4e70 Fix whitespace. 2015-04-30 16:11:39 -07:00
Braad 7d1b5573a1 Fix control name for search_in_nav 2015-04-30 15:11:54 -07:00
Braad 3dae9f0443 Formatting 2015-04-30 14:52:22 -07:00
Braad c8667ce065 Better sanitization of options in the Customizer, other fixes 2015-04-30 14:49:46 -07:00
Braad 335594dbd2 Fix saving of default options 2015-04-30 13:00:21 -07:00
Braad d77a0a7440 First pass at switching to trestle-settings and some inline documentation cleanup 2015-04-30 12:24:30 -07:00
Mickey Kay 1b8e9a7e43 Merge pull request #8 from BraadMartin/dev
Fix bug in the [date] shortcode and improve formatting
2015-04-30 10:11:31 -07:00
Braad 39a1e729dd Fix bug in the date shortcode and minor formatting improvements to shortcodes.php 2015-04-29 14:06:10 -07:00
Braad 051fdfb0d1 Fix bug in the date shortcode and minor formatting improvements to shortcodes.php 2015-04-29 13:48:50 -07:00
Braad 6d34078f94 Syncing with dev branch 2015-04-21 12:05:22 -07:00
MickeyKay f8bd7fc700 Add equal height columns to plugin list. 2015-04-03 09:39:36 -07:00
MickeyKay 0b06acc857 Switch recommended FancyBox plugin. 2015-03-31 12:24:48 -07:00
MickeyKay 6abe714a1e Merge dev-test branch. 2015-03-23 15:49:05 -07:00
MickeyKay ade79de867 Update responsive header/full menu behavior. archive/dev-test 2015-03-23 15:47:56 -07:00
MickeyKay 8a097c4be2 Fix mobile nav CSS and jQuery 2015-03-23 13:32:00 -07:00
MickeyKay c8861270e1 Remove nav functionality that now lives in Auto Menu From Pages plugin. 2015-03-23 12:53:21 -07:00
MickeyKay 189b5fe995 Re-add favicon functionality. 2015-03-23 12:33:33 -07:00
MickeyKay 8890f6e413 Fix merge conflict causing PHP error. 2015-03-23 12:19:09 -07:00
MickeyKay 58a3cd2f26 Merge branch 'BraadMartin-dev' into dev-test 2015-03-23 12:17:17 -07:00
MickeyKay b09b9727e8 Merge PR #7. archive/BraadMartin-dev 2015-03-23 12:16:06 -07:00
Braad 9de3310f11 Update style.css 2015-03-19 15:21:54 -07:00
Braad 2d87079e05 Update theme-jquery.js 2015-03-19 15:20:37 -07:00
Braad 26278516b6 Update theme-functions.php 2015-03-19 15:18:43 -07:00
Braad 47ca5a873a Remove editor-style.css 2015-03-19 15:16:41 -07:00
Braad b23e0e3f7b Add customizer.js 2015-03-19 15:15:50 -07:00
Braad 3509fbb03f Add customizer.php 2015-03-19 15:14:31 -07:00
Braad 5d8a55bd03 Update admin.php 2015-03-19 15:11:50 -07:00
Braad d6542d2091 Remove admin.js 2015-03-19 15:10:02 -07:00
Braad bf244dce13 Remove admin.css 2015-03-19 15:09:37 -07:00
Braad 69a86d4c2d Updates to functions.php 2015-03-19 15:02:35 -07:00
MickeyKay 41914fbdcd Merge branch 'BraadMartin-dev' into dev-test 2015-02-24 09:23:53 -08:00
MickeyKay 45658cc73a Merged Braad\'s EHC removal commit. 2015-02-24 09:22:37 -08:00
Braad Martin 86520f1f86 Remove references to equal heights 2015-02-23 16:03:37 -08:00
MickeyKay eac35762fe Update styles to include better input styleing. 2015-02-19 14:52:32 -08:00
MickeyKay a660a1924a Update styles to include better input styleing. 2015-02-19 14:52:07 -08:00
Braad Martin 098a9062ef Remove all references to equalHeights as this is now a plugin 2015-02-16 12:28:00 -08:00
Braad Martin aa1fb81226 Remove all references to equalHeights as this is now a plugin 2015-02-16 12:24:34 -08:00
MickeyKay 3a6750e4b1 Update gravity forms CSS to include more input types. 2015-02-03 16:02:14 -08:00
Braad Martin e9cf7c26f5 Formatting 2015-02-02 23:59:02 -08:00
Braad Martin 25a6a73def Formatting 2015-02-02 23:56:28 -08:00